Merge pull request #5 from mulot/developpement

Developpement
mulot · Nov 19, 2022 · 4d12c16 · 4d12c16
2 parents 03645d8 + 265e016
commit 4d12c16
Show file tree

Hide file tree

Showing 16 changed files with 90 additions and 245 deletions.
diff --git a/BeatTime.xcodeproj/project.pbxproj b/BeatTime.xcodeproj/project.pbxproj
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTime.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTime.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeTvOS.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeTvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...ime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App (Complication).xcscheme b/...ime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App (Complication).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -55,18 +55,16 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -75,27 +73,16 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "947C562C264814E9007E6B4A"
-            BuildableName = "BeatTimeWatchOS WatchKit App.app"
-            BlueprintName = "BeatTimeWatchOS WatchKit App"
-            ReferencedContainer = "container:BeatTime.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/...ime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App (Notification).xcscheme b/...ime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App (Notification).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -56,18 +56,16 @@
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "8"
       notificationPayloadFile = "WatchOS WatchKit Extension/PushNotificationPayload.apns">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -77,27 +75,16 @@
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "8"
       notificationPayloadFile = "WatchOS WatchKit Extension/PushNotificationPayload.apns">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "947C562C264814E9007E6B4A"
-            BuildableName = "BeatTimeWatchOS WatchKit App.app"
-            BlueprintName = "BeatTimeWatchOS WatchKit App"
-            ReferencedContainer = "container:BeatTime.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -54,46 +54,33 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C562C264814E9007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit App.app"
             BlueprintName = "BeatTimeWatchOS WatchKit App"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "947C562C264814E9007E6B4A"
-            BuildableName = "BeatTimeWatchOS WatchKit App.app"
-            BlueprintName = "BeatTimeWatchOS WatchKit App"
-            ReferencedContainer = "container:BeatTime.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit Extension.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWatchOS WatchKit Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -82,46 +82,33 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C5638264814F0007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit Extension.appex"
             BlueprintName = "BeatTimeWatchOS WatchKit Extension"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/BeatTime">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "947C5638264814F0007E6B4A"
             BuildableName = "BeatTimeWatchOS WatchKit Extension.appex"
             BlueprintName = "BeatTimeWatchOS WatchKit Extension"
             ReferencedContainer = "container:BeatTime.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "947C5638264814F0007E6B4A"
-            BuildableName = "BeatTimeWatchOS WatchKit Extension.appex"
-            BlueprintName = "BeatTimeWatchOS WatchKit Extension"
-            ReferencedContainer = "container:BeatTime.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWidgetExtension.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWidgetExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1410"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWidgetiOSExtension.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeWidgetiOSExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1410"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeiOS.xcscheme b/BeatTime.xcodeproj/xcshareddata/xcschemes/BeatTimeiOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/BeatTime/BeatTime.swift b/BeatTime/BeatTime.swift
@@ -53,16 +53,13 @@ class BeatTime: NSObject {
                 dateComponents.month = calendar.component(.month, from: date)
                 dateComponents.day = calendar.component(.day, from: date)
                 dateComponents.timeZone = TimeZone(abbreviation: "CET")
-                dateComponents.hour = 1 // UTC+1 Offset
+                dateComponents.hour = 0
                 dateComponents.minute = 0
-                /*
+
                 if (TimeZone.autoupdatingCurrent.isDaylightSavingTime()) {
-                    print("Daylight On")
-                }
-                else {
-                    print("Daylight Off")
+                    //print("Daylight On")
+                    dateComponents.hour = 1 // UTC+1 Offset
                 }
-                */
 
                 if let someDateTime = calendar.date(from: dateComponents) {
                     //let secondsSinceRefDate = someDateTime.timeIntervalSinceReferenceDate + BeatTime.UTCplus1Offset + seconds

diff --git a/README.md b/README.md
@@ -16,9 +16,7 @@ Apps are coded in Swift language using AppKit/Cocoa (macOS), SwiftUI, WidgetKit,
 For more information about Swatch Internet Time:
 https://en.wikipedia.org/wiki/Swatch_Internet_Time
 
-What's New in version 1.2:
-- Extra large complications for Apple Watch
-- Corner complication for Apple Watch
+What's New in version 1.2.1:
 - Fix dayligth issue in .beats to local time convert mode
 
 <a href="https://www.buymeacoffee.com/0TC98Sk" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
diff --git a/WatchOS WatchKit App/Info.plist b/WatchOS WatchKit App/Info.plist
@@ -20,14 +20,18 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>CLKComplicationPrincipalClass</key>
+	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>WKApplication</key>
+	<true/>
 	<key>WKCompanionAppBundleIdentifier</key>
 	<string>org.mulot.beattime</string>
-	<key>WKWatchKitApp</key>
+	<key>WKRunsIndependentlyOfCompanionApp</key>
 	<true/>
 </dict>
 </plist>
diff --git a/WatchOS WatchKit Extension/BeatTimeApp.swift b/WatchOS WatchKit Extension/BeatTimeApp.swift
@@ -10,7 +10,7 @@ import os
 
 @main
 struct BeatTimeApp: App {
-    @WKExtensionDelegateAdaptor private var appDelegate: ExtensionDelegate
+    @WKApplicationDelegateAdaptor private var appDelegate: ExtensionDelegate
     @Environment(\.scenePhase) private var scenePhase
 
     let logger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.App", category: "App View")

diff --git a/WatchOS WatchKit Extension/ExtensionDelegate.swift b/WatchOS WatchKit Extension/ExtensionDelegate.swift
@@ -15,7 +15,7 @@ import ClockKit
 import os
 
 // The app's extension delegate.
-class ExtensionDelegate: NSObject, WKExtensionDelegate {
+class ExtensionDelegate: NSObject, WKApplicationDelegate {
 
     let logger = Logger(subsystem: "org.mulot.beattime.BeatTimeWatchOS.watchkitapp.watchkitextension.ExtensionDelegate",
                         category: "Extension Delegate")
@@ -25,7 +25,7 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate {
     // Called when a background task occurs.
     func handle(_ backgroundTasks: Set<WKRefreshBackgroundTask>) {
         logger.debug("Handling a background task...")
-        logger.debug("App State: \(WKExtension.shared().applicationState.rawValue)")
+        logger.debug("App State: \(WKApplication.shared().applicationState.rawValue)")
         for task in backgroundTasks {
             logger.debug("Task: \(task)")
             switch task {
@@ -67,7 +67,7 @@ func scheduleBAR(first: Bool) {
     let now = Date()
     let scheduledDate = now.addingTimeInterval(first ? 60 : 60*60)
     let info:NSDictionary = ["submissionDate":now]
-    let wkExt = WKExtension.shared()
+    let wkExt = WKApplication.shared()
     wkExt.scheduleBackgroundRefresh(withPreferredDate: scheduledDate, userInfo: info) { (error: Error?) in
         if (error != nil) {
             scheduleLogger.debug("background refresh could not be scheduled \(error.debugDescription)")