Add a button type to open a website

Author: tsterbak

README.md

@@ -76,13 +76,15 @@ Every step in the config file corresponds to one view in the application. These
   - `confirm_button`: Display the content, as well as a button to allow the user to go to the next step.
   - `call_button`: Display the content text and a button that runs a given command. After the command is run, a confirm button is displayed to allow the user to move to the next step.
   - `call_button_with_input`: Display the content text, an input field and a button that runs a given command. The inputtext, can be used in the command by using the `<inputtext>` placeholder in the command field. After the command is run, a confirm button is displayed to allow the user to move to the next step.
+  - `link_button_with_confirm`: Display a button that opens a browser with a given link, confirm afterwards. Link is given in `link`.
 - `content`: str; The content text displayed alongside the action of the step. Used to inform the user about whats going on.
 - `command`: [ONLY for call_button* steps] str; This is a terminal command run in a shell. (For example fastboot or adb). There are three types of placeholders supported, that will be filled by the tool as soon as information is given.
-  - `<image>`: The path of the image file.
+  - `<image>`: The path of the ROM image file.
   - `<recovery>`: The path of the recovery file.
   - `<inputtext>`: Text from the user input from `call_button_with_input` views.
 - `img`: [OPTIONAL] Display an image on the left pane of the step view. Images are loaded from `openandroidinstaller/assets/imgs/`.
 - `allow_skip`: [OPTIONAL] boolean; If a skip button should be displayed to allow skipping this step. Can be useful when the bootloader is already unlocked.
+- `link`: [OPTIONAL] Link to use for the link button if type is `link_button_with_confirm`.
 
 The file should be named after device name output by `adb shell getprop | grep ro.poroduct.device` when the devices is connected to the computer. You can also get the device code by connecting the device to the computer and run OpenAndroidInstaller to detect the device.
 

openandroidinstaller/assets/configs/yuga.yaml

@@ -18,27 +18,28 @@ steps:
       content: Press the button to reboot into the bootloader now. Then confirm to continue.
       command: "adb reboot bootloader"
     - title: "Unlock the bootloader"
-      type: confirm_button
+      type: link_button_with_confirm
       content: >
-        Follow the instructions on Sonys official unlocking website to generate an unlock code for your bootloader: 
-        https://developer.sonymobile.com/unlockbootloader/unlock-yourboot-loader/"
+        Click on the button to open the instructions on Sonys official unlocking website to generate an unlock code for your bootloader.
+        Once you got the code, continue to input the code. 
+      link: https://developer.sonymobile.com/unlockbootloader/unlock-yourboot-loader/
     - title: "Unlock the bootloader"
       type: call_button_with_input
       content: >
         Use your code to unlock the bootloader of your device. Type in the full 18 character code starting with 0x (Example: 0x3EC4F7AD6E0B32B6).
         If you already did that, you can skip this step.
       command: "fastboot oem unlock <inputtext>"
       allow_skip: True
-  flash_recovery:
-    - title: "Flash temporary recovery"
+    - title: "Unlock the bootloader"
       type: call_button
       content: >
         Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. 
         Connect your device to your PC via USB. Then confirm here to continue.
       command: "fastboot reboot"
+  flash_recovery:
     - title: "Flash temporary recovery"
       type: call_button
-      content: Now you have to reboot into bootloader again. Press the button to do it and continue once it is done.
+      content: Now you have to reboot into bootloader again. With your phone turned on, press the button to do so and continue once it is done.
       command: "adb reboot bootloader"
       allow_skip: True
     - title: "Flash temporary recovery"

openandroidinstaller/installer_config.py

@@ -31,13 +31,15 @@ def __init__(
         command: str = None,
         img: str = "placeholder.png",
         allow_skip: bool = False,
+        link: str = None,
     ):
         self.title = title
         self.type = type
         self.content = content
         self.command = command
         self.img = img
         self.allow_skip = allow_skip
+        self.link = link
 
 
 class InstallerConfig:
@@ -112,11 +114,12 @@ def validate_config(config: str) -> bool:
 
     step_schema = {
         "title": str,
-        "type": Regex(r"text|confirm_button|call_button|call_button_with_input"),
+        "type": Regex(r"text|confirm_button|call_button|call_button_with_input|link_button_with_confirm"),
         "content": str,
         schema.Optional("command"): Regex(r"^adb\s|^fastboot\s|^heimdall\s"), 
         schema.Optional("allow_skip"): bool,
         schema.Optional("img"): str,
+        schema.Optional("link"): str,
     }
 
     config_schema = Schema({

openandroidinstaller/openandroidinstaller.py

@@ -15,6 +15,7 @@
 
 import os
 import sys
+import turtle
 import webbrowser
 from pathlib import Path
 from time import sleep
@@ -30,11 +31,11 @@
 from loguru import logger
 from tool_utils import call_tool_with_command, search_device
 from utils import AppState, get_download_link
-from widgets import call_button, confirm_button, get_title
+from widgets import call_button, confirm_button, get_title, link_button
 
 # Toggle to True for development purposes
-DEVELOPMENT = False
-DEVELOPMENT_CONFIG = "sargo"  # "a3y17lte"  # "sargo"
+DEVELOPMENT = True 
+DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
 
 
 PLATFORM = sys.platform
@@ -523,6 +524,12 @@ def build(self):
             self.right_view.controls.extend(
                 [self.inputtext, Row([self.call_button, self.confirm_button])]
             )
+        elif self.step.type == "link_button_with_confirm":
+            self.confirm_button = confirm_button(self.on_confirm)
+            self.right_view.controls.extend(
+                [Row([link_button(self.step.link, "Open Link"), self.confirm_button])]
+            )
+
         elif self.step.type != "text":
             raise Exception(f"Unknown step type: {self.step.type}")
 

openandroidinstaller/widgets.py

@@ -15,6 +15,7 @@
 
 from functools import partial
 from typing import Callable
+import webbrowser
 
 from flet import Container, ElevatedButton, Row, Text, alignment, icons
 
@@ -57,3 +58,12 @@ def call_button(
         expand=True,
         icon=icons.DIRECTIONS_RUN_OUTLINED,
     )
+
+
+def link_button(link: str, text: str) -> ElevatedButton:
+    """Get a button that opens a link in a browser."""
+    return ElevatedButton(
+        f"{text}",
+        on_click=lambda _: webbrowser.open(link),
+        expand=True,
+    )