Upgrade to flet 0.26.0

Author: tsterbak

flatpak/generated-poetry-sources.json

@@ -30,9 +30,8 @@
     Image,
     Page,
     TextButton,
-    UserControl,
-    colors,
-    icons,
+    Colors,
+    Icons,
 )
 from loguru import logger
 from styles import Text
@@ -61,7 +60,7 @@
 BIN_PATH = Path(__file__).parent.joinpath(Path("bin")).resolve()
 
 
-class MainView(UserControl):
+class MainView(Column):
     def __init__(self, state: AppState):
         super().__init__()
         self.state = state
@@ -73,6 +72,8 @@ def __init__(self, state: AppState):
             on_confirm=self.to_next_view,
             state=self.state,
         )
+        self.state.page.add(welcome_view)
+
         start_view = StartView(
             on_confirm=self.to_next_view,
             on_back=self.to_previous_view,
@@ -221,7 +222,6 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"):
 
     # configure the page
     configure(page)
-
     # header
     page.appbar = AppBar(
         leading=Image(src="/logo-192x192.png", height=40, width=40, border_radius=40),
@@ -236,7 +236,7 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"):
         actions=[
             Container(
                 content=ElevatedButton(
-                    icon=icons.QUESTION_MARK_ROUNDED,
+                    icon=Icons.QUESTION_MARK_ROUNDED,
                     text="FAQ",
                     on_click=lambda _: webbrowser.open(
                         "https://openandroidinstaller.org/faq.html"
@@ -247,7 +247,7 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"):
             ),
             Container(
                 content=ElevatedButton(
-                    icon=icons.FEEDBACK_OUTLINED,
+                    icon=Icons.FEEDBACK_OUTLINED,
                     text="Give feedback",
                     on_click=lambda _: webbrowser.open(
                         "https://openandroidinstaller.org/feedback.html"
@@ -258,7 +258,7 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"):
             ),
             Container(
                 content=ElevatedButton(
-                    icon=icons.BUG_REPORT_OUTLINED,
+                    icon=Icons.BUG_REPORT_OUTLINED,
                     text="Report a bug",
                     on_click=lambda _: webbrowser.open(
                         "https://github.com/openandroidinstaller-dev/openandroidinstaller/issues"
@@ -276,8 +276,8 @@ def close_banner(e):
         page.update()
 
     banner = Banner(
-        bgcolor=colors.AMBER_100,
-        leading=Icon(icons.WARNING_AMBER_ROUNDED, color=colors.AMBER, size=40),
+        bgcolor=Colors.AMBER_100,
+        leading=Icon(Icons.WARNING_AMBER_ROUNDED, color=Colors.AMBER, size=40),
         content=Text(
             "These instructions only work if you follow every section and step precisely. Do not continue after something fails!"
         ),
@@ -287,7 +287,6 @@ def close_banner(e):
     )
     page.overlay.append(banner)
     banner.open = True
-    page.update()
 
     # create the State object
     state = AppState(
@@ -300,7 +299,6 @@ def close_banner(e):
     state.page = page
     # create application instance
     app = MainView(state=state)
-
     # add application's root control to the page
     page.add(app)
 

flatpak/org.openandroidinstaller.OpenAndroidInstaller.appdata.xml

@@ -25,8 +25,8 @@
     OutlinedButton,
     Row,
     TextButton,
-    colors,
-    icons,
+    Colors,
+    Icons,
 )
 from flet_core.buttons import ContinuousRectangleBorder
 from loguru import logger
@@ -100,8 +100,8 @@ def build(self):
             "What kind of addons?",
             on_click=self.open_explain_addons_dlg,
             expand=True,
-            icon=icons.HELP_OUTLINE_OUTLINED,
-            icon_color=colors.DEEP_ORANGE_500,
+            icon=Icons.HELP_OUTLINE_OUTLINED,
+            icon_color=Colors.DEEP_ORANGE_500,
             tooltip="Get more details on what addons are supported.",
         )
 
@@ -126,7 +126,7 @@ def build(self):
                         [
                             ElevatedButton(
                                 "Download F-Droid App-Store",
-                                icon=icons.DOWNLOAD_OUTLINED,
+                                icon=Icons.DOWNLOAD_OUTLINED,
                                 on_click=lambda _: webbrowser.open(
                                     "https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota/"
                                 ),
@@ -141,7 +141,7 @@ def build(self):
                         [
                             ElevatedButton(
                                 "Download Google Apps",
-                                icon=icons.DOWNLOAD_OUTLINED,
+                                icon=Icons.DOWNLOAD_OUTLINED,
                                 on_click=lambda _: webbrowser.open(
                                     "https://wiki.lineageos.org/gapps#downloads"
                                 ),
@@ -154,7 +154,7 @@ def build(self):
                         [
                             ElevatedButton(
                                 "Download MicroG",
-                                icon=icons.DOWNLOAD_OUTLINED,
+                                icon=Icons.DOWNLOAD_OUTLINED,
                                 on_click=lambda _: webbrowser.open(
                                     "https://github.com/FriendlyNeighborhoodShane/MinMicroG-abuse-CI/releases"
                                 ),
@@ -174,7 +174,7 @@ def build(self):
                     [
                         FilledButton(
                             "Pick the addons you want to install",
-                            icon=icons.UPLOAD_FILE,
+                            icon=Icons.UPLOAD_FILE,
                             on_click=lambda _: self.pick_addons_dialog.pick_files(
                                 allow_multiple=True,
                                 file_type="custom",

flatpak/org.openandroidinstaller.OpenAndroidInstaller.desktop

@@ -11,10 +11,10 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 from app_state import AppState
-from flet import Column, Container, Image, Row, UserControl, VerticalDivider, margin
+from flet import Column, Container, Image, Row, VerticalDivider, margin
 
 
-class BaseView(UserControl):
+class BaseView(Column):
     def __init__(self, state: AppState, image: str = "placeholder.png"):
         super().__init__()
         self.state = state

flatpak/org.openandroidinstaller.OpenAndroidInstaller.png

@@ -15,7 +15,7 @@
 from typing import Callable
 
 from app_state import AppState
-from flet import Column, ElevatedButton, Row, Switch, colors, icons
+from flet import Column, ElevatedButton, Row, Switch, Colors, Icons
 from loguru import logger
 from styles import Markdown, Text
 from tooling import adb_reboot, adb_twrp_finish_install_addons, adb_twrp_install_addon
@@ -35,7 +35,7 @@ def __init__(
     def build(self):
         """Create the content of the view."""
         # error text
-        self.error_text = Text("", color=colors.RED)
+        self.error_text = Text("", color=Colors.RED)
         # text field to inform about the currently installing addon
         self.addon_info_text = Text("", weight="bold")
 
@@ -90,7 +90,7 @@ def check_advanced_switch(e):
             "Confirm and install addons",
             on_click=self.run_install_addons,
             expand=True,
-            icon=icons.DIRECTIONS_RUN_OUTLINED,
+            icon=Icons.DIRECTIONS_RUN_OUTLINED,
         )
         # build the view
         self.right_view.controls.extend(
@@ -117,7 +117,7 @@ def check_advanced_switch(e):
                         ElevatedButton(
                             "Skip",
                             on_click=self.on_confirm,
-                            icon=icons.NEXT_PLAN_OUTLINED,
+                            icon=Icons.NEXT_PLAN_OUTLINED,
                             expand=True,
                         ),
                     ]

openandroidinstaller/openandroidinstaller.py

@@ -14,7 +14,7 @@
 from typing import Callable
 
 from app_state import AppState
-from flet import Column, ElevatedButton, Row, Switch, colors, icons
+from flet import Column, ElevatedButton, Row, Switch, Colors, Icons
 from loguru import logger
 from styles import Markdown, Text
 from tooling import adb_twrp_wipe_and_install
@@ -34,7 +34,7 @@ def __init__(
     def build(self):
         """Create the content of the view."""
         # error text
-        self.error_text = Text("", color=colors.GREEN)
+        self.error_text = Text("", color=Colors.GREEN)
 
         # switch to enable advanced output - here it means show terminal input/output in tool
         def check_advanced_switch(e):
@@ -115,7 +115,7 @@ def check_addons_switch(e):
             "Confirm and install",
             on_click=self.run_install,
             expand=True,
-            icon=icons.DIRECTIONS_RUN_OUTLINED,
+            icon=Icons.DIRECTIONS_RUN_OUTLINED,
         )
         # build the view
         self.right_view.controls.extend(
@@ -142,7 +142,7 @@ def check_addons_switch(e):
                         ElevatedButton(
                             "Skip",
                             on_click=self.on_confirm,
-                            icon=icons.NEXT_PLAN_OUTLINED,
+                            icon=Icons.NEXT_PLAN_OUTLINED,
                             expand=True,
                         ),
                     ]
@@ -160,7 +160,7 @@ def run_install(self, e):
         self.install_button.disabled = True
         self.install_addons_switch.disabled = True
         self.error_text.value = "Please be patient, it may take a few minutes."
-        self.error_text.color = colors.GREEN
+        self.error_text.color = Colors.GREEN
         # reset the progress indicators
         self.progress_indicator.clear()
         # reset terminal output
@@ -190,7 +190,7 @@ def run_install(self, e):
             self.install_button.disabled = False
             # also remove the last error text if it happened
             self.error_text.value = "Installation failed! Try again or make sure everything is setup correctly."
-            self.error_text.color = colors.RED
+            self.error_text.color = Colors.RED
         else:
             sleep(5)  # wait to make sure everything is fine
             self.progress_indicator.set_progress_bar(100)

openandroidinstaller/views/addon_view.py

@@ -24,8 +24,8 @@
     OutlinedButton,
     Row,
     TextButton,
-    colors,
-    icons,
+    Colors,
+    Icons,
 )
 from flet_core.buttons import ContinuousRectangleBorder
 from loguru import logger
@@ -60,15 +60,15 @@ def init_visuals(
         self.continue_button = ElevatedButton(
             "Continue",
             on_click=self.on_confirm,
-            icon=icons.NEXT_PLAN_OUTLINED,
+            icon=Icons.NEXT_PLAN_OUTLINED,
             disabled=True,
             expand=True,
         )
         # back button
         self.back_button = ElevatedButton(
             "Back",
             on_click=self.on_back,
-            icon=icons.ARROW_BACK,
+            icon=Icons.ARROW_BACK,
             expand=True,
         )
 
@@ -105,8 +105,8 @@ def build(self):
             "How to Find the version",
             on_click=self.open_find_version_dlg,
             expand=False,
-            icon=icons.HELP_OUTLINE_OUTLINED,
-            icon_color=colors.DEEP_ORANGE_500,
+            icon=Icons.HELP_OUTLINE_OUTLINED,
+            icon_color=Colors.DEEP_ORANGE_500,
             tooltip="How to find the firmware and android version of your device.",
         )