reverting the rdar/status bar fix

gui/main_window.py

@@ -233,12 +233,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.ui.dynamicIslandDrp.removeItem(5)
             except:
                 pass
-            rdar_title = tweaks["RdarFix"].get_rdar_title()
+            self.set_rdar_fix_label()
-            if rdar_title == "hide":
-                self.ui.rdarFixChk.hide()
-            else:
-                self.ui.rdarFixChk.show()
-                self.ui.rdarFixChk.setText(f"{rdar_title} (modifies resolution)")
             device_ver = Version(self.device_manager.data_singleton.current_device.version)
             # toggle option visibility for the minimum versions
             for version in MinTweakVersions.keys():
@@ -398,12 +393,22 @@ class MainWindow(QtWidgets.QMainWindow):
 
 
     ## MOBILE GESTALT PAGE
+    def set_rdar_fix_label(self):
+        rdar_title = tweaks["RdarFix"].get_rdar_title()
+        if rdar_title == "hide":
+            self.ui.rdarFixChk.hide()
+        else:
+            self.ui.rdarFixChk.show()
+            self.ui.rdarFixChk.setText(f"{rdar_title} (modifies resolution)")
+    
     def on_dynamicIslandDrp_activated(self, index: int):
         if index == 0:
             tweaks["DynamicIsland"].set_enabled(False)
+            tweaks["RdarFix"].set_di_type(-1)
         else:
             tweaks["DynamicIsland"].set_selected_option(index - 1)
             tweaks["RdarFix"].set_di_type(tweaks["DynamicIsland"].value[tweaks["DynamicIsland"].get_selected_option()])
+        self.set_rdar_fix_label()
     def on_rdarFixChk_clicked(self, checked: bool):
         tweaks["RdarFix"].set_enabled(checked)
 

qt/mainwindow.ui

@@ -1566,7 +1566,7 @@ QToolButton:pressed {
               <item>
                <widget class="QLabel" name="label">
                 <property name="text">
-                 <string>Nugget GUI - Version 4.0</string>
+                 <string>Nugget GUI - Version 4.0.1</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

qt/mainwindow_ui.py

@@ -2718,7 +2718,7 @@ class Ui_Nugget(object):
         self.toolButton_15.setText(QCoreApplication.translate("Nugget", u"Additional Thanks", None))
         self.libiBtn.setText(QCoreApplication.translate("Nugget", u"pymobiledevice3", None))
         self.qtBtn.setText(QCoreApplication.translate("Nugget", u"Qt Creator", None))
-        self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.0", None))
+        self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.0.1", None))
         self.statusBarLbl.setText(QCoreApplication.translate("Nugget", u"Mobile Gestalt", None))
         self.label_9.setText(QCoreApplication.translate("Nugget", u"Device Subtype Preset", None))
         self.dynamicIslandDrp.setItemText(0, QCoreApplication.translate("Nugget", u"None", None))

qt/ui_mainwindow.py

@@ -2718,7 +2718,7 @@ class Ui_Nugget(object):
         self.toolButton_15.setText(QCoreApplication.translate("Nugget", u"Additional Thanks", None))
         self.libiBtn.setText(QCoreApplication.translate("Nugget", u"pymobiledevice3", None))
         self.qtBtn.setText(QCoreApplication.translate("Nugget", u"Qt Creator", None))
-        self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.0", None))
+        self.label.setText(QCoreApplication.translate("Nugget", u"Nugget GUI - Version 4.0.1", None))
         self.statusBarLbl.setText(QCoreApplication.translate("Nugget", u"Mobile Gestalt", None))
         self.label_9.setText(QCoreApplication.translate("Nugget", u"Device Subtype Preset", None))
         self.dynamicIslandDrp.setItemText(0, QCoreApplication.translate("Nugget", u"None", None))

tweaks/tweak_classes.py

@@ -68,6 +68,7 @@ class RdarFixTweak(BasicPlistTweak):
     def __init__(self, divider_below: bool = False):
         super().__init__(label="Fix RDAR (modifies resolution)", file_location=FileLocation.resolution, key=None, divider_below=divider_below)
         self.mode = 0
+        self.di_type = -1
 
     def get_rdar_mode(self, model: str) -> int:
         if (model == "iPhone11,2" or model == "iPhone11,4" or model == "iPhone11,6"
@@ -84,8 +85,12 @@ class RdarFixTweak(BasicPlistTweak):
     
     def get_rdar_title(self) -> str:
         if self.mode == 1 or self.mode == 3:
+            if self.di_type == -1:
+                return "Revert RDAR fix"
             return "Fix RDAR"
         elif self.mode == 2:
+            if self.di_type == -1:
+                return "Revert Status Bar Fix"
             return "Dynamic Island Status Bar Fix"
         return "hide"
     
@@ -95,7 +100,10 @@ class RdarFixTweak(BasicPlistTweak):
     def apply_tweak(self, other_tweaks: dict) -> dict:
         if not self.enabled:
             return other_tweaks
-        if self.mode == 1 or self.mode == 3:
+        if self.di_type == -1:
+            # revert the fix
+            other_tweaks[self.file_location] = {}
+        elif self.mode == 1 or self.mode == 3:
             plist = {
                 "canvas_height": 1791,
                 "canvas_width": 828