Split the welcome/start view

Author: tsterbak

openandroidinstaller/openandroidinstaller.py

@@ -38,7 +38,7 @@
 from loguru import logger
 
 from app_state import AppState
-from views import SelectFilesView, StepView, SuccessView, StartView, RequirementsView
+from views import SelectFilesView, StepView, SuccessView, StartView, RequirementsView, WelcomeView
 from tooling import run_command
 
 # where to write the logs
@@ -75,7 +75,11 @@ def __init__(self):
         self.view = Column(expand=True, width=1200)
 
         # create default starter views
-        welcome_view = StartView(
+        welcome_view = WelcomeView(
+            on_confirm=self.confirm,
+            state=self.state,
+        )
+        start_view = StartView(
             on_confirm=self.confirm,
             state=self.state,
         )
@@ -88,7 +92,7 @@ def __init__(self):
             state=self.state,
         )
         # ordered to allow for pop
-        self.default_views = [select_files_view, requirements_view, welcome_view]
+        self.default_views = [select_files_view, requirements_view, start_view, welcome_view]
         # create the final success view
         self.final_view = SuccessView(state=self.state)
 

openandroidinstaller/views/__init__.py

@@ -1,4 +1,5 @@
 from .base import BaseView  # noqa
+from .welcome_view import WelcomeView  # noqa
 from .start_view import StartView  # noqa
 from .requirements_view import RequirementsView  # noqa
 from .select_view import SelectFilesView  # noqa

openandroidinstaller/views/requirements_view.py

@@ -29,6 +29,7 @@
 )
 
 from views import BaseView
+from components import ConfirmButton
 from app_state import AppState
 from widgets import get_title
 

openandroidinstaller/views/start_view.py

@@ -33,6 +33,7 @@
 from flet.buttons import CountinuosRectangleBorder
 
 from views import BaseView
+from components import ConfirmButton
 from app_state import AppState
 from widgets import get_title
 from tooling import search_device
@@ -62,9 +63,12 @@ def build(self):
             title=Text("How to enable developer options and OEM unlocking"),
             content=Markdown(
                 """
-To do this, tap seven times on the build number in the 'System'- or 'About the phone'-Menu in Settings. You can also use the phones own search to look for `build number`. 
-Then go back to the main menu and look for 'developer options'. You can also search for it in your phone.
-When you are in developer options, toggle OEM unlocking and USB-Debugging. If your phone is already connected to your PC, a pop-up might appear. Allow USB debugging in the pop-up on your phone.
+To do this, 
+- **tap seven times on the build number** in the 'System'- or 'About the phone'-Menu in Settings. You can also use the phones own search to look for `build number`. 
+- Then go back to the main menu and look for **'developer options'**. You can also search for it in your phone.
+- When you are in developer options, **toggle OEM unlocking and USB-Debugging**.
+- If your phone is already connected to your PC, a pop-up might appear. **Allow USB debugging in the pop-up on your phone.**
+
 Now you are ready to continue.
 """
             ),
@@ -74,6 +78,7 @@ def build(self):
             actions_alignment="end",
             shape=CountinuosRectangleBorder(radius=0),
         )
+
         # toggleswitch to allow skipping unlocking the bootloader
         def check_bootloader_unlocked(e):
             """Enable skipping unlocking the bootloader if selected."""
@@ -107,22 +112,7 @@ def check_bootloader_unlocked(e):
         # build up the main view
         self.right_view.controls.extend(
             [
-                get_title("Welcome to the OpenAndroidInstaller!"),
-                Text(
-                    "We will walk you through the installation process nice and easy."
-                ),
-                Divider(),
-                Markdown(
-                    """
-Before you continue, make sure
-- your devices is on the latest system update.
-- you have a backup of all your important data, since this procedure will **erase all data from the phone**.
-- to not store the backup on the phone! 
-
-Please note, that vendor specific back-ups will most likely not work on LineageOS!
-                """
-                ),
-                Divider(),
+                get_title("Get the phone ready"),
                 Markdown(
                     """
 To get started you need to 

openandroidinstaller/views/welcome_view.py

@@ -0,0 +1,78 @@
+"""Contains the welcome view."""
+
+# This file is part of OpenAndroidInstaller.
+# OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+
+# OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along with OpenAndroidInstaller.
+# If not, see <https://www.gnu.org/licenses/>."""
+# Author: Tobias Sterbak
+
+from loguru import logger
+from typing import Callable
+
+from flet import (
+    Divider,
+    ElevatedButton,
+    Markdown,
+    Row,
+    Text,
+    icons,
+)
+
+from views import BaseView
+from app_state import AppState
+from widgets import get_title
+
+
+class WelcomeView(BaseView):
+    def __init__(
+        self,
+        state: AppState,
+        on_confirm: Callable,
+    ):
+        super().__init__(state=state, image="connect-to-usb.png")
+        self.on_confirm = on_confirm
+
+    def build(self):
+        self.continue_button = ElevatedButton(
+            "Let's start!",
+            on_click=self.on_confirm,
+            icon=icons.NEXT_PLAN_OUTLINED,
+            disabled=False,
+            expand=True,
+        )
+
+        # build up the main view
+        self.right_view.controls.extend(
+            [
+                get_title("Welcome to the OpenAndroidInstaller!"),
+                Text(
+                    "We will walk you through the installation process nice and easy."
+                ),
+                Divider(),
+                Markdown(
+                    """
+Before you continue, make sure
+- your devices is on the latest system update.
+- you have a backup of all your important data, since this procedure will **erase all data from the phone**.
+- to not store the backup on the phone! 
+
+Please note, that vendor specific back-ups will most likely not work on LineageOS!
+                """
+                ),
+                Divider(),
+                Row(
+                    [
+                        self.continue_button,
+                    ],
+                    alignment="center",
+                ),
+            ]
+        )
+        return self.view