From fdf2548fe3aa826da1f4ededa6adc9b0047eb810 Mon Sep 17 00:00:00 2001 From: True Zhuanjia Date: Wed, 11 Feb 2026 17:04:00 +0800 Subject: [PATCH] remove simple & complete legacy on screen controls --- VoidLink/Base.lproj/iPad.storyboard | 2 - VoidLink/Base.lproj/iPhone.storyboard | 2 - VoidLink/Input/OnScreenControls.h | 4 +- .../ViewControllers/SettingsViewController.m | 2 +- VoidLink/mul.lproj/iPad.xcstrings | 62 +------------------ VoidLink/mul.lproj/iPhone.xcstrings | 62 +------------------ 6 files changed, 5 insertions(+), 129 deletions(-) diff --git a/VoidLink/Base.lproj/iPad.storyboard b/VoidLink/Base.lproj/iPad.storyboard index fd661331..d2a7de0b 100644 --- a/VoidLink/Base.lproj/iPad.storyboard +++ b/VoidLink/Base.lproj/iPad.storyboard @@ -818,8 +818,6 @@ - - diff --git a/VoidLink/Base.lproj/iPhone.storyboard b/VoidLink/Base.lproj/iPhone.storyboard index 902b55b0..b62b877d 100644 --- a/VoidLink/Base.lproj/iPhone.storyboard +++ b/VoidLink/Base.lproj/iPhone.storyboard @@ -1357,8 +1357,6 @@ - - diff --git a/VoidLink/Input/OnScreenControls.h b/VoidLink/Input/OnScreenControls.h index 3c882bf1..0c9bf33c 100644 --- a/VoidLink/Input/OnScreenControls.h +++ b/VoidLink/Input/OnScreenControls.h @@ -31,13 +31,13 @@ static const float BUTTON_DIST = 20; CGFloat _dPadSizeFactor; } -+ (NSMutableDictionary *)layerVibrationStyleDic; ++ (NSMutableDictionary *_Nullable)layerVibrationStyleDic; typedef NS_ENUM(NSInteger, OnScreenControlsLevel) { OnScreenControlsLevelOff, + OnScreenControlsLevelCustom, OnScreenControlsLevelSimple, OnScreenControlsLevelFull, - OnScreenControlsLevelCustom, OnScreenControlsLevelAuto, // move it here instead of delete , to ensure integrity of the codes // Internal levels selected by ControllerSupport diff --git a/VoidLink/ViewControllers/SettingsViewController.m b/VoidLink/ViewControllers/SettingsViewController.m index a5ef4417..4c9ba59f 100644 --- a/VoidLink/ViewControllers/SettingsViewController.m +++ b/VoidLink/ViewControllers/SettingsViewController.m @@ -2130,7 +2130,7 @@ BOOL isCustomResolution(int resolutionSelected) { // this setting will be affected by touchMode, must be loaded before them. NSInteger onscreenControlsLevel = [self->tempSettings.onscreenControls integerValue]; - [self.onScreenWidgetSelector setSelectedSegmentIndex:onscreenControlsLevel]; + [self.onScreenWidgetSelector setSelectedSegmentIndex:MAX(onscreenControlsLevel,OnScreenControlsLevelCustom)]; [self.onScreenWidgetSelector addTarget:self action:@selector(onScreenWidgetChanged) forControlEvents:UIControlEventValueChanged]; [self onScreenWidgetChanged]; diff --git a/VoidLink/mul.lproj/iPad.xcstrings b/VoidLink/mul.lproj/iPad.xcstrings index e25950d6..9d4a97c3 100644 --- a/VoidLink/mul.lproj/iPad.xcstrings +++ b/VoidLink/mul.lproj/iPad.xcstrings @@ -4928,67 +4928,7 @@ } }, "qSU-wh-tqA.segmentTitles[1]" : { - "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[1] = \"Simple\"; ObjectID = \"qSU-wh-tqA\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Simple" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "简单" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "簡單" - } - }, - "zh-HK" : { - "stringUnit" : { - "state" : "translated", - "value" : "簡單" - } - } - } - }, - "qSU-wh-tqA.segmentTitles[2]" : { - "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[2] = \"Full\"; ObjectID = \"qSU-wh-tqA\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Full" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - }, - "zh-HK" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - } - } - }, - "qSU-wh-tqA.segmentTitles[3]" : { - "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[3] = \"Custom\"; ObjectID = \"qSU-wh-tqA\";", + "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[1] = \"Custom\"; ObjectID = \"qSU-wh-tqA\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { diff --git a/VoidLink/mul.lproj/iPhone.xcstrings b/VoidLink/mul.lproj/iPhone.xcstrings index 04cb6bb6..bae80c8f 100644 --- a/VoidLink/mul.lproj/iPhone.xcstrings +++ b/VoidLink/mul.lproj/iPhone.xcstrings @@ -5336,67 +5336,7 @@ } }, "UQu-Sg-YuF.segmentTitles[1]" : { - "comment" : "Class = \"UISegmentedControl\"; UQu-Sg-YuF.segmentTitles[1] = \"Simple\"; ObjectID = \"UQu-Sg-YuF\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Simple" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "简单" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "簡單" - } - }, - "zh-HK" : { - "stringUnit" : { - "state" : "translated", - "value" : "簡單" - } - } - } - }, - "UQu-Sg-YuF.segmentTitles[2]" : { - "comment" : "Class = \"UISegmentedControl\"; UQu-Sg-YuF.segmentTitles[2] = \"Full\"; ObjectID = \"UQu-Sg-YuF\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Full" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - }, - "zh-HK" : { - "stringUnit" : { - "state" : "translated", - "value" : "完整" - } - } - } - }, - "UQu-Sg-YuF.segmentTitles[3]" : { - "comment" : "Class = \"UISegmentedControl\"; UQu-Sg-YuF.segmentTitles[3] = \"Custom\"; ObjectID = \"UQu-Sg-YuF\";", + "comment" : "Class = \"UISegmentedControl\"; UQu-Sg-YuF.segmentTitles[1] = \"Custom\"; ObjectID = \"UQu-Sg-YuF\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : {