Merge remote-tracking branch 'origin/more-explicit-texts' into specific-functions-for-tool-commands

Author: tsterbak

openandroidinstaller/assets/configs/FP2.yaml

@@ -31,10 +31,9 @@ steps:
         This will remove encryption and delete all files stored in the internal storage, as well as format your cache partition (if you have one).
     - title: "Flash LineageOS"
       type: confirm_button
-      content: Return to the main menu on the phone.
-    - title: "Flash LineageOS"
-      type: confirm_button
-      content: On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
+      content: >
+      Return to the main menu on the phone by pressing the back button on the screen.
+      On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
     - title: "Flash LineageOS"
       type: call_button
       content: >

openandroidinstaller/assets/configs/FP3.yaml

@@ -37,10 +37,9 @@ steps:
         This will remove encryption and delete all files stored in the internal storage, as well as format your cache partition (if you have one).
     - title: "Flash LineageOS"
       type: confirm_button
-      content: Return to the main menu on the phone.
-    - title: "Flash LineageOS"
-      type: confirm_button
-      content: On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
+      content: >
+      Return to the main menu on the phone by pressing the back button.
+      On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
     - title: "Flash LineageOS"
       type: call_button
       content: >

openandroidinstaller/assets/configs/sargo.yaml

@@ -41,18 +41,18 @@ steps:
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_flash_recovery
   install_os:
-    - type: confirm_button 
-      content: In this step, you finally flash LineageOS. Confirm to continue.
     - type: confirm_button
-      content: Select 'Recovery Mode' on your smartphone screen and press the Start-Button to confirm. Then confirm here.
+      content: >
+        In the next steps, you finally flash LineageOS.
+        Select 'Recovery Mode' on your smartphone screen and press the Start-Button to confirm. Then confirm here.
     - type: confirm_button
       content: >
         Now tap Factory Reset, then Format data / Factory reset on your phone screen and continue with the formatting process.
         This will remove encryption and delete all files stored in the internal storage, as well as format your cache partition (if you have one).
     - type: confirm_button
-      content: Return to the main menu on the phone.
-    - type: confirm_button
-      content: On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
+      content: >
+        Return to the main menu on the phone by pressing the back button.
+        On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
     - type: call_button
       content: >
         Now it's time to flash the LineageOS image. Don't remove the USB-Cable and press 'Confirm and run' to start!

openandroidinstaller/openandroidinstaller.py

@@ -46,6 +46,7 @@
     UserControl,
     FloatingActionButton,
     VerticalDivider,
+    Markdown,
     colors,
     icons,
 )
@@ -68,8 +69,8 @@
 from widgets import call_button, confirm_button, get_title, link_button
 
 # Toggle to True for development purposes
-DEVELOPMENT = False
-DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
+DEVELOPMENT = False 
+DEVELOPMENT_CONFIG = "sargo"  # "a3y17lte"  # "sargo"
 
 
 PLATFORM = sys.platform
@@ -125,8 +126,13 @@ def build(self):
         self.dlg_help_developer_options = AlertDialog(
             modal=True,
             title=Text("How to enable developer options and OEM unlocking"),
-            content=Text(
-                "To do this, tap seven times on the build number in the 'System'- or 'About the phone'-Menu in Settings. Then in developer options, toggle OEM unlocking and USB-Debugging."
+            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.
+Now you are ready to continue.
+"""
             ),
             actions=[
                 TextButton("Close", on_click=self.close_developer_options_dlg),
@@ -174,7 +180,7 @@ def check_bootloader_unlocked(e):
                 ),
                 Row(
                     [
-                        FilledButton(
+                        ElevatedButton(
                             "How do I enable developer mode?",
                             on_click=self.open_developer_options_dlg,
                             expand=True,
@@ -196,7 +202,7 @@ def check_bootloader_unlocked(e):
                 ),
                 Row(
                     [
-                        ElevatedButton(
+                        FilledButton(
                             "Search device",
                             on_click=self.search_devices,
                             icon=icons.PHONE_ANDROID,
@@ -309,7 +315,7 @@ def build(self):
                 Column(
                     [
                         Text(
-                            "You can download supported image and recovery file for your device here:"
+                            "You can bring your own image and recovery or you download the officially supported image and recovery file for your device here:"
                         ),
                         Row(
                             [
@@ -323,6 +329,13 @@ def build(self):
                                 ),
                             ]
                         ),
+                        Markdown(
+                            f"""
+The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip` 
+and the recovery like `lineage-19.1-20221101-recovery-{self.state.config.metadata.get('devicecode')}.img` 
+or `twrp-3.6.2_9-0-{self.state.config.metadata.get('devicecode')}.img`.
+"""
+                        ),
                         Divider(),
                     ]
                 )
@@ -382,11 +395,11 @@ def enable_button_if_ready(self, e):
                 recovery_path=self.state.recovery_path,
             ):
                 # if image and recovery work for device allow to move on, otherwise display message
-                self.info_field.controls.append(
+                self.info_field.controls = [
                     Text(
                         "Image and recovery don't work with the device. Please select different ones."
                     )
-                )
+                ]
                 self.right_view.update()
                 return
             self.info_field.controls = []
@@ -518,8 +531,9 @@ def load_config(self, device_code: str) -> Optional[str]:
             return self.config.metadata.get("devicename", "No device name in config.")
 
     def pick_image_result(self, e: FilePickerResultEvent):
-        self.selected_image.value += (
-            ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        self.selected_image.value = (
+            self.selected_image.value.split(":")[0] + f": {path}"
         )
         if e.files:
             self.image_path = e.files[0].path
@@ -530,8 +544,9 @@ def pick_image_result(self, e: FilePickerResultEvent):
         self.selected_image.update()
 
     def pick_recovery_result(self, e: FilePickerResultEvent):
-        self.selected_recovery.value += (
-            ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        self.selected_recovery.value = (
+            self.selected_recovery.value.split(":")[0] + f": {path}"
         )
         if e.files:
             self.recovery_path = e.files[0].path
@@ -713,15 +728,14 @@ def close_banner(e):
         bgcolor=colors.AMBER_100,
         leading=Icon(icons.WARNING_AMBER_ROUNDED, color=colors.AMBER, size=40),
         content=Text(
-            "Important: Please read through the instructions at least once before actually following them, so as to avoid any problems due to any missed steps!"
+            "These instructions only work if you follow every section and step precisely. Do not continue after something fails!"
         ),
         actions=[
             TextButton("I understand", on_click=close_banner),
         ],
     )
-    # TODO: disable the banner for now
-    # page.banner.open = True
-    # page.update()
+    page.banner.open = True
+    page.update()
 
     # create application instance
     app = MainView()

openandroidinstaller/utils.py

@@ -22,7 +22,7 @@
 
 def get_download_link(devicecode: str) -> Optional[str]:
     """Check if a lineageOS version for this device exists on lineageosroms.com and return the respective download link."""
-    url = f"https://download.lineageos.org/{devicecode.lower()}/"
+    url = f"https://download.lineageos.org/{devicecode.lower()}"
     try:
         logger.info(f"Checking {url}")
         # Get Url

openandroidinstaller/widgets.py

@@ -37,7 +37,7 @@ def get_title(title: str):
 
 
 def confirm_button(
-    confirm_func: Callable, confirm_text: str = "Confirm and continue"
+    confirm_func: Callable, confirm_text: str = "Continue"
 ) -> ElevatedButton:
     """Get a button, that calls a given function when clicked."""
     return ElevatedButton(