diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate index 12ee4f8..4db015e 100644 Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Clocker/Appearance Tab/CLAppearanceViewController.m b/Clocker/Appearance Tab/CLAppearanceViewController.m index e21f888..f9a91d5 100644 --- a/Clocker/Appearance Tab/CLAppearanceViewController.m +++ b/Clocker/Appearance Tab/CLAppearanceViewController.m @@ -177,4 +177,8 @@ typedef NS_ENUM(NSUInteger, CLClockerMode) { [Answers logCustomEventWithName:@"Display Time With Seconds" customAttributes:@{@"Displayed" : sender.selectedSegment == 0 ? @"YES" : @"NO"}]; } +- (IBAction)flashTheTimeSeperators:(NSSegmentedControl *)sender { + [Answers logCustomEventWithName:@"Flashing Time Seperators" customAttributes:@{@"Displayed" : sender.selectedSegment == 0 ? @"YES" : @"NO"}]; +} + @end diff --git a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib index 0640e90..637aef9 100644 --- a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib +++ b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib @@ -17,11 +17,11 @@ - + - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -195,10 +195,10 @@ - + - + @@ -216,7 +216,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -272,8 +272,16 @@ + + + + + + + + - + @@ -287,7 +295,7 @@ - + @@ -298,7 +306,7 @@ - + @@ -310,7 +318,7 @@ - + @@ -328,7 +336,7 @@ - + @@ -343,7 +351,7 @@ - + @@ -353,7 +361,7 @@ - + @@ -363,27 +371,53 @@ - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -399,12 +433,11 @@ - - - + + - + @@ -418,6 +451,7 @@ + @@ -426,14 +460,18 @@ + + + + @@ -444,31 +482,31 @@ - - + + + - - + diff --git a/Clocker/StatusItemView.h b/Clocker/StatusItemView.h index 303fc4d..1e7f54b 100755 --- a/Clocker/StatusItemView.h +++ b/Clocker/StatusItemView.h @@ -45,5 +45,7 @@ @property (nonatomic, readonly) NSRect globalRect; @property (nonatomic) SEL action; @property (nonatomic, unsafe_unretained) id target; +@property (assign) BOOL flashingTicker; + @end diff --git a/Clocker/StatusItemView.m b/Clocker/StatusItemView.m index 5b33143..17a75c6 100755 --- a/Clocker/StatusItemView.m +++ b/Clocker/StatusItemView.m @@ -54,6 +54,7 @@ if (self != nil) { _statusItem = statusItem; _statusItem.view = self; + self.flashingTicker = NO; } return self; } @@ -77,8 +78,8 @@ CLTimezoneDataOperations *operationObject = [[CLTimezoneDataOperations alloc] initWithTimezoneData:timezoneObject]; - textField.stringValue = [operationObject getMenuTitle]; - textField.font = [NSFont monospacedDigitSystemFontOfSize:14.0 weight:0]; + textField.stringValue = [self textWithFlashingTicker:[operationObject getMenuTitle]]; + textField.font = [NSFont fontWithName:@"Menlo" size:13]; // Set up dark mode for icon if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"] isEqualToString:@"Dark"]) @@ -124,6 +125,23 @@ fraction:1.0]; } +- (NSString *)textWithFlashingTicker:(NSString *)originalText +{ + self.flashingTicker = !self.flashingTicker; + NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; + NSNumber *flashingSeperators = [userDefaults objectForKey:CLSeperatorFlashUserPreference]; + if (flashingSeperators.boolValue == 0) { + + if (originalText.length > 0 && self.flashingTicker) { + + originalText = [NSMutableString stringWithString:[originalText stringByReplacingOccurrencesOfString:@":" withString:@" "]]; + } + } + + return originalText; + +} + - (NSImage *)imageWithSubviewsWithTextField:(NSTextField *)textField { diff --git a/Clocker/Utilities/CommonStrings.h b/Clocker/Utilities/CommonStrings.h index e2dd3ef..2fa0772 100644 --- a/Clocker/Utilities/CommonStrings.h +++ b/Clocker/Utilities/CommonStrings.h @@ -33,5 +33,6 @@ extern NSString *const CLSunriseSunsetTime; extern NSString *const CLLocationSearchURL; extern NSString *const CLShowSecondsInMenubar; extern NSString *const CLUserFontSizePreference; +extern NSString *const CLSeperatorFlashUserPreference; @end diff --git a/Clocker/Utilities/CommonStrings.m b/Clocker/Utilities/CommonStrings.m index 38cbaf3..d9f6b36 100644 --- a/Clocker/Utilities/CommonStrings.m +++ b/Clocker/Utilities/CommonStrings.m @@ -31,5 +31,6 @@ NSString *const CLSunriseSunsetTime = @"showSunriseSetTime"; NSString *const CLLocationSearchURL = @"https://maps.googleapis.com/maps/api/geocode/json?address=%@&key=AIzaSyCyf2knCi6KiKuDJLYDBD3Odq5dt4c-_KI&language=%@"; NSString *const CLShowSecondsInMenubar = @"showSeconds"; NSString *const CLUserFontSizePreference = @"userFontSize"; +NSString *const CLSeperatorFlashUserPreference = @"flashSeperators"; @end