From c3d89250090ab121d9fb5e1d871f02ba534be8d8 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 27 Oct 2020 00:04:03 -0500 Subject: [PATCH] Fixes ahoy! --- Clocker/AppDelegate.swift | 7 +------ .../xcschemes/xcschememanagement.plist | 2 +- .../Dark Menubar.imageset/Contents.json | 2 +- .../Screen Shot 2020-10-11 at 2.16.37 PM.png | Bin 0 -> 12819 bytes .../Screen Shot 2020-10-11 at 2.19.26 PM.png | Bin 19612 -> 0 bytes Clocker/Overall App/AppDefaults.swift | 13 +------------ Clocker/Overall App/Strings.swift | 1 - .../Appearance/AppearanceViewController.swift | 3 ++- 8 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png delete mode 100644 Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png diff --git a/Clocker/AppDelegate.swift b/Clocker/AppDelegate.swift index 05b24f4..925a180 100644 --- a/Clocker/AppDelegate.swift +++ b/Clocker/AppDelegate.swift @@ -164,12 +164,7 @@ open class AppDelegate: NSObject, NSApplicationDelegate { let defaults = UserDefaults.standard let currentActivationPolicy = NSRunningApplication.current.activationPolicy - var activationPolicy: NSApplication.ActivationPolicy = defaults.integer(forKey: CLAppDisplayOptions) == 0 ? .accessory : .regular - - #if DEBUG - UserDefaults.standard.set(1, forKey: CLAppDisplayOptions) - activationPolicy = .regular - #endif + let activationPolicy: NSApplication.ActivationPolicy = defaults.integer(forKey: CLAppDisplayOptions) == 0 ? .accessory : .regular if currentActivationPolicy != activationPolicy { NSApp.setActivationPolicy(activationPolicy) diff --git a/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist b/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist index 0fc8a42..1d89f02 100644 --- a/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist @@ -17,7 +17,7 @@ Tests.xcscheme_^#shared#^_ orderHint - 1 + 2 SuppressBuildableAutocreation diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json index 30891df..36caf85 100644 --- a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json +++ b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "Screen Shot 2020-10-11 at 2.19.26 PM.png", + "filename" : "Screen Shot 2020-10-11 at 2.16.37 PM.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png new file mode 100644 index 0000000000000000000000000000000000000000..1471d7cfd1c9d1308333d8e28e7ec12235bd8917 GIT binary patch literal 12819 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 CTddsx literal 0 HcmV?d00001 diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png deleted file mode 100644 index 6e343ae94d9f74bdd857c6139a3cdcc3c0ef3cda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19612 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 FV1mCWGG+h( diff --git a/Clocker/Overall App/AppDefaults.swift b/Clocker/Overall App/AppDefaults.swift index a98c096..ff33e94 100644 --- a/Clocker/Overall App/AppDefaults.swift +++ b/Clocker/Overall App/AppDefaults.swift @@ -67,17 +67,6 @@ class AppDefaults { if defaults.object(forKey: CLThemeKey) == nil { Themer.shared().set(theme: 0) } - - // Set default to System theme for Mojave - if #available(macOS 10.14, *) { - if defaults.bool(forKey: CLDefaultThemeOnMojave) == false { - if isDarkModeOn() { - Themer.shared().set(theme: 2) - defaults.set(2, forKey: CLThemeKey) - } - defaults.set(true, forKey: CLDefaultThemeOnMojave) - } - } } private class func showCompactModeAlert() { @@ -126,7 +115,7 @@ class AppDefaults { CLShowMeetingInMenubar: 1, CLTruncateTextLength: 30, CLSelectedCalendars: [], - CLAppDisplayOptions: 1, + CLAppDisplayOptions: 0, CLMenubarCompactMode: 1, CLDisplayDSTTransitionInfo: 0] } diff --git a/Clocker/Overall App/Strings.swift b/Clocker/Overall App/Strings.swift index aa2305b..c4db561 100644 --- a/Clocker/Overall App/Strings.swift +++ b/Clocker/Overall App/Strings.swift @@ -35,6 +35,5 @@ let CLOnboaringTestsLaunchArgument = "isTestingTheOnboardingFlow" let CLMenubarCompactMode = "com.abhishek.menubarCompactMode" let CLDefaultMenubarMode = "com.abhishek.shouldDefaultToCompactMode" let CLInstallHomeIndicatorObject = "installHomeIndicatorObject" -let CLDefaultThemeOnMojave = "com.abhishek.defaultHasBeenSetOnMacOsMojave" let CLSwitchToCompactModeAlert = "com.abhishek.switchToCompactMode" let CLDisplayDSTTransitionInfo = "com.abhishek.showDSTTransitionInfo" diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift index 9842891..81c6332 100644 --- a/Clocker/Preferences/Appearance/AppearanceViewController.swift +++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift @@ -104,8 +104,9 @@ class AppearanceViewController: ParentViewController { let shouldDisplayCompact = DataStore.shared().shouldDisplay(.menubarCompactMode) menubarMode.setSelected(true, forSegment: shouldDisplayCompact ? 0 : 1) + // True is Menubar Only and False is Menubar + Dock let appDisplayOptions = DataStore.shared().shouldDisplay(.appDisplayOptions) - appDisplayControl.setSelected(true, forSegment: appDisplayOptions ? 1 : 0) + appDisplayControl.setSelected(true, forSegment: appDisplayOptions ? 0 : 1) } @IBOutlet var timeFormatLabel: NSTextField!