remove simple & complete legacy on screen controls

VoidLink/Base.lproj/iPad.storyboard

@@ -818,8 +818,6 @@
                                         <rect key="frame" x="0.0" y="25.5" width="380" height="32"/>
                                         <segments>
                                             <segment title="Off"/>
-                                            <segment title="Simple"/>
-                                            <segment title="Full"/>
                                             <segment title="Custom"/>
                                         </segments>
                                         <color key="tintColor" red="0.6716768741607666" green="0.61711704730987549" blue="0.99902987480163574" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

VoidLink/Base.lproj/iPhone.storyboard

@@ -1357,8 +1357,6 @@
                                         <rect key="frame" x="0.0" y="25.5" width="380" height="32"/>
                                         <segments>
                                             <segment title="Off"/>
-                                            <segment title="Simple"/>
-                                            <segment title="Full"/>
                                             <segment title="Custom"/>
                                         </segments>
                                         <color key="tintColor" red="0.6716768742" green="0.61711704730000005" blue="0.99902987480000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

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

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];
 

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\";",
+      "comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[1] = \"Custom\"; 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\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {

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\";",
+      "comment" : "Class = \"UISegmentedControl\"; UQu-Sg-YuF.segmentTitles[1] = \"Custom\"; 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\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {