fixed a small issue

now the Touch Bar shows the time format that you are editing
L1cardo · Feb 12, 2020 · 7ae6acd · 7ae6acd
1 parent ba12c30
commit 7ae6acd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/ClockBar.xcodeproj/project.pbxproj b/ClockBar.xcodeproj/project.pbxproj
@@ -392,15 +392,15 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200212;
+				CURRENT_PROJECT_VERSION = 20200213;
 				DEVELOPMENT_TEAM = 2U23P5CPX2;
 				ENABLE_HARDENED_RUNTIME = NO;
 				INFOPLIST_FILE = "ClockBar/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.licardo.ClockBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ClockBar/TouchBar/ClockBar-Bridging-Header.h";
@@ -424,15 +424,15 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200212;
+				CURRENT_PROJECT_VERSION = 20200213;
 				DEVELOPMENT_TEAM = 2U23P5CPX2;
 				ENABLE_HARDENED_RUNTIME = NO;
 				INFOPLIST_FILE = "ClockBar/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.licardo.ClockBar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ClockBar/TouchBar/ClockBar-Bridging-Header.h";

diff --git a/ClockBar.xcodeproj/xcshareddata/xcschemes/ClockBar.xcscheme b/ClockBar.xcodeproj/xcshareddata/xcschemes/ClockBar.xcscheme
@@ -34,7 +34,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = "en"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ClockBar.xcworkspace/xcuserdata/licardo.xcuserdatad/UserInterfaceState.xcuserstate b/ClockBar.xcworkspace/xcuserdata/licardo.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ClockBar/AppDelegate.swift b/ClockBar/AppDelegate.swift
@@ -64,8 +64,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTextFieldDelegate {
     }
 
     func controlTextDidChange(_ obj: Notification) {
-        Defaults[.time1] = time1Text.stringValue
-        Defaults[.time2] = time2Text.stringValue
+        if Defaults[.time1] != time1Text.stringValue {
+            Defaults[.time1] = time1Text.stringValue
+            Defaults[.shouldShowTime1] = true
+        } else if Defaults[.time2] != time2Text.stringValue {
+            Defaults[.time2] = time2Text.stringValue
+            Defaults[.shouldShowTime1] = false
+        }
         showTime()
     }
 
@@ -86,8 +91,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTextFieldDelegate {
     }
 
     @objc func changeTime() {
-        showTime()
         Defaults[.shouldShowTime1] = !Defaults[.shouldShowTime1]
+        showTime()
     }
 
     // update time

diff --git a/appcast.xml b/appcast.xml
@@ -3,10 +3,10 @@
     <channel>
         <title>ClockBar</title>
         <item>
-            <title>1.2.0</title>
-            <pubDate>周三, 12 2月 2020 14:20:41 +0800</pubDate>
+            <title>1.2.1</title>
+            <pubDate>周三, 12 2月 2020 22:40:41 +0800</pubDate>
             <sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/L1cardo/ClockBar/releases/download/v1.2.0/ClockBar.dmg" sparkle:version="20200212" sparkle:shortVersionString="1.2.0" length="6217052" type="application/octet-stream" sparkle:edSignature="BAjG9KK5ZP51QvFie5cf3Nlt2RLfaze8d7hAIdRmSgBuY3mKf6+uoKxmZGA75LeQoBeVScK5fAHRANyDP/WLCg=="/>
+            <enclosure url="https://github.com/L1cardo/ClockBar/releases/download/v1.2.1/ClockBar.dmg" sparkle:version="20200213" sparkle:shortVersionString="1.2.1" length="6217035" type="application/octet-stream" sparkle:edSignature="M4nLHHmJylNdJ0MQd9/XGxmRJEctOl8YCSwKWZ6gR39OxBsNoHxsWW2nelW6AObYIlBSrvAbirXG7QoJxzzMAg=="/>
         </item>
     </channel>
 </rss>