WIP

Author: tsterbak

openandroidinstaller/views/__init__.py

@@ -1,6 +1,6 @@
-from .base import BaseView
-from .start_view import StartView
-from .requirements_view import RequirementsView
-from .select_view import SelectFilesView
-from .step_view import StepView
-from .success_view import SuccessView
+from .base import BaseView  # noqa
+from .start_view import StartView  # noqa
+from .requirements_view import RequirementsView  # noqa
+from .select_view import SelectFilesView  # noqa
+from .step_view import StepView  # noqa
+from .success_view import SuccessView  # noqa

openandroidinstaller/views/base.py

@@ -14,7 +14,6 @@
 # Author: Tobias Sterbak
 
 from app_state import AppState
-from loguru import logger
 
 from flet import (
     Column,
@@ -42,4 +41,4 @@ def __init__(self, state: AppState, image: str = "placeholder.png"):
         self.view = Row(
             [self.left_view, VerticalDivider(), self.right_view],
             alignment="spaceEvenly",
-        )
+        )

openandroidinstaller/views/requirements_view.py

@@ -183,4 +183,4 @@ def enable_continue_button(e):
 
         # add the final confirm and continue button
         self.right_view.controls.append(Row([self.continue_button], alignment="center"))
-        return self.view
+        return self.view

openandroidinstaller/views/select_view.py

@@ -204,4 +204,4 @@ def enable_button_if_ready(self, e):
             self.confirm_button.disabled = False
             self.right_view.update()
         else:
-            self.confirm_button.disabled = True
+            self.confirm_button.disabled = True

openandroidinstaller/views/start_view.py

@@ -248,4 +248,4 @@ def search_devices(self, e):
                     f"Failed to load config for device with code {device_code}."
                 )
                 self.device_name.color = colors.RED
-        self.view.update()
+        self.view.update()

openandroidinstaller/views/success_view.py

@@ -32,6 +32,10 @@ def __init__(self, state: AppState):
     def build(
         self,
     ):
+        def close_window():
+            logger.success("Success! Close the window.")
+            self.page.window_close()
+
         self.right_view.controls = [
             get_title("Installation completed successfully!"),
             self.state.progressbar,
@@ -41,9 +45,9 @@ def build(
                     ElevatedButton(
                         "Finish and close",
                         expand=True,
-                        on_click=lambda _: self.page.window_close(),
+                        on_click=close_window,
                     )
                 ]
             ),
         ]
-        return self.view
+        return self.view

tests/test_tooling.py

@@ -16,13 +16,13 @@
 from pathlib import Path
 from subprocess import CalledProcessError
 
-from tooling import search_device
+from openandroidinstaller.tooling import search_device
 
 
 def test_search_device_success(mocker):
     """Test if search works fine."""
     mocker.patch(
-        "openandroidinstaller.tool_utils.check_output",
+        "openandroidinstaller.tooling.check_output",
         return_value=b"[ro.product.device]: [sargo]",
     )
 
@@ -48,7 +48,7 @@ def patched_check_output(*args, **kwargs):
         raise CalledProcessError(returncode=1, cmd="search device failed")
 
     mocker.patch(
-        "openandroidinstaller.tool_utils.check_output",
+        "openandroidinstaller.tooling.check_output",
         patched_check_output,
     )