diff --git a/NearDrop/Assets.xcassets/DefaultBackgroundColor.colorset/Contents.json b/NearDrop/Assets.xcassets/DefaultBackgroundColor.colorset/Contents.json index 1a3ddad..7fe2560 100644 --- a/NearDrop/Assets.xcassets/DefaultBackgroundColor.colorset/Contents.json +++ b/NearDrop/Assets.xcassets/DefaultBackgroundColor.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0.200", - "green" : "0.200", - "red" : "0.200" + "blue" : "0.169", + "green" : "0.153", + "red" : "0.153" } }, "idiom" : "universal" diff --git a/NearDrop/WelcomeScreen.swift b/NearDrop/WelcomeScreen.swift index 19b67aa..414451c 100644 --- a/NearDrop/WelcomeScreen.swift +++ b/NearDrop/WelcomeScreen.swift @@ -31,17 +31,25 @@ struct WelcomeScreen: View { .listStyle(SidebarListStyle()) Divider() + .opacity(colorScheme == .light ? 1 : 0) +// .overlay( +// Color.black.opacity(colorScheme == .dark ? 1 : 0) +// ) .edgesIgnoringSafeArea(.vertical) - switch selection { - case .receive: - TutorialView(title: "WelcomeToQuickDrop", text: "UserManualDescription", showsLicense: true, openIAP: openIAP) + ZStack { + Color.defaultBackground.edgesIgnoringSafeArea(.vertical) - case .send: - TutorialView(title: "SendFiles", text: "SendFilesDescription", showsLicense: false, openIAP: openIAP) - - default: - TutorialView(title: "Troubleshooting", text: "TroubleshootingDescription", showsLicense: false, openIAP: openIAP) + switch selection { + case .receive: + TutorialView(title: "WelcomeToQuickDrop", text: "UserManualDescription", showsLicense: true, openIAP: openIAP) + + case .send: + TutorialView(title: "SendFiles", text: "SendFilesDescription", showsLicense: false, openIAP: openIAP) + + default: + TutorialView(title: "Troubleshooting", text: "TroubleshootingDescription", showsLicense: false, openIAP: openIAP) + } } } .frame(width: 1000, height: 600) diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index 520ce80..4b78df0 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -763,7 +763,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_BUILD = 13; + SHARED_BUILD = 14; SHARED_VERSION = 1.4; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -822,7 +822,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; - SHARED_BUILD = 13; + SHARED_BUILD = 14; SHARED_VERSION = 1.4; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/ShareExtension/DeviceListCell.xib b/ShareExtension/DeviceListCell.xib index eba61b6..9676159 100644 --- a/ShareExtension/DeviceListCell.xib +++ b/ShareExtension/DeviceListCell.xib @@ -17,7 +17,7 @@ - +