fix URL Scheme not working issue, add shortcut to toggle hud by long …

…press icon
AsakuraFuuko · Mar 14, 2024 · 3858e07 · 3858e07
1 parent 4c32629
commit 3858e07
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 19 deletions.
diff --git a/layout/Applications/Helium.app/Info.plist b/layout/Applications/Helium.app/Info.plist
@@ -44,8 +44,6 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
 			<key>CFBundleURLName</key>
 			<string>com.leemin.helium</string>
 			<key>CFBundleURLSchemes</key>
@@ -54,6 +52,17 @@
 			</array>
 		</dict>
 	</array>
+	<key>UIApplicationShortcutItems</key>
+	<array>
+		<dict>
+			<key>UIApplicationShortcutItemIconSymbolName</key>
+			<string>switch.2</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>Toggle HUD</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>com.leemin.helium.shortcut.toggle-hud</string>
+		</dict>
+	</array>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>CFBundleLocalizations</key>

diff --git a/layout/Applications/Helium.app/en.lproj/InfoPlist.strings b/layout/Applications/Helium.app/en.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+"Toggle HUD" = "Toggle HUD";
diff --git a/layout/Applications/Helium.app/zh-Hans.lproj/InfoPlist.strings b/layout/Applications/Helium.app/zh-Hans.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+"Toggle HUD" = "打开/关闭悬浮窗";
diff --git a/src/app/MainApplicationDelegate.mm b/src/app/MainApplicationDelegate.mm
@@ -2,8 +2,10 @@
 #import "MainApplication.h"
 #import "Helium-Swift.h"
 
+#import "../hud/HUDHelper.h"
 #import "../extensions/FontUtils.h"
 #import "../extensions/Weather/HWeatherController.h"
+#import "../helpers/private_headers/UIApplication+Private.h"
 
 @implementation MainApplicationDelegate
 
@@ -32,4 +34,30 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
+- (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL succeeded))completionHandler {
+    if ([shortcutItem.type isEqualToString:@"com.leemin.helium.shortcut.toggle-hud"]) {
+        SetHUDEnabled(!IsHUDEnabled());
+        [[UIApplication sharedApplication] suspend];
+    }
+}
+
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
+    if ([url.scheme isEqualToString:@"helium"]) {
+        if ([url.host isEqualToString:@"toggle"]) {
+            SetHUDEnabled(!IsHUDEnabled());
+            [[UIApplication sharedApplication] suspend];
+            return YES;
+        } else if ([url.host isEqualToString:@"on"]) {
+            SetHUDEnabled(true);
+            [[UIApplication sharedApplication] suspend];
+            return YES;
+        } else if ([url.host isEqualToString:@"off"]) {
+            SetHUDEnabled(false);
+            [[UIApplication sharedApplication] suspend];
+            return YES;
+        }
+    }
+    return NO;
+}
+
 @end
diff --git a/src/views/navigation/HomePageView.swift b/src/views/navigation/HomePageView.swift
@@ -74,28 +74,14 @@ struct HomePageView: View {
       .onAppear {
         #if !targetEnvironment(simulator)
           isNowEnabled = IsHUDEnabledBridger()
+          NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: .main) { _ in
+              isNowEnabled = IsHUDEnabledBridger()
+          }
         #endif
         if UserDefaults.standard.string(forKey: "dateLocale", forPath: USER_DEFAULTS_PATH) == nil {
             UserDefaults.standard.setValue(Locale.current.languageCode!, forKey: "dateLocale", forPath: USER_DEFAULTS_PATH)
         }
       }
-      .onOpenURL(perform: { url in
-        let _ = FileManager.default
-        // MARK: URL Schemes
-        if url.absoluteString == "helium://toggle" {
-          #if !targetEnvironment(simulator)
-            toggleHUD(!isNowEnabled)
-          #endif
-        } else if url.absoluteString == "helium://on" {
-          #if !targetEnvironment(simulator)
-            toggleHUD(true)
-          #endif
-        } else if url.absoluteString == "helium://off" {
-          #if !targetEnvironment(simulator)
-            toggleHUD(false)
-          #endif
-        }
-      })
       .navigationTitle(Text(NSLocalizedString("Helium", comment: "")))
     }
     .navigationViewStyle(StackNavigationViewStyle())