adjust position by dragging

Signed-off-by: 82Flex <[email protected]>

Author: Lessica

CHANGELOG.txt

@@ -1,2 +1 @@
-- Add `UILaunchStoryboardName` entry to Info.plist
-- Fix touches on iOS 17
+- Adjust vertical position of the HUD by tapping and long-pressing (Not available for centered HUD)

HUDApp.mm

@@ -124,7 +124,7 @@ static __used void _HUDEventCallback(void *target, void *refcon, IOHIDServiceRef
 
             UIView *keyView = [keyWindow hitTest:[rep location] withEvent:nil];
 
-            UITouchPhase phase = UITouchPhaseCancelled;
+            UITouchPhase phase = UITouchPhaseEnded;
             if ([rep isTouchDown])
                 phase = UITouchPhaseBegan;
             else if ([rep isMove])

HUDMainApplication.mm

@@ -94,6 +94,16 @@ @implementation RootViewController {
     BOOL _supportsCenterMost;
 }
 
+- (void)registerNotifications
+{
+    int token;
+    notify_register_dispatch(NOTIFY_RELOAD_APP, &token, dispatch_get_main_queue(), ^(int token) {
+        [self loadUserDefaults:YES];
+    });
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toggleHUDNotificationReceived:) name:kToggleHUDAfterLaunchNotificationName object:nil];
+}
+
 - (void)loadView
 {
     CGRect bounds = UIScreen.mainScreen.bounds;
@@ -244,7 +254,7 @@ - (void)viewDidLayoutSubviews {
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toggleHUDNotificationReceived:) name:kToggleHUDAfterLaunchNotificationName object:nil];
+    [self registerNotifications];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -315,6 +325,10 @@ - (NSInteger)selectedMode
 - (void)setSelectedMode:(NSInteger)selectedMode
 {
     [self loadUserDefaults:NO];
+    // Remove some keys that are not persistent
+    [_userDefaults removeObjectsForKeys:@[
+        @"currentPositionY",
+    ]];
     [_userDefaults setObject:@(selectedMode) forKey:@"selectedMode"];
     [self saveUserDefaults];
 }
@@ -403,6 +417,20 @@ - (void)setUsesRotation:(BOOL)usesRotation
     [self saveUserDefaults];
 }
 
+- (BOOL)keepInPlace
+{
+    [self loadUserDefaults:NO];
+    NSNumber *mode = [_userDefaults objectForKey:@"keepInPlace"];
+    return mode ? [mode boolValue] : NO;
+}
+
+- (void)setKeepInPlace:(BOOL)keepInPlace
+{
+    [self loadUserDefaults:NO];
+    [_userDefaults setObject:@(keepInPlace) forKey:@"keepInPlace"];
+    [self saveUserDefaults];
+}
+
 - (void)reloadMainButtonState
 {
     _isHUDActive = IsHUDEnabled();

MainApplication.mm

@@ -16,6 +16,7 @@ TrollSpeed_CFLAGS += -include hud-prefix.pch
 TrollSpeed_CCFLAGS += -DNOTIFY_LAUNCHED_HUD=\"ch.xxtou.notification.hud.launched\"
 TrollSpeed_CCFLAGS += -DNOTIFY_DISMISSAL_HUD=\"ch.xxtou.notification.hud.dismissal\"
 TrollSpeed_CCFLAGS += -DNOTIFY_RELOAD_HUD=\"ch.xxtou.notification.hud.reload\"
+TrollSpeed_CCFLAGS += -DNOTIFY_RELOAD_APP=\"ch.xxtou.notification.app.reload\"
 MainApplication.mm_CCFLAGS += -std=c++14
 TrollSpeed_FRAMEWORKS += CoreGraphics QuartzCore UIKit
 TrollSpeed_PRIVATE_FRAMEWORKS += BackBoardServices GraphicsServices IOKit SpringBoardServices

Makefile

@@ -105,7 +105,7 @@ + (NSInteger)receiveAXEventID:(NSInteger)eventId
   BOOL newState = !oldState;
   if (newState)
   {
-    if (phase == UITouchPhaseEnded)
+    if (phase == UITouchPhaseEnded || phase == UITouchPhaseCancelled)
       return deleted;
     touch = [[UITouch alloc] initAtPoint:coordinate inWindow:window onView:view];
     [_livingTouchAry addObject:touch];

TSEventFetcher.mm

@@ -12,22 +12,24 @@ import UIKit
     internal var restartRequired = false
 
     open override func settingsCount() -> Int {
-        return 6;
+        return 7;
     }
 
     open override func settingTitle(index: Int, highlighted: Bool) -> String {
         if index == 0 {
             return NSLocalizedString("Pass-through", comment: "")
         } else if index == 1 {
-            return NSLocalizedString("Incoming Only", comment: "")
+            return NSLocalizedString("Keep In-place", comment: "")
         } else if index == 2 {
-            return NSLocalizedString("Unit", comment: "")
+            return NSLocalizedString("Incoming Only", comment: "")
         } else if index == 3 {
-            return NSLocalizedString("Prefixes", comment: "")
+            return NSLocalizedString("Landscape", comment: "")
         } else if index == 4 {
             return NSLocalizedString("Size", comment: "")
+        } else if index == 5 {
+            return NSLocalizedString("Unit", comment: "")
         } else {
-            return NSLocalizedString("Landscape", comment: "")
+            return NSLocalizedString("Prefixes", comment: "")
         }
     }
 
@@ -36,44 +38,41 @@ import UIKit
             if restartRequired {
                 return NSLocalizedString("Re-open to apply", comment: "")
             } else {
-                if alreadyLaunched {
-                    restartRequired = true
-                }
                 if (highlighted) {
                     return NSLocalizedString("ON", comment: "")
                 } else {
                     return NSLocalizedString("OFF", comment: "")
                 }
             }
-        } else if index == 1 {
+        } else if index == 1 || index == 2 {
             if (highlighted) {
                 return NSLocalizedString("ON", comment: "")
             } else {
                 return NSLocalizedString("OFF", comment: "")
             }
-        } else if index == 2 {
-            if (highlighted) {
-                return NSLocalizedString("b/s", comment: "")
-            } else {
-                return NSLocalizedString("B/s", comment: "")
-            }
         } else if index == 3 {
             if (highlighted) {
-                return NSLocalizedString("↑↓", comment: "")
+                return NSLocalizedString("Follow", comment: "")
             } else {
-                return NSLocalizedString("▲▼", comment: "")
+                return NSLocalizedString("Hide", comment: "")
             }
         } else if index == 4 {
             if (highlighted) {
                 return NSLocalizedString("Large", comment: "")
             } else {
                 return NSLocalizedString("Standard", comment: "")
             }
+        } else if index == 5 {
+            if (highlighted) {
+                return NSLocalizedString("b/s", comment: "")
+            } else {
+                return NSLocalizedString("B/s", comment: "")
+            }
         } else {
             if (highlighted) {
-                return NSLocalizedString("Follow", comment: "")
+                return NSLocalizedString("↑↓", comment: "")
             } else {
-                return NSLocalizedString("Hide", comment: "")
+                return NSLocalizedString("▲▼", comment: "")
             }
         }
     }
@@ -82,15 +81,17 @@ import UIKit
         if index == 0 {
             return "passthroughMode"
         } else if index == 1 {
-            return "singleLineMode"
+            return "keepInPlace"
         } else if index == 2 {
-            return "usesBitrate"
+            return "singleLineMode"
         } else if index == 3 {
-            return "usesArrowPrefixes"
+            return "usesRotation"
         } else if index == 4 {
             return "usesLargeFont"
+        } else if index == 5 {
+            return "usesBitrate"
         } else {
-            return "usesRotation"
+            return "usesArrowPrefixes"
         }
     }
 
@@ -104,6 +105,9 @@ import UIKit
     }
 
     open override func settingDidSelect(index: Int, completion: @escaping () -> ()) {
+        if index == 0 && alreadyLaunched {
+            restartRequired = true
+        }
         delegate?.settingDidSelect(key: settingKey(index: index))
         completion()
     }