Enable the continue button only if the previous call was successful

Author: tsterbak

openandroidinstaller/openandroidinstaller.py

@@ -21,19 +21,40 @@
 from typing import Callable, Optional
 
 import flet
-from flet import (AlertDialog, AppBar, Banner, Checkbox, Column, Container,
-                  Divider, ElevatedButton, FilePicker, FilePickerResultEvent,
-                  FilledButton, Icon, Image, Page, ProgressBar, ProgressRing,
-                  Row, Text, TextButton, TextField, UserControl,
-                  VerticalDivider, colors, icons)
+from flet import (
+    AlertDialog,
+    AppBar,
+    Banner,
+    Checkbox,
+    Column,
+    Container,
+    Divider,
+    ElevatedButton,
+    FilePicker,
+    FilePickerResultEvent,
+    FilledButton,
+    Icon,
+    Image,
+    Page,
+    ProgressBar,
+    ProgressRing,
+    Row,
+    Text,
+    TextButton,
+    TextField,
+    UserControl,
+    VerticalDivider,
+    colors,
+    icons,
+)
 from installer_config import InstallerConfig, Step
 from loguru import logger
 from tool_utils import call_tool_with_command, search_device
 from widgets import call_button, confirm_button, get_title
 
 # Toggle to True for development purposes
 DEVELOPMENT = False
-DEVELOPMENT_CONFIG = "a3y17lte"  # "sargo"
+DEVELOPMENT_CONFIG = "sargo"  # "a3y17lte"  # "sargo"
 
 
 PLATFORM = sys.platform
@@ -212,9 +233,7 @@ def __init__(
         self.selected_recovery = selected_recovery
 
     def build(self):
-        self.confirm_button = confirm_button(
-            "If you selected both files you can continue.", self.on_confirm
-        )
+        self.confirm_button = confirm_button(self.on_confirm)
         self.confirm_button.disabled = True
 
         self.pick_recovery_dialog.on_result = self.enable_button_if_ready
@@ -257,7 +276,8 @@ def build(self):
                 ),
                 self.selected_recovery,
                 Divider(),
-                self.confirm_button,
+                Text("If you selected both files you can continue."),
+                Row([self.confirm_button]),
             ]
         )
         return self.view
@@ -423,36 +443,50 @@ def __init__(
 
     def build(self):
         """Create the content of a view from step."""
-        self.right_view.controls = [get_title(f"{self.step.title}"), self.progressbar]
+        self.right_view.controls = [
+            get_title(f"{self.step.title}"),
+            self.progressbar,
+            Text(f"{self.step.content}"),
+        ]
         # basic view depending on step.type
         if self.step.type == "confirm_button":
-            self.right_view.controls.append(
-                confirm_button(self.step.content, self.on_confirm)
-            )
+            self.confirm_button = confirm_button(self.on_confirm)
+            self.right_view.controls.append(Row([self.confirm_button]))
         elif self.step.type == "call_button":
+            self.confirm_button = confirm_button(self.on_confirm)
+            self.confirm_button.disabled = True
+            self.call_button = call_button(
+                self.call_to_phone, command=self.step.command
+            )
             self.right_view.controls.append(
-                call_button(
-                    self.step.content, self.call_to_phone, command=self.step.command
-                )
+                Row([self.call_button, self.confirm_button])
             )
         elif self.step.type == "call_button_with_input":
+            self.confirm_button = confirm_button(self.on_confirm)
+            self.confirm_button.disabled = True
+            self.call_button = call_button(
+                self.call_to_phone, command=self.step.command
+            )
             self.right_view.controls.extend(
-                [
-                    self.inputtext,
-                    call_button(
-                        self.step.content, self.call_to_phone, command=self.step.command
-                    ),
-                ]
+                [self.inputtext, Row([self.call_button, self.confirm_button])]
             )
-        elif self.step.type == "text":
-            self.right_view.controls.append(Text(self.step.content))
-        else:
+        elif self.step.type != "text":
             raise Exception(f"Unknown step type: {self.step.type}")
 
         # if skipping is allowed add a button to the view
         if self.step.allow_skip or DEVELOPMENT:
             self.right_view.controls.append(
-                confirm_button("Already done?", self.on_confirm, confirm_text="Skip")
+                Row(
+                    [
+                        Text("Do you want to skip?"),
+                        ElevatedButton(
+                            "Skip",
+                            on_click=self.on_confirm,
+                            icon=icons.NEXT_PLAN_OUTLINED,
+                            expand=True,
+                        ),
+                    ]
+                )
             )
         return self.view
 
@@ -477,14 +511,19 @@ def call_to_phone(self, e, command: str):
         success = call_tool_with_command(command=command, bin_path=BIN_PATH)
         # update the view accordingly
         if success:
+            # pop the progress ring
             self.right_view.controls.pop()
-            self.right_view.controls.append(Text(f"Command {command} failed!"))
-        else:
-            sleep(5)  # wait to make sure everything is fine
-            self.right_view.controls.pop()  # pop the progress ring
             self.right_view.controls.append(
-                ElevatedButton("Confirm and continue", on_click=self.on_confirm)
+                Text(
+                    f"Command {command} failed! Try again or make sure everything is setup correctly."
+                )
             )
+        else:
+            sleep(5)  # wait to make sure everything is fine
+            # pop the progress ring
+            self.right_view.controls.pop()
+            self.confirm_button.disabled = False
+            self.call_button.disabled = True
         self.view.update()
 
 

openandroidinstaller/tool_utils.py

@@ -29,7 +29,7 @@ def call_tool_with_command(command: str, bin_path: Path) -> bool:
 
     logger.info(f"Run command: {command}")
     res = call(f"{command}", shell=True)
-    if res != 0:
+    if res == 0:
         logger.info("Success.")
         return True
     logger.info(f"Command {command} failed.")

openandroidinstaller/widgets.py

@@ -36,44 +36,24 @@ def get_title(title: str):
 
 
 def confirm_button(
-    text: str, confirm_func: Callable, confirm_text: str = "Confirm and continue"
-) -> Column:
+    confirm_func: Callable, confirm_text: str = "Confirm and continue"
+) -> ElevatedButton:
     """Get a button, that calls a given function when clicked."""
-    return Column(
-        [
-            Text(f"{text}"),
-            Row(
-                [
-                    ElevatedButton(
-                        f"{confirm_text}",
-                        on_click=confirm_func,
-                        icon=icons.NEXT_PLAN_OUTLINED,
-                        expand=True,
-                    )
-                ]
-            ),
-        ],
-        horizontal_alignment="center",
+    return ElevatedButton(
+        f"{confirm_text}",
+        on_click=confirm_func,
+        icon=icons.NEXT_PLAN_OUTLINED,
+        expand=True,
     )
 
 
 def call_button(
-    text: str, call_func: Callable, command: str, confirm_text: str = "Confirm and run"
-) -> Column:
+    call_func: Callable, command: str, confirm_text: str = "Confirm and run"
+) -> ElevatedButton:
     """Get a button, that calls a given function with given command when clicked."""
-    return Column(
-        [
-            Text(f"{text}"),
-            Row(
-                [
-                    ElevatedButton(
-                        f"{confirm_text}",
-                        on_click=partial(call_func, command=command),
-                        expand=True,
-                        icon=icons.DIRECTIONS_RUN_OUTLINED,
-                    )
-                ]
-            ),
-        ],
-        horizontal_alignment="center",
+    return ElevatedButton(
+        f"{confirm_text}",
+        on_click=partial(call_func, command=command),
+        expand=True,
+        icon=icons.DIRECTIONS_RUN_OUTLINED,
     )