From c199201cb90f9dd5bb90d133d9a9b30209fa4bf3 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 14 Jul 2020 14:23:11 -0500 Subject: [PATCH 1/6] Commenting out 11.0 changes. --- .../OnboardingParentViewController.swift | 4 ++-- Clocker/Overall App/Themer.swift | 14 ++++++++------ Clocker/Panel/Notes Popover/NotesPopover.swift | 6 +++--- Clocker/Panel/ParentPanelController.swift | 10 +++++----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Clocker/Onboarding/OnboardingParentViewController.swift b/Clocker/Onboarding/OnboardingParentViewController.swift index 68457db..d191e2f 100644 --- a/Clocker/Onboarding/OnboardingParentViewController.swift +++ b/Clocker/Onboarding/OnboardingParentViewController.swift @@ -69,8 +69,8 @@ class OnboardingParentViewController: NSViewController { [negativeButton, backButton].forEach { $0?.isHidden = true } if #available(OSX 10.16, *) { - negativeButton.controlSize = .large - positiveButton.controlSize = .large +// negativeButton.controlSize = .large +// positiveButton.controlSize = .large backButton.image = Themer.shared().symbolImage(for: "chevron.left.circle.fill") backButton.bezelStyle = .recessed backButton.isBordered = false diff --git a/Clocker/Overall App/Themer.swift b/Clocker/Overall App/Themer.swift index 2b7fd9c..3d8e639 100644 --- a/Clocker/Overall App/Themer.swift +++ b/Clocker/Overall App/Themer.swift @@ -448,11 +448,13 @@ extension Themer { func symbolImage(for name: String) -> NSImage { assert(name.count > 0) - if #available(OSX 10.16, *) { - return NSImage(systemSymbolName: name, accessibilityDescription: name)! - } else { - // Dummy image for older xcodes - return NSImage(named: NSImage.Name("Calendar Tab Icon"))! - } + return NSImage(named: NSImage.Name("Calendar Tab Icon"))! +// if #available(OSX 10.16, *) { +// return NSImage(systemSymbolName: name, +// accessibilityDescription: name)! +// } else { +// // Dummy image for older xcodes +// return NSImage(named: NSImage.Name("Calendar Tab Icon"))! +// } } } diff --git a/Clocker/Panel/Notes Popover/NotesPopover.swift b/Clocker/Panel/Notes Popover/NotesPopover.swift index fbb08d4..d7e628a 100644 --- a/Clocker/Panel/Notes Popover/NotesPopover.swift +++ b/Clocker/Panel/Notes Popover/NotesPopover.swift @@ -76,9 +76,9 @@ class NotesPopover: NSViewController { alertPopupButton.setAccessibilityIdentifier("RemindersAlertPopup") reminderView.setAccessibilityIdentifier("RemindersView") - if #available(macOS 10.16, *) { - alertPopupButton.controlSize = .large - } +// if #available(macOS 10.16, *) { +// alertPopupButton.controlSize = .large +// } } override func viewWillAppear() { diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index f98c342..486291d 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -167,11 +167,11 @@ class ParentPanelController: NSWindowController { showDebugVersionViewIfNeccesary() - #if DEBUG - if #available(macOS 10.16, *) { - mainTableView.style = .fullWidth - } - #endif +// #if DEBUG +// if #available(macOS 10.16, *) { +// mainTableView.style = .fullWidth +// } +// #endif } private func showDebugVersionViewIfNeccesary() { From e70db606f42736d3e34084d3011bafd7db530c29 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 14 Jul 2020 14:24:32 -0500 Subject: [PATCH 2/6] Putting Keys! --- Clocker/Clocker.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Clocker/Clocker.xcodeproj/project.pbxproj b/Clocker/Clocker.xcodeproj/project.pbxproj index f385f45..f27de3d 100755 --- a/Clocker/Clocker.xcodeproj/project.pbxproj +++ b/Clocker/Clocker.xcodeproj/project.pbxproj @@ -123,12 +123,12 @@ 9AB6F16A2259D2A600A44663 /* SearchResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AB6F1692259D2A600A44663 /* SearchResults.swift */; }; 9AB89E031CE97A4900EC8EB1 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9AB89E021CE97A4900EC8EB1 /* Media.xcassets */; }; 9ABFB3801CA6882000E10745 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */; }; + 9AC26B6E24BE3DBE0020D0EA /* Keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AC26B6C24BE3DBE0020D0EA /* Keys.plist */; }; 9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 9ACB31401EDA994200F3E1D3 /* ShortcutRecorder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACB313F1EDA994200F3E1D3 /* ShortcutRecorder.framework */; }; 9ACE03EF1CB0ADE00039FC01 /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */; }; 9ACF469D1DCBD45200C49B51 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACF469C1DCBD45200C49B51 /* Quartz.framework */; }; 9ACF618D231DABAE00F5E51E /* SearchDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ACF618C231DABAE00F5E51E /* SearchDataSource.swift */; }; - 9AEC7109249A93DA006520FA /* Keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AEC7108249A93DA006520FA /* Keys.plist */; }; C20839CA21515C1E00C86589 /* ClockerUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20839C921515C1E00C86589 /* ClockerUnitTests.swift */; }; C213713420B4FD920024D5A4 /* FloatingWindowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C213713320B4FD920024D5A4 /* FloatingWindowTests.swift */; }; C22F3D802107778A0001D5E1 /* ShortcutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C22F3D7F2107778A0001D5E1 /* ShortcutTests.swift */; }; @@ -380,6 +380,7 @@ 9AB6F1692259D2A600A44663 /* SearchResults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResults.swift; sourceTree = ""; }; 9AB89E021CE97A4900EC8EB1 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = ""; }; 9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; + 9AC26B6C24BE3DBE0020D0EA /* Keys.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Keys.plist; path = Internal/Keys.plist; sourceTree = ""; }; 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 9ACB31391EDA98EA00F3E1D3 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = ""; }; 9ACB313A1EDA98EA00F3E1D3 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = ""; }; @@ -390,7 +391,6 @@ 9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Firebase.framework; path = Frameworks/Firebase.framework; sourceTree = ""; }; 9ACF469C1DCBD45200C49B51 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; 9ACF618C231DABAE00F5E51E /* SearchDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchDataSource.swift; sourceTree = ""; }; - 9AEC7108249A93DA006520FA /* Keys.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Keys.plist; path = Internal/Keys.plist; sourceTree = ""; }; 9AFCC7FC1FD668FF00509B9C /* ClockerHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClockerHelper.entitlements; sourceTree = ""; }; C20839C721515C1E00C86589 /* ClockerUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ClockerUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C20839C921515C1E00C86589 /* ClockerUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClockerUnitTests.swift; sourceTree = ""; }; @@ -821,6 +821,7 @@ DD4F7BF913C30F9F00825C6E = { isa = PBXGroup; children = ( + 9AC26B6C24BE3DBE0020D0EA /* Keys.plist */, 35C36F9B2259EC97002FA5C6 /* Events and Reminders */, 35C36F382259D80C002FA5C6 /* Overall App */, 35C36F242259D64D002FA5C6 /* Panel */, @@ -1114,6 +1115,7 @@ 9A13BAD61CA87F08007C6CBE /* Panel.xib in Resources */, 35C36F6B2259E0E1002FA5C6 /* FloatingWindow.xib in Resources */, 35C36F17225961DA002FA5C6 /* DateTools.bundle in Resources */, + 9AC26B6E24BE3DBE0020D0EA /* Keys.plist in Resources */, 35C36EF322595F14002FA5C6 /* WelcomeView.xib in Resources */, 35C36EF822595F14002FA5C6 /* Onboarding.storyboard in Resources */, 35C36F612259DE67002FA5C6 /* NotesPopover.xib in Resources */, From dfa0b4128b977fa7879fc4ffe941067f39e9d9c8 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 14 Jul 2020 14:41:56 -0500 Subject: [PATCH 3/6] Update project.pbxproj --- Clocker/Clocker.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Clocker/Clocker.xcodeproj/project.pbxproj b/Clocker/Clocker.xcodeproj/project.pbxproj index f27de3d..3f3dcf3 100755 --- a/Clocker/Clocker.xcodeproj/project.pbxproj +++ b/Clocker/Clocker.xcodeproj/project.pbxproj @@ -1455,7 +1455,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 80; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( @@ -1480,7 +1480,7 @@ INFOPLIST_FILE = "Clocker/Clocker-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 20.05.01; + MARKETING_VERSION = 20.07.01; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker; PRODUCT_NAME = Clocker; @@ -1941,7 +1941,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 80; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; @@ -1968,7 +1968,7 @@ INFOPLIST_FILE = "Clocker/Clocker-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 20.05.01; + MARKETING_VERSION = 20.07.01; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; "OTHER_SWIFT_FLAGS[arch=*]" = "-D DEBUG"; @@ -2005,7 +2005,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 79; + CURRENT_PROJECT_VERSION = 80; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( @@ -2030,7 +2030,7 @@ INFOPLIST_FILE = "Clocker/Clocker-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 20.05.01; + MARKETING_VERSION = 20.07.01; OTHER_LDFLAGS = ""; "OTHER_SWIFT_FLAGS[arch=*]" = "-D RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker; From c0128e4ba2eab9b088b525228db8b615be249500 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 7 Sep 2020 18:43:10 -0500 Subject: [PATCH 4/6] Removing unused functions + Answers. --- Clocker/Overall App/Logger.swift | 8 +++----- Clocker/Overall App/Reach.swift | 17 ----------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Clocker/Overall App/Logger.swift b/Clocker/Overall App/Logger.swift index 748059e..a9d8eb2 100644 --- a/Clocker/Overall App/Logger.swift +++ b/Clocker/Overall App/Logger.swift @@ -1,15 +1,13 @@ // Copyright © 2015 Abhishek Banthia import Cocoa -import Crashlytics import os.log import os.signpost class Logger: NSObject { - class func log(object: [String: Any]?, for key: NSString) { - Answers.logCustomEvent(withName: key as String, - customAttributes: object) - } + class func log(object: [String: Any]?, for key: NSString) { + // TODO: Use a new analytics solution! + } } @available(OSX 10.14, *) diff --git a/Clocker/Overall App/Reach.swift b/Clocker/Overall App/Reach.swift index 7fbb5bd..191870e 100644 --- a/Clocker/Overall App/Reach.swift +++ b/Clocker/Overall App/Reach.swift @@ -52,23 +52,6 @@ open class Reach { return ReachabilityStatus(reachabilityFlags: flags) } - - func monitorReachabilityChanges() { - let host = "google.com" - var context = SCNetworkReachabilityContext(version: 0, info: nil, retain: nil, release: nil, copyDescription: nil) - let reachability = SCNetworkReachabilityCreateWithName(nil, host)! - - SCNetworkReachabilitySetCallback(reachability, { _, flags, _ in - let status = ReachabilityStatus(reachabilityFlags: flags) - - NotificationCenter.default.post(name: Notification.Name(rawValue: reachabilityStatusChangedNotification), - object: nil, - userInfo: ["Status": status.description]) - - }, &context) - - SCNetworkReachabilityScheduleWithRunLoop(reachability, CFRunLoopGetMain(), CFRunLoopMode.commonModes.rawValue) - } } extension ReachabilityStatus { From ab82c75aaac3f41edfdfcc0668d227eaf890d2c1 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 7 Sep 2020 19:12:53 -0500 Subject: [PATCH 5/6] Fix tests! --- Clocker/ClockerUITests/AboutUsTests.swift | 2 +- Clocker/ClockerUnitTests/ClockerUnitTests.swift | 10 +++++----- Clocker/Overall App/Logger.swift | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Clocker/ClockerUITests/AboutUsTests.swift b/Clocker/ClockerUITests/AboutUsTests.swift index 8381d16..01561e9 100644 --- a/Clocker/ClockerUITests/AboutUsTests.swift +++ b/Clocker/ClockerUITests/AboutUsTests.swift @@ -33,7 +33,7 @@ class AboutUsTests: XCTestCase { tapAboutTab() let appDisplayName = "CFBundleDisplayName".localizedString() - let expectedVersion = "\(appDisplayName) 20.05.01 (79)" + let expectedVersion = "\(appDisplayName) 20.07.01 (80)" guard let presentVersion = app.windows["Clocker"].staticTexts["ClockerVersion"].value as? String else { XCTFail("Present version not present") return diff --git a/Clocker/ClockerUnitTests/ClockerUnitTests.swift b/Clocker/ClockerUnitTests/ClockerUnitTests.swift index 966d4ce..4563a67 100644 --- a/Clocker/ClockerUnitTests/ClockerUnitTests.swift +++ b/Clocker/ClockerUnitTests/ClockerUnitTests.swift @@ -154,11 +154,11 @@ class ClockerUnitTests: XCTestCase { // The below test might fail outside California or if DST is active! func testTimeDifference() { - XCTAssertTrue(operations.timeDifference() == ", 12 hours 30 mins ahead", "Difference was unexpectedly: \(operations.timeDifference())") - XCTAssertTrue(californiaOperations.timeDifference() == "", "Difference was unexpectedly: \(californiaOperations.timeDifference())") - XCTAssertTrue(floridaOperations.timeDifference() == ", 3 hours ahead", "Difference was unexpectedly: \(floridaOperations.timeDifference())") - XCTAssertTrue(aucklandOperations.timeDifference() == ", 19 hours ahead", "Difference was unexpectedly: \(aucklandOperations.timeDifference())") - XCTAssertTrue(omahaOperations.timeDifference() == ", 2 hours ahead", "Difference was unexpectedly: \(omahaOperations.timeDifference())") + XCTAssertTrue(operations.timeDifference() == ", 10 hours 30 mins ahead", "Difference was unexpectedly: \(operations.timeDifference())") + XCTAssertTrue(californiaOperations.timeDifference() == ", 2 hours behind", "Difference was unexpectedly: \(californiaOperations.timeDifference())") + XCTAssertTrue(floridaOperations.timeDifference() == ", an hour ahead", "Difference was unexpectedly: \(floridaOperations.timeDifference())") + XCTAssertTrue(aucklandOperations.timeDifference() == ", 17 hours ahead", "Difference was unexpectedly: \(aucklandOperations.timeDifference())") + XCTAssertTrue(omahaOperations.timeDifference() == "", "Difference was unexpectedly: \(omahaOperations.timeDifference())") } func testSunriseSunset() { diff --git a/Clocker/Overall App/Logger.swift b/Clocker/Overall App/Logger.swift index a9d8eb2..4df1d6c 100644 --- a/Clocker/Overall App/Logger.swift +++ b/Clocker/Overall App/Logger.swift @@ -5,9 +5,9 @@ import os.log import os.signpost class Logger: NSObject { - class func log(object: [String: Any]?, for key: NSString) { - // TODO: Use a new analytics solution! - } + class func log(object _: [String: Any]?, for _: NSString) { + // TODO: Use a new analytics solution! + } } @available(OSX 10.14, *) From 3accd90d51c78e1550d2c8b3c6ee8d9bf3174032 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 7 Sep 2020 23:19:13 -0500 Subject: [PATCH 6/6] Modern Slider. --- Clocker/Clocker.xcodeproj/project.pbxproj | 11 +++ Clocker/Clocker/en.lproj/Panel.xib | 91 +++++++++++++++++------ Clocker/Panel/ParentPanelController.swift | 27 +++++++ Clocker/Panel/UI/HourMarkerViewItem.swift | 15 ++++ Clocker/Panel/UI/HourMarkerViewItem.xib | 51 +++++++++++++ 5 files changed, 173 insertions(+), 22 deletions(-) create mode 100644 Clocker/Panel/UI/HourMarkerViewItem.swift create mode 100644 Clocker/Panel/UI/HourMarkerViewItem.xib diff --git a/Clocker/Clocker.xcodeproj/project.pbxproj b/Clocker/Clocker.xcodeproj/project.pbxproj index 3f3dcf3..5bd4fdd 100755 --- a/Clocker/Clocker.xcodeproj/project.pbxproj +++ b/Clocker/Clocker.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 357391872507277500D30819 /* HourMarkerViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 357391852507277500D30819 /* HourMarkerViewItem.swift */; }; + 357391882507277500D30819 /* HourMarkerViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 357391862507277500D30819 /* HourMarkerViewItem.xib */; }; 3595FAD0227F88BC0044A12A /* UserDefaults + KVOExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3595FACF227F88BC0044A12A /* UserDefaults + KVOExtensions.swift */; }; 35C11E2124873A550031F18C /* VersionUpdateHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C11E2024873A550031F18C /* VersionUpdateHandler.swift */; }; 35C36EE422595EFD002FA5C6 /* StatusContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C36EE022595EFD002FA5C6 /* StatusContainerView.swift */; }; @@ -225,6 +227,8 @@ 352AF497232E07B400D96FA7 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/InfoPlist.strings; sourceTree = ""; }; 352AF499232E07B400D96FA7 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = ""; }; 3545C52A22612BCC00121E25 /* RateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RateTests.swift; sourceTree = ""; }; + 357391852507277500D30819 /* HourMarkerViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HourMarkerViewItem.swift; sourceTree = ""; }; + 357391862507277500D30819 /* HourMarkerViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HourMarkerViewItem.xib; sourceTree = ""; }; 3595FACF227F88BC0044A12A /* UserDefaults + KVOExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults + KVOExtensions.swift"; sourceTree = ""; }; 35C11E2024873A550031F18C /* VersionUpdateHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionUpdateHandler.swift; sourceTree = ""; }; 35C36EE022595EFD002FA5C6 /* StatusContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusContainerView.swift; sourceTree = ""; }; @@ -602,6 +606,8 @@ 35C36F552259DD8A002FA5C6 /* TimezoneCellView.swift */, 35C36F532259DD8A002FA5C6 /* TimezoneDataSource.swift */, 35C36F322259D7C3002FA5C6 /* AddTableViewCell.swift */, + 357391852507277500D30819 /* HourMarkerViewItem.swift */, + 357391862507277500D30819 /* HourMarkerViewItem.xib */, ); path = UI; sourceTree = ""; @@ -1107,6 +1113,7 @@ buildActionMask = 2147483647; files = ( 9A13BAEA1CA88A76007C6CBE /* Localizable.strings in Resources */, + 357391882507277500D30819 /* HourMarkerViewItem.xib in Resources */, 9AB6F15E2259D08300A44663 /* iVersion.bundle in Resources */, 35C36F972259EBB1002FA5C6 /* AppFeedbackWindow.xib in Resources */, 9A13BAE01CA882FA007C6CBE /* InfoPlist.strings in Resources */, @@ -1212,6 +1219,7 @@ 35C36EE622595EFD002FA5C6 /* StatusItemView.swift in Sources */, 35C36FA12259ED6D002FA5C6 /* EventCenter.swift in Sources */, 9A5951BD1C1D0A8D009C17AA /* CommonStrings.m in Sources */, + 357391872507277500D30819 /* HourMarkerViewItem.swift in Sources */, 35C36EE422595EFD002FA5C6 /* StatusContainerView.swift in Sources */, 35C36F782259E1D0002FA5C6 /* Foundation + Additions.swift in Sources */, 35C36F16225961DA002FA5C6 /* Date+Inits.swift in Sources */, @@ -1439,6 +1447,7 @@ 9A5B1A8C1BECDB5B00A77C68 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ENABLE_MODULES = YES; @@ -1925,6 +1934,7 @@ DD4F7C2313C30F9F00825C6E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ENABLE_MODULES = YES; @@ -1989,6 +1999,7 @@ DD4F7C2413C30F9F00825C6E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ENABLE_MODULES = YES; diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib index 670ded6..38aaacf 100755 --- a/Clocker/Clocker/en.lproj/Panel.xib +++ b/Clocker/Clocker/en.lproj/Panel.xib @@ -1,8 +1,8 @@ - + - + @@ -16,6 +16,7 @@ + @@ -40,20 +41,20 @@ - + - + - + - + - + @@ -72,11 +73,11 @@ - + - + @@ -87,7 +88,7 @@ - + @@ -99,7 +100,7 @@ - + @@ -111,7 +112,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -130,7 +131,7 @@ - + @@ -208,11 +209,11 @@ - +