fix revert and minor improvements

Author: jurre111

lara/views/tweaks/MiscView.swift

@@ -40,6 +40,7 @@ enum FileLocation: String, CaseIterable {
     // case ota = "/var/Managed Preferences/mobile/com.apple.MobileAsset.plist"
 }
 
+// this only works for keys that are false by default as of now
 struct tweak: Identifiable {
     var id: String { key }
     var name: String
@@ -63,28 +64,34 @@ struct MiscView: View {
     @ObservedObject private var mgr = laramgr.shared
     let fm = FileManager.default
     @State private var tweaks: [tweaksection] = [
-        tweaksection(name: "SpringBoard", icon: "iphone", tweaks: [
-            tweak(name: "Disable airdrop time limit for everyone option", path: FileLocation.airdrop.rawValue, key: "OverrideTimeLimitEveryoneMode"),
-            tweak(name: "Disable lock after respring", path: FileLocation.springboard.rawValue, key: "SBDontLockAfterCrash"),
-            tweak(name: "Disable screen dimming while charging", path: FileLocation.springboard.rawValue, key: "SBDontDimOrLockOnAC"),
-            tweak(name: "Disable low battery alerts", path: FileLocation.springboard.rawValue, key: "SBHideLowPowerAlerts"),
-            tweak(name: "Hide AC Power on lockscreen", path: FileLocation.springboard.rawValue, key: "SBHideACPower"),
-            tweak(name: "Disable breadcrumbs", info: "Removes '< PreviousAppName' glyph in Status Bar when being forwarded to another app.", path: FileLocation.springboard.rawValue, key: "SBNeverBreadcrumb"),
-            tweak(name: "Show supervision text on lockscreen", info: "Shows info about the device supervision status and organization at the bottom of the lock screen.", path: FileLocation.springboard.rawValue, key: "SBShowSupervisionTextOnLockScreen"),
-            tweak(name: "Show Dynamic Island in screenshots", path: FileLocation.springboard.rawValue, key: "SBAlwaysShowSystemApertureInSnapshots"),
+        tweaksection(name: "User Interface", icon: "eye", tweaks: [
             tweak(name: "Hide Dynamic Island completely", path: FileLocation.springboard.rawValue, key: "SBSuppressDynamicIslandCompletely"),
-            tweak(name: "Enable airplay support for Stage Manager", path: FileLocation.springboard.rawValue, key: "SBExtendedDisplayOverrideSupportForAirPlayAndDontFileRadars"),
-            tweak(name: "Show Red/Green Authentication Line on Lock Screen", path: FileLocation.springboard.rawValue, key: "SBExtendedDisplayOverrideSupportForAirPlayAndDontFileRadars")
-        ]),
-        tweaksection(name: "Internal", icon: "gear", tweaks: [
+            tweak(name: "Show Red/Green Authentication Line on Lock Screen", path: FileLocation.springboard.rawValue, key: "SBExtendedDisplayOverrideSupportForAirPlayAndDontFileRadars"),
             tweak(name: "Show Build Version in Status Bar", path: FileLocation.globalPreferences.rawValue, key: "UIStatusBarShowBuildVersion"),
             tweak(name: "Force Right-to-Left Layout", path: FileLocation.globalPreferences.rawValue, key: "NSForceRightToLeftWritingDirection"),
             tweak(name: "Force Left-to-Right Layout", path: FileLocation.globalPreferences.rawValue, key: "NSForceLeftToRightWritingDirection"),
-            tweak(name: "Show Hidden Icons on Home Screen", info: "Shows hidden apps like Field Test and Continuity on the home screen.", path: FileLocation.globalPreferences.rawValue, key: "SBIconVisibility"),
             tweak(name: "Keyboard Character Flick", info: "Enables the iPad-style keyboard keyflicks on iPhones.", path: FileLocation.globalPreferences.rawValue, key: "GesturesEnabled"),
             tweak(name: "Disable Clock Icon Seconds Hand", path: FileLocation.globalPreferences.rawValue, key: "SBDisableClockIconSecondsHand"),
-            tweak(name: "Disable Spotlight Searching in Websites", path: FileLocation.globalPreferences.rawValue, key: "SBSearchDisabledDomains"),
             tweak(name: "Show Hardware Button Hints in Screenshots", path: FileLocation.globalPreferences.rawValue, key: "SBHardwareButtonHintDropletsAlwaysVisibleInSnapshots"),
+            tweak(name: "Hide Respring Icon", path: FileLocation.backboardd.rawValue, key: "BKHideAppleLogoOnLaunch"),
+            tweak(name: "Disable Breadcrumbs", info: "Removes '< PreviousAppName' glyph in Status Bar when being forwarded to another app.", path: FileLocation.springboard.rawValue, key: "SBNeverBreadcrumb"),
+            tweak(name: "Show Supervision Text on Lock Screen", info: "Shows info about the device supervision status and organization at the bottom of the lock screen.", path: FileLocation.springboard.rawValue, key: "SBShowSupervisionTextOnLockScreen")
+        ]),
+        tweaksection(name: "System", icon: "gear", tweaks: [
+            tweak(name: "Disable AirDrop Time Limit for Everyone Option", path: FileLocation.airdrop.rawValue, key: "OverrideTimeLimitEveryoneMode"),
+            tweak(name: "Disable Lock After Respring", path: FileLocation.springboard.rawValue, key: "SBDontLockAfterCrash"),
+            tweak(name: "Disable screen dimming while charging", path: FileLocation.springboard.rawValue, key: "SBDontDimOrLockOnAC"),
+            tweak(name: "Disable low battery alerts", path: FileLocation.springboard.rawValue, key: "SBHideLowPowerAlerts"),
+            tweak(name: "Hide AC Power on Lock Screen", path: FileLocation.springboard.rawValue, key: "SBHideACPower"),
+            tweak(name: "Show Dynamic Island in Screenshots", path: FileLocation.springboard.rawValue, key: "SBAlwaysShowSystemApertureInSnapshots"),
+            tweak(name: "Enable AirPlay support for Stage Manager", path: FileLocation.springboard.rawValue, key: "SBExtendedDisplayOverrideSupportForAirPlayAndDontFileRadars"),
+            tweak(name: "Show Hidden Icons on Home Screen", info: "Shows hidden apps like Field Test and Continuity on the home screen.", path: FileLocation.globalPreferences.rawValue, key: "SBIconVisibility"),
+            tweak(name: "Disable Spotlight Searching in Websites", path: FileLocation.globalPreferences.rawValue, key: "SBSearchDisabledDomains"),
+            tweak(name: "Vibrate on Raise-to-Wake", path: FileLocation.coreMotion.rawValue, key: "EnableWakeGestureHaptic"),
+            tweak(name: "Play Sound on Paste", path: FileLocation.pasteboard.rawValue, key: "PlaySoundOnPaste"),
+            tweak(name: "Show Notifications for System Pastes", path: FileLocation.pasteboard.rawValue, key: "AnnounceAllPastes")
+        ]),
+        tweaksection(name: "Debugging", icon: "ladybug.fill", tweaks: [
             tweak(name: "Metal HUD Debug", path: FileLocation.globalPreferences.rawValue, key: "MetalForceHudEnabled"),
             tweak(name: "iMessage Debugging", path: FileLocation.globalPreferences.rawValue, key: "iMessageDiagnosticsEnabled"),
             tweak(name: "Continuity Debugging", path: FileLocation.globalPreferences.rawValue, key: "IDSDiagnosticsEnabled"),
@@ -93,11 +100,7 @@ struct MiscView: View {
             tweak(name: "App Store Debug Gesture", path: FileLocation.appStore.rawValue, key: "debugGestureEnabled"),
             tweak(name: "Notes Debug Mode", path: FileLocation.notes.rawValue, key: "DebugModeEnabled"),
             tweak(name: "Show Touches With Debug Info", path: FileLocation.backboardd.rawValue, key: "BKDigitizerVisualizeTouches"),
-            tweak(name: "Hide respring icon", path: FileLocation.backboardd.rawValue, key: "BKHideAppleLogoOnLaunch"),
-            tweak(name: "Vibrate on Raise-to-Wake", path: FileLocation.coreMotion.rawValue, key: "EnableWakeGestureHaptic"),
-            tweak(name: "Play Sound on Paste", path: FileLocation.pasteboard.rawValue, key: "PlaySoundOnPaste"),
-            tweak(name: "Show Notifications for System Pastes", path: FileLocation.pasteboard.rawValue, key: "AnnounceAllPastes"),
-        ]),
+        ])
     ]
 
     var body: some View {
@@ -123,7 +126,7 @@ struct MiscView: View {
         }
     }
 
-    // yes this is almost exactly the same as dirtyZeroView, the whole view is
+    // yes this is copied from dirtyZeroView, the whole view is
     private var tweaksui: some View {
         ForEach($tweaks) { $section in
             Section(header: HeaderDropdown(text: section.name, icon: section.icon, isExpanded: $section.isexpanded, useItemCount: true, itemCount: section.tweaks.count)) {
@@ -154,7 +157,6 @@ struct MiscView: View {
                     if result.ok, let value = result.value as? Bool {
                         tweak.state.og = value
                         tweak.state.enabled = value
-                        mgr.logmsg("Loaded tweak \(tweak.key) at \(tweak.path) with value \(value)")
                     } else if !(result.message == "key \(tweak.key) not found") {
                         errormsg += "Failed to read \(tweak.path): \(result.message)\n"
                         tweak.readfailed = true
@@ -171,7 +173,7 @@ struct MiscView: View {
 
 	func apply() {
         var errormsg = ""
-        // check if the tweak was modified, else just leave it
+        // only apply modified tweaks
         for section in tweaks {
             for tweak in section.tweaks where tweak.state.og != tweak.state.enabled {
                 let result = mgr.setplistvalue(path: tweak.path, key: (tweak.key, tweak.state.enabled ? true : nil), force: true)
@@ -193,9 +195,11 @@ struct MiscView: View {
         var errormsg = ""
         for section in tweaks {
             for tweak in section.tweaks {
-                let result = mgr.setplistvalue(path: tweak.path, key: (tweak.key, nil))
-                if !result.ok {
-                    errormsg += "Failed to reset tweak \(tweak.key) at \(tweak.path): \(result.message)\n"
+                if fm.fileExists(atPath: tweak.path) {
+                    let result = mgr.setplistvalue(path: tweak.path, key: (tweak.key, nil))
+                    if !result.ok {
+                        errormsg += "Failed to reset tweak \(tweak.key) at \(tweak.path): \(result.message)\n"
+                    }
                 }
             }
         }