Merge pull request #7 from Cizzuk/dev

Cizzuk · web-flow · commit 6446f42af865 · 2026-02-28T22:28:09.000+09:00
v1.0 (13)
diff --git a/Alare.xcodeproj/project.pbxproj b/Alare.xcodeproj/project.pbxproj
@@ -317,7 +317,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = WidgetExtensionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = Z8R89S24YT;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = WidgetExtension/Info.plist;
@@ -328,7 +328,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.3;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cizzuk.alare.WidgetExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -352,7 +352,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = WidgetExtensionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = Z8R89S24YT;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = WidgetExtension/Info.plist;
@@ -363,7 +363,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 0.3;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cizzuk.alare.WidgetExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -511,7 +511,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = Alare/Alare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = Z8R89S24YT;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.3;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cizzuk.alare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
@@ -555,7 +555,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = Alare/Alare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = Z8R89S24YT;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -574,7 +574,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.3;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cizzuk.alare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
diff --git a/Alare/Alare.entitlements b/Alare/Alare.entitlements
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:cizz.uk</string>
+	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.net.cizzuk.alare</string>
diff --git a/Alare/Assets.xcassets/scancode-image.imageset/Contents.json b/Alare/Assets.xcassets/scancode-image.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "scancode-image.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Alare/Assets.xcassets/scancode-image.imageset/scancode-image.png b/Alare/Assets.xcassets/scancode-image.imageset/scancode-image.png
diff --git a/Alare/Models/UserData/WakeupActionSettings.swift b/Alare/Models/UserData/WakeupActionSettings.swift
@@ -13,6 +13,7 @@ struct WakeupActionSettings: Codable {
     
     // Wave Device Settings
     var waveDevice_pointsRequired: Int = 100
+    var waveDevice_sensitivity: Double = 0.5
     
     // Scan Code Settings
     var scanCode_code: String? // Required
diff --git a/Alare/ViewModels/MainViewModel.swift b/Alare/ViewModels/MainViewModel.swift
@@ -64,7 +64,25 @@ class MainViewModel: ObservableObject {
         }
     }
     
+    func handleContinueUserActivity(activity: NSUserActivity) {
+        print("Continue user activity: ", activity.activityType)
+        
+        // Handle Universal Link
+        if let url = activity.webpageURL {
+            print("URL opened: ", url)
+            handleUniversalLink(url: url)
+        }
+    }
+    
     func handleOpenURL(url: URL) {
+        print("URL opened: ", url)
+        
+        // Handle Universal Link
+        if url.scheme == "https" || url.scheme == "http" {
+            handleUniversalLink(url: url)
+            return
+        }
+        
         // Get App URL Schemes
         let appURLSchemes = Bundle.main.object(forInfoDictionaryKey: "CFBundleURLTypes") as? [[String: Any]]
         let urlSchemes = appURLSchemes?.compactMap { $0["CFBundleURLSchemes"] as? [String] }.flatMap { $0 } ?? []
@@ -83,6 +101,12 @@ class MainViewModel: ObservableObject {
         }
     }
     
+    private func handleUniversalLink(url: URL) {
+        if url == URL(string: completeWakeupActionURL) {
+            completeWakeupAction()
+        }
+    }
+    
     // MARK: - Alarm Management
     
     func syncAll() {
@@ -123,9 +147,11 @@ class MainViewModel: ObservableObject {
     }
     
     func completeWakeupAction() {
-        killAlarm()
-        doingWakeupAction = nil
-        HapticManager.shared.playHaptics(.success)
+        if register.registereds.nextSnooze != nil {
+            killAlarm()
+            doingWakeupAction = nil
+            HapticManager.shared.playHaptics(.success)
+        }
     }
     
     func killAlarm() {
diff --git a/Alare/Views/MainView.swift b/Alare/Views/MainView.swift
@@ -178,6 +178,9 @@ struct MainView: View {
         .onReceive(NotificationCenter.default.publisher(for: .focusFilterDidChange)) { _ in
             vm.syncFocusFilter()
         }
+        .onContinueUserActivity(NSUserActivityTypeBrowsingWeb) { activity in
+            vm.handleContinueUserActivity(activity: activity)
+        }
         .onOpenURL { url in
             vm.handleOpenURL(url: url)
         }
diff --git a/Alare/Views/WakeupActions/ScanCode/ScanCodeWakeupActionView.swift b/Alare/Views/WakeupActions/ScanCode/ScanCodeWakeupActionView.swift
@@ -14,6 +14,7 @@ import VisionKit
 struct ScanCodeWakeupActionSettingsView: View {
     @ObservedObject private var manager = WakeupActionManager.shared
     @State private var isShowingScanner = false
+    @State private var isShowingShareSheet = false
     
     private let cameraAuthStatus = AVCaptureDevice.authorizationStatus(for: .video)
     private var isCameraAccessDenied: Bool {
@@ -71,6 +72,17 @@ struct ScanCodeWakeupActionSettingsView: View {
                 }
             }
         }
+        
+        if let image = UIImage(named: "scancode-image") {
+            Section {
+                ShareLink(
+                    item: Image(uiImage: image),
+                    preview: SharePreview("Alare Code", image: Image(uiImage: image))
+                ) {
+                    Label("Create New Code", systemImage: "qrcode")
+                }
+            }
+        }
     }
 }
 
@@ -80,7 +92,6 @@ struct ScanCodeWakeupActionExecutionView: View {
     @ObservedObject var vm: WakeupActionExecutionViewModel
     @State var incorrectCodeEntered = false
     private let expectedCode = WakeupActionManager.shared.settings.scanCode_code
-    private let specialCode = "https://cizz.uk/alare"
 
     var body: some View {
         VStack() {
@@ -101,7 +112,7 @@ struct ScanCodeWakeupActionExecutionView: View {
             }
             
             BarcodeScannerView { code in
-                if code == expectedCode || code == specialCode {
+                if code == expectedCode || code == completeWakeupActionURL {
                     vm.complete()
                 } else {
                     incorrectCodeEntered = true
diff --git a/Alare/Views/WakeupActions/WaveDevice/WaveDeviceWakeupActionView.swift b/Alare/Views/WakeupActions/WaveDevice/WaveDeviceWakeupActionView.swift
@@ -37,6 +37,11 @@ struct WaveDeviceWakeupActionSettingsView: View {
                 }
                 .pickerStyle(.wheel)
             }
+            
+            Picker("Sensitivity", selection: $manager.settings.waveDevice_sensitivity) {
+                Text("Medium").tag(0.5)
+                Text("High").tag(0.3)
+            }
         } footer: {
             Text("It's easier to earn points by making large, slow movements with your device rather than quick, small shakes.")
         }
@@ -59,7 +64,7 @@ struct WaveDeviceWakeupActionExecutionView: View {
     
     private let updateInterval: TimeInterval = 0.1
     private let gyroCancelRate: Double = 15.0
-    private let threshold: Double = 0.5
+    private let threshold: Double = WakeupActionManager.shared.settings.waveDevice_sensitivity
     
     private var remainingPoints: Int {
         max(pointsRequired - progress, 0)
diff --git a/Constants.swift b/Constants.swift
@@ -9,6 +9,8 @@ import SwiftUI
 
 let userDefaults = UserDefaults(suiteName: "group.net.cizzuk.alare")!
 
+let completeWakeupActionURL = "https://cizz.uk/alare/sc"
+
 let NightGradient = LinearGradient(
     gradient: Gradient(colors: [.dropblue.opacity(0.2), .black]),
     startPoint: .top,
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -121,6 +121,16 @@
     "Alare" : {
       "shouldTranslate" : false
     },
+    "Alare Code" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Alareのコード"
+          }
+        }
+      }
+    },
     "Alare's alarm will continue to snooze until you perform a Wake-up Action. To prevent oversleeping, select an action in advance that you believe will wake you up." : {
       "localizations" : {
         "ja" : {
@@ -287,6 +297,16 @@
         }
       }
     },
+    "Create New Code" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "新しいコードを作成"
+          }
+        }
+      }
+    },
     "Custom" : {
       "localizations" : {
         "ja" : {
@@ -397,6 +417,16 @@
         }
       }
     },
+    "High" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "高い"
+          }
+        }
+      }
+    },
     "I'm Awake!" : {
       "localizations" : {
         "ja" : {
@@ -467,6 +497,16 @@
         }
       }
     },
+    "Medium" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "中程度"
+          }
+        }
+      }
+    },
     "MIT License\n\nCopyright (c) 2026 Cizzuk\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." : {
       "shouldTranslate" : false
     },
@@ -660,6 +700,16 @@
         }
       }
     },
+    "Sensitivity" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "感度"
+          }
+        }
+      }
+    },
     "Set a Wake-up Action to stop the alarm." : {
       "localizations" : {
         "ja" : {

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,9 @@ struct MainView: View {`
`178`	`178`	`.onReceive(NotificationCenter.default.publisher(for: .focusFilterDidChange)) { _ in`
`179`	`179`	`vm.syncFocusFilter()`
`180`	`180`	`}`
	`181`	`+ .onContinueUserActivity(NSUserActivityTypeBrowsingWeb) { activity in`
	`182`	`+ vm.handleContinueUserActivity(activity: activity)`
	`183`	`+ }`
`181`	`184`	`.onOpenURL { url in`
`182`	`185`	`vm.handleOpenURL(url: url)`
`183`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@ struct WaveDeviceWakeupActionSettingsView: View {`
`37`	`37`	`}`
`38`	`38`	`.pickerStyle(.wheel)`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ Picker("Sensitivity", selection: $manager.settings.waveDevice_sensitivity) {`
	`42`	`+ Text("Medium").tag(0.5)`
	`43`	`+ Text("High").tag(0.3)`
	`44`	`+ }`
`40`	`45`	`} footer: {`
`41`	`46`	`Text("It's easier to earn points by making large, slow movements with your device rather than quick, small shakes.")`
`42`	`47`	`}`
`@@ -59,7 +64,7 @@ struct WaveDeviceWakeupActionExecutionView: View {`
`59`	`64`
`60`	`65`	`private let updateInterval: TimeInterval = 0.1`
`61`	`66`	`private let gyroCancelRate: Double = 15.0`
`62`		`- private let threshold: Double = 0.5`
	`67`	`+ private let threshold: Double = WakeupActionManager.shared.settings.waveDevice_sensitivity`
`63`	`68`
`64`	`69`	`private var remainingPoints: Int {`
`65`	`70`	`max(pointsRequired - progress, 0)`