update UI string

VoidLink/Input/OnScreenWidgetView.swift

@@ -3083,7 +3083,7 @@ import ObjectiveC.runtime
     }
     
     // MARK: - Auto Dock
-    private static let autoDockExposedEdgeLength: CGFloat = GenericUtils.isIPhone() ? 90 : 105
+    private static let autoDockExposedEdgeLength: CGFloat = GenericUtils.isIPhone() ? 90 : 90
     private static let autoDockExposedThickness: CGFloat = 17
     private static let autoDockVerticalInset: CGFloat = 12
     @objc var autoDockIdleDuration: TimeInterval = 5

VoidLink/Localization/Localizable.xcstrings

@@ -3259,6 +3259,35 @@
         }
       }
     },
+    "customOscTip" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "\n1. From %@ edge, slide %@ screen width to open toolbox menu.\n\n2. Enter “on-screen widget tool”."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "\n1. 从屏幕 %@ 边缘向内滑动 %@ 屏幕宽度, 打开工具栏菜单.\n\n2. 选择“打开屏显控件工具”."
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "\n1. 從螢幕 %@ 邊緣向內滑動 %@ 螢幕寬度，開啟工具欄選單.\n\n2. 選擇「調整螢幕小工具版面配置」。"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "\n1. 從螢幕 %@ 邊緣向內滑動 %@ 螢幕寬度，開啟工具欄選單.\n\n2. 選擇「調整螢幕小工具版面配置」。"
+          }
+        }
+      }
+    },
     "DecelerationRateX: %.3f  " : {
       "extractionState" : "manual",
       "localizations" : {
@@ -4042,6 +4071,29 @@
         }
       }
     },
+    "Edit layout during streaming" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "串流时修改布局"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "在串流視圖中修改佈局"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "在串流視圖中修改佈局"
+          }
+        }
+      }
+    },
     "Edit Selected Widget" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -6766,7 +6818,7 @@
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "needs_review",
+            "state" : "translated",
             "value" : "- 关闭“手柄”菜单分区的DS4陀螺仪映射后， 方可将陀螺仪直接映射为手柄或鼠标。\n\n- “体感控制”菜单分区的所有设置均保存在屏显控件配置中，可在右边缘滑出的工具箱菜单中切换。\n\n- 体感控制陀螺仪可由手柄按键或屏显按键开关。"
           }
         },
@@ -7873,29 +7925,6 @@
         }
       }
     },
-    "Open widget tool in streaming by:\nSliding from %@ screen edge to open cmd tool.\nOr tap %d fingers on stream view, number of fingers required:" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在串流视图中修改布局:\n从屏幕%@边缘向内滑动.\n或轻按%d根手指, 手势需要的手指数量:"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在串流中開啟小工具的方式：\n從螢幕%@邊緣滑動以開啟指令工具。\n或在串流畫面上用%d指輕點，所需的手指數量："
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在串流中開啟小工具的方式：\n從螢幕%@邊緣滑動以開啟指令工具。\n或在串流畫面上用%d指輕點，所需的手指數量："
-          }
-        }
-      }
-    },
     "Opens pencil pressure curve tool" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -9426,29 +9455,6 @@
         }
       }
     },
-    "Rebase in Streaming" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "串流中修改布局"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在串流中修改"
-          }
-        },
-        "zh-HK" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "在串流中修改"
-          }
-        }
-      }
-    },
     "redirectMicStackTip" : {
       "extractionState" : "manual",
       "localizations" : {

VoidLink/ViewControllers/SettingsViewController.m

@@ -2231,23 +2231,19 @@ BOOL isCustomResolution(int resolutionSelected) {
 }
 
 - (void)showCustomOswTip {
-    
-    if (!self->_mainFrameViewController.settingsExpandedInStreamView) {
-        [self invokeOscLayout]; // Don't open osc layout tool immediately during streaming
-    }
-
-    /*
     GenericUtils.autoPopSoftKeyboard = !GenericUtils.isIPhone;
     NSString* edgeSide = self.slideToSettingsScreenEdgeSelector.selectedSegmentIndex == 1 ? [LocalizationHelper localizedStringForKey:@"left"] : [LocalizationHelper localizedStringForKey:@"right"];
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Rebase in Streaming"]
-                                                                             message:[LocalizationHelper localizedStringForKey:@"Open widget tool in streaming by:\nSliding from %@ screen edge to open cmd tool.\nOr tap %d fingers on stream view, number of fingers required:", edgeSide, self->oswLayoutFingers]
+    NSString* slideDist = [NSString stringWithFormat:@"%d%%", (int)(self.slideToMenuDistanceSlider.value*100)];
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Edit layout during streaming"]
+                                                                             message:[LocalizationHelper localizedStringForKey:@"customOscTip", edgeSide, slideDist]
                                                                       preferredStyle:UIAlertControllerStyleAlert];
-    
+    /*
     [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
         textField.placeholder = [LocalizationHelper localizedStringForKey:@"%d", self->oswLayoutFingers];
-        textField.keyboardType = UIKeyboardTypeASCIICapable;
+        textField.keyboardType = UIKeyboardTypeNumberPad;
         textField.delegate = self;
     }];
+    */
     
     UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Cancel"]
                                                            style:UIAlertActionStyleDefault
@@ -2256,6 +2252,7 @@ BOOL isCustomResolution(int resolutionSelected) {
     UIAlertAction *okAction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"OK"]
                                                        style:UIAlertActionStyleDefault
                                                      handler:^(UIAlertAction *action) {
+        /*
         UITextField *textField = alertController.textFields.firstObject;
         NSString *inputText = textField.text;
         NSInteger fingers = [inputText integerValue];
@@ -2264,21 +2261,20 @@ BOOL isCustomResolution(int resolutionSelected) {
             NSLog(@"OK button tapped with %d fingers", (uint16_t)fingers);
         } else {
             NSLog(@"OK button tapped with no change");
-        }
+        } */
         
         // Continue execution after the alert is dismissed
         if (!self->_mainFrameViewController.settingsExpandedInStreamView) {
             [self invokeOscLayout]; // Don't open osc layout tool immediately during streaming
         }
-        
-        // [self findDynamicLabelFromStack:self.onScreenWidgetStack].text = [self isCustomOswEnabled] ? [LocalizationHelper localizedStringForKey:@"%d finger tap", self->oswLayoutFingers] : @"";
-        [self handleOswGestureChange];
+        /*
+        [self findDynamicLabelFromStack:self.onScreenWidgetStack].text = [self isCustomOswEnabled] ? [LocalizationHelper localizedStringForKey:@"%d finger tap", self->oswLayoutFingers] : @"";
+        [self handleOswGestureChange]; */
     }];
     
     [alertController addAction:cancelAction];
     [alertController addAction:okAction];
     [self presentViewController:alertController animated:YES completion:nil];
-     */
 }
 
 - (void)hdrSwitchFlipped:(UISwitch* )sender{