Fix dialogs not showing issue (adresses #735)

Author: tsterbak

openandroidinstaller/views/addon_view.py

@@ -75,7 +75,9 @@ def build(self):
 """,
             ),
             actions=[
-                TextButton("Close", on_click=self.close_close_explain_addons_dlg),
+                TextButton(
+                    "Close", on_click=lambda _: self.page.close(self.dlg_explain_addons)
+                ),
             ],
             actions_alignment="end",
             shape=ContinuousRectangleBorder(radius=0),
@@ -98,7 +100,7 @@ def build(self):
         # create help/info button to show the help dialog
         info_button = OutlinedButton(
             "What kind of addons?",
-            on_click=self.open_explain_addons_dlg,
+            on_click=lambda _: self.page.open(self.dlg_explain_addons),
             expand=True,
             icon=Icons.HELP_OUTLINE_OUTLINED,
             icon_color=Colors.DEEP_ORANGE_500,
@@ -192,17 +194,6 @@ def build(self):
         )
         return self.view
 
-    def open_explain_addons_dlg(self, e):
-        """Open the dialog to explain addons."""
-        self.page.dialog = self.dlg_explain_addons
-        self.dlg_explain_addons.open = True
-        self.page.update()
-
-    def close_close_explain_addons_dlg(self, e):
-        """Close the dialog to explain addons."""
-        self.dlg_explain_addons.open = False
-        self.page.update()
-
     def pick_addons_result(self, e: FilePickerResultEvent):
         path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
         # update the textfield with the name of the file

openandroidinstaller/views/requirements_view.py

@@ -91,7 +91,10 @@ def init_visuals(
 On some devices, the build version is basically the firmware version.""",
             ),
             actions=[
-                TextButton("Close", on_click=self.close_find_version_dlg),
+                TextButton(
+                    "Close",
+                    on_click=lambda _: self.page.close(self.dlg_howto_find_versions),
+                ),
             ],
             actions_alignment="end",
             shape=ContinuousRectangleBorder(radius=0),
@@ -103,7 +106,7 @@ def build(self):
         # create help/info button to show the help dialog
         info_button = OutlinedButton(
             "How to Find the version",
-            on_click=self.open_find_version_dlg,
+            on_click=lambda _: self.page.open(self.dlg_howto_find_versions),
             expand=False,
             icon=Icons.HELP_OUTLINE_OUTLINED,
             icon_color=Colors.DEEP_ORANGE_500,
@@ -306,14 +309,3 @@ def enable_continue_button(self, e):
         logger.info("All requirements ticked. Allow to continue")
         self.continue_button.disabled = False
         self.right_view.update()
-
-    def open_find_version_dlg(self, e):
-        """Open the dialog to explain how to find the android and firmware version."""
-        self.page.dialog = self.dlg_howto_find_versions
-        self.dlg_howto_find_versions.open = True
-        self.page.update()
-
-    def close_find_version_dlg(self, e):
-        """Close the dialog to explain how to find the android and firmware version."""
-        self.dlg_howto_find_versions.open = False
-        self.page.update()

openandroidinstaller/views/select_view.py

@@ -88,7 +88,9 @@ def init_visuals(
 OpenAndroidInstaller works with the [TWRP recovery project](https://twrp.me/about).""",
             ),
             actions=[
-                TextButton("Close", on_click=self.close_close_explain_images_dlg),
+                TextButton(
+                    "Close", on_click=lambda _: self.page.close(self.dlg_explain_images)
+                ),
             ],
             actions_alignment="end",
             shape=ContinuousRectangleBorder(radius=0),
@@ -172,7 +174,7 @@ def build(self):
         # create help/info button to show the help dialog for the image and recovery selection
         explain_images_button = OutlinedButton(
             "What is this?",
-            on_click=self.open_explain_images_dlg,
+            on_click=lambda _: self.page.open(self.dlg_explain_images),
             expand=True,
             icon=Icons.HELP_OUTLINE_OUTLINED,
             icon_color=Colors.DEEP_ORANGE_500,
@@ -374,7 +376,10 @@ def toggle_additional_image_selection(self):
             ),
             actions=[
                 TextButton(
-                    "Close", on_click=self.close_close_explain_additional_images_dlg
+                    "Close",
+                    on_click=lambda _: self.page.close(
+                        self.dlg_explain_additional_images
+                    ),
                 ),
             ],
             actions_alignment="end",
@@ -384,7 +389,7 @@ def toggle_additional_image_selection(self):
         # create help/info button to show the help dialog for the image and recovery selection
         explain_additional_images_button = OutlinedButton(
             "Why do I need this and where do I get it?",
-            on_click=self.open_explain_additional_images_dlg,
+            on_click=lambda _: self.page.open(self.dlg_explain_additional_images),
             expand=True,
             icon=Icons.HELP_OUTLINE_OUTLINED,
             icon_color=Colors.DEEP_ORANGE_500,
@@ -500,28 +505,6 @@ def toggle_additional_image_selection(self):
         self.additional_image_selection.controls = additional_image_selection
         self.additional_image_selection.update()
 
-    def open_explain_images_dlg(self, e):
-        """Open the dialog to explain OS and recovery image."""
-        self.page.dialog = self.dlg_explain_images
-        self.dlg_explain_images.open = True
-        self.page.update()
-
-    def close_close_explain_images_dlg(self, e):
-        """Close the dialog to explain OS and recovery image."""
-        self.dlg_explain_images.open = False
-        self.page.update()
-
-    def open_explain_additional_images_dlg(self, e):
-        """Open the dialog to explain additional images."""
-        self.page.dialog = self.dlg_explain_additional_images
-        self.dlg_explain_additional_images.open = True
-        self.page.update()
-
-    def close_close_explain_additional_images_dlg(self, e):
-        """Close the dialog to explain additional images."""
-        self.dlg_explain_additional_images.open = False
-        self.page.update()
-
     def pick_image_result(self, e: FilePickerResultEvent):
         logger.info(f"Selected image: {e.files}")
         path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"

openandroidinstaller/views/start_view.py

@@ -84,7 +84,10 @@ def init_visuals(
 """
             ),
             actions=[
-                TextButton("Close", on_click=self.close_developer_options_dlg),
+                TextButton(
+                    "Close",
+                    on_click=lambda _: self.page.close(self.dlg_help_developer_options),
+                ),
             ],
             actions_alignment="end",
             shape=ContinuousRectangleBorder(radius=0),
@@ -156,7 +159,9 @@ def build(self):
                     [
                         OutlinedButton(
                             "How do I enable developer options?",
-                            on_click=self.open_developer_options_dlg,
+                            on_click=lambda _: self.page.open(
+                                self.dlg_help_developer_options
+                            ),
                             expand=True,
                             icon=Icons.HELP_OUTLINE_OUTLINED,
                             icon_color=Colors.DEEP_ORANGE_500,
@@ -204,17 +209,6 @@ def build(self):
         )
         return self.view
 
-    def open_developer_options_dlg(self, e):
-        """Open the dialog for help to developer mode."""
-        self.page.dialog = self.dlg_help_developer_options
-        self.dlg_help_developer_options.open = True
-        self.page.update()
-
-    def close_developer_options_dlg(self, e):
-        """Close the dialog for help to developer mode."""
-        self.dlg_help_developer_options.open = False
-        self.page.update()
-
     def search_devices_clicked(self, e):
         """Search the device when the button is clicked."""
         self.device_request_row.controls.clear()