Start a new appraoch to GUI

Author: tsterbak

openandroidinstaller/openandroidinstaller.py

@@ -5,11 +5,10 @@
 from subprocess import check_output, STDOUT
 
 
-
-
 def main(page: Page):
     page.title = "OpenAndroidInstaller"
-    views = []    
+    views = []
+    blocked = False
 
     # Click-event handlers
 
@@ -30,10 +29,20 @@ def go_back(e):
         page.update()
 
     def check_devices(e):
-        output = check_output(["adb", "shell", "dumpsys", "bluetooth_manager", "|", "grep", "\'name:\'", "|", "cut", "-c9-"], stderr=STDOUT).decode() 
-        page.views[-1].controls.append(Text(f"Detected: {output}"))
+        try:
+            output = check_output(["adb", "shell", "dumpsys", "bluetooth_manager", "|", "grep", "\'name:\'", "|", "cut", "-c9-"], stderr=STDOUT).decode() 
+            page.views[-1].controls.append(Text(f"Detected: {output}"))
+            page.views[-1].controls.append(get_confirm_button("Is this correct?"))
+        except:
+            output = "No device detected!"
+            page.views[-1].controls.append(Text(f"{output}"))
         page.update()
 
+
+    def confirm(e):
+        # unblock
+        blocked = False
+
     # Generate the Views for the different steps
 
     def get_nav() -> Row:
@@ -43,6 +52,14 @@ def get_nav() -> Row:
         ])
 
 
+    def get_confirm_button(notification_text: str) -> Row:
+        """Get a button with a text to confirm."""
+        return Row([
+            Text(notification_text),
+            ElevatedButton("Confirm", on_click=confirm),
+        ])
+
+
     def get_welcome_view(page: Page) -> View:
         return View(
             "0",

openandroidinstaller/openandroidinstaller_old.py

@@ -0,0 +1,139 @@
+import flet
+from flet import AppBar, ElevatedButton, Page, Text, View, Row
+
+
+from subprocess import check_output, STDOUT
+
+
+def main(page: Page):
+    page.title = "OpenAndroidInstaller"
+    views = []
+    blocked = False
+
+    # Click-event handlers
+
+    def go_next(e):
+        view_num = int(page.views[-1].route) + 1
+        if view_num > 6:
+            view_num = 6
+        page.views.clear()
+        page.views.append(views[view_num])
+        page.update()
+
+    def go_back(e):
+        view_num = int(page.views[-1].route) - 1
+        if view_num < 0:
+            view_num = 0
+        page.views.clear()
+        page.views.append(views[view_num])
+        page.update()
+
+    def check_devices(e):
+        try:
+            output = check_output(["adb", "shell", "dumpsys", "bluetooth_manager", "|", "grep", "\'name:\'", "|", "cut", "-c9-"], stderr=STDOUT).decode() 
+            page.views[-1].controls.append(Text(f"Detected: {output}"))
+            page.views[-1].controls.append(get_confirm_button("Is this correct?"))
+        except:
+            output = "No device detected!"
+            page.views[-1].controls.append(Text(f"{output}"))
+        page.update()
+
+
+    def confirm(e):
+        # unblock
+        blocked = False
+
+    # Generate the Views for the different steps
+
+    def get_nav() -> Row:
+        return Row([
+            ElevatedButton("Back", on_click=go_back),
+            ElevatedButton("Next", on_click=go_next),
+        ])
+
+
+    def get_confirm_button(notification_text: str) -> Row:
+        """Get a button with a text to confirm."""
+        return Row([
+            Text(notification_text),
+            ElevatedButton("Confirm", on_click=confirm),
+        ])
+
+
+    def get_welcome_view(page: Page) -> View:
+        return View(
+            "0",
+            [
+                AppBar(title=Text("Welcome to OpenAndroidInstaller!")),
+                ElevatedButton("Check devices", on_click=check_devices),
+                ElevatedButton("Next", on_click=go_next),
+            ],
+        )
+
+
+    def get_bootloader_view(page: Page) -> View:
+        return View(
+            "1",
+            [
+                AppBar(title=Text("Unlock bootloder")),
+                Text("Turn on developer options and OEM Unlock on your phone."),
+                get_nav(),
+            ],
+        )
+
+    
+    def get_image_select_view(page: Page) -> View:
+        return View(
+            "2",
+            [
+                AppBar(title=Text("Select images.")),
+                get_nav(),
+            ],
+        )
+
+
+    def get_recovery_view(page: Page) -> View:
+        return View(
+            "3",
+            [
+                AppBar(title=Text("Boot recovery")),
+                get_nav(),
+            ],
+        )
+
+    
+    def get_install_view(page: Page) -> View:
+        return View(
+            "4",
+            [
+                AppBar(title=Text("Install Lineage OS")),
+                get_nav(),
+            ],
+        )
+
+
+    def get_success_view(page: Page) -> View:
+        return View(
+            "5",
+            [
+                AppBar(title=Text("Success!")),
+                ElevatedButton("Back", on_click=go_back),
+            ],
+        )
+
+    # main part
+
+    views = [
+        get_welcome_view(page),
+        get_bootloader_view(page),
+        get_image_select_view(page),
+        get_recovery_view(page),
+        get_install_view(page),
+        get_success_view(page)
+    ]
+
+    page.views.append(views[0])
+    page.update()
+
+
+flet.app(target=main, assets_dir="assets")

scripts/lineageos-on-galaxy-a3.py

@@ -69,8 +69,7 @@ def install_os(image: str):
     if call(f'adb reboot', shell=True) < 0:
         return False
 
-    click.echo(
-        "Flashing finished. Now press 'back' (arrow) and then 'Reboot system now' to finish the installation.")
+    click.echo("Flashing finished.")
     return True