Merge remote-tracking branch 'origin/dev' into dev-flash-additional

Author: tsterbak

README.md

@@ -82,6 +82,7 @@ Samsung | Galaxy Grand Prime VE | grandprimevelte | SM-G531F | tested
 Samsung | Galaxy S III Neo | s3ve3g | GT-I9301I | tested
 Samsung | Galaxy Tab S2 | [gts210vewifi](https://wiki.lineageos.org/devices/gts210vewifi/) | T813 | tested
 Samsung | Galaxy S4 Mini LTE| [serranoltexx](https://wiki.lineageos.org/devices/serranoltexx) | | tested
+Samsung | Galaxy S5 | [klte](https://wiki.lineageos.org/devices/klte) | G900F/M/R4/R7/T/V/W8 | tested
 Samsung | Galaxy S6 | [zerofltexx](https://wiki.lineageos.org/devices/zerofltexx) | | tested
 Samsung | Galaxy S6 Edge | [zeroltexx](https://wiki.lineageos.org/devices/zeroltexx) | | tested
 Samsung | Galaxy S7 | [herolte](https://wiki.lineageos.org/devices/herolte) | SM-G930F | tested

openandroidinstaller/assets/configs/beyond0lte.yaml

@@ -4,7 +4,8 @@ metadata:
   is_ab_device: false
   device_code: beyond0lte 
   supported_device_codes:
-    - beyond0lte 
+    - beyond0lte
+    - beyond0
 requirements:
   android: 12
 steps:

openandroidinstaller/assets/configs/beyond1lte.yaml

@@ -4,7 +4,8 @@ metadata:
   is_ab_device: false 
   device_code: beyond1lte 
   supported_device_codes:
-    - beyond1lte 
+    - beyond1lte
+    - beyond1
 requirements:
   android: 12
 steps:

openandroidinstaller/assets/configs/klte.yaml

@@ -0,0 +1,27 @@
+metadata:
+  maintainer: Tobias Sterbak (tsterbak)
+  device_name: Samsung Galaxy S5 LTE
+  is_ab_device: false 
+  device_code: klte
+  supported_device_codes:
+    - klte 
+steps:
+  unlock_bootloader:
+  boot_recovery:
+    - type: call_button
+      content: >
+        As a first step, you need to boot into the bootloader. A bootloader is the piece of software, 
+        that tells your phone how to start and run an operating system (like Android). Your device should be turned on. 
+        Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
+      command: adb_reboot_download
+    - type: call_button
+      content: >
+        In this step, you need to flash a custom recovery on your device.
+        Press 'Confirm and run' to start the process. Confirm afterwards to continue.
+      command: heimdall_flash_recovery
+    - type: confirm_button
+      img: samsung-buttons.png
+      content: >
+        Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 8~10 seconds 
+        until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
+        hold *Volume Up* + *Home* + *Power button*.

openandroidinstaller/views/install_addons_view.py

@@ -203,6 +203,8 @@ def run_install_addons(self, e):
             self.error_text.value = "Installation failed! Try again or make sure everything is setup correctly."
         else:
             sleep(4)  # wait to make sure everything is fine
+            self.progress_indicator.set_progress_bar(100)
+            self.progress_indicator.update()
             logger.success("Installation process was successful. Allow to continue.")
             # enable the confirm button and disable the call button
             self.confirm_button.disabled = False

openandroidinstaller/views/install_view.py

@@ -210,6 +210,8 @@ def run_install(self, e):
             self.error_text.value = "Installation failed! Try again or make sure everything is setup correctly."
         else:
             sleep(5)  # wait to make sure everything is fine
+            self.progress_indicator.set_progress_bar(100)
+            self.progress_indicator.update()
             logger.success("Installation process was successful. Allow to continue.")
             # enable the confirm button and disable the call button
             self.confirm_button.disabled = False

openandroidinstaller/widgets.py

@@ -114,6 +114,20 @@ def display_progress_bar(self, line: str):
         """Display and update the progress bar for the given line."""
         percentage_done = None
         result = None
+        # create the progress bar
+        if self.progress_bar == None:
+            self.progress_bar = ProgressBar(
+                value=1 / 100,
+                width=500,
+                bar_height=32,
+                color="#00d886",
+                bgcolor="#eeeeee",
+            )
+            # text to display the percentage
+            self.percentage_text = Text("1%")
+            self._container.content.controls.append(
+                Row([self.percentage_text, self.progress_bar])
+            )
         # get the progress numbers from the output lines
         if (type(line) == str) and line.strip():
             result = re.search(
@@ -122,23 +136,29 @@ def display_progress_bar(self, line: str):
             )
         if result:
             if result.group(2):
-                percentage_done = 100
+                percentage_done = 99
             elif result.group(1):
                 percentage_done = int(result.group(1))
+                if percentage_done == 0:
+                    percentage_done = 1
+                elif percentage_done == 100:
+                    percentage_done = 99
 
-            # create the progress bar on first occurrence
-            if percentage_done == 0:
-                self.progress_bar = ProgressBar(
-                    width=500, bar_height=32, color="#00d886", bgcolor="#eeeeee"
-                )
-                self.percentage_text = Text(f"{percentage_done}%")
-                self._container.content.controls.append(
-                    Row([self.percentage_text, self.progress_bar])
-                )
             # update the progress bar
-            if self.progress_bar:
-                self.progress_bar.value = percentage_done / 100
-                self.percentage_text.value = f"{percentage_done}%"
+            self.set_progress_bar(percentage_done)
+
+    def set_progress_bar(self, percentage_done: int):
+        """Set the progress bar to the given percentage.
+
+        Args:
+            percentage_done (int): Percentage of the progress bar to be filled.
+        """
+        assert (
+            percentage_done >= 0 and percentage_done <= 100
+        ), "Percentage must be between 0 and 100"
+        if self.progress_bar:
+            self.progress_bar.value = percentage_done / 100
+            self.percentage_text.value = f"{percentage_done}%"
 
     def display_progress_ring(
         self,

tests/test_progress_bar.py

@@ -30,13 +30,13 @@ def test_init():
 def test_update_progress_bar():
     """Test if the progress bar is updated properly based on lines."""
     progress_indicator = ProgressIndicator(expand=True)
-    build_indicator = progress_indicator.build()
+    progress_indicator.build()
 
     # test if other line is fine
     progress_indicator.display_progress_bar(
         line="Failed to mount '/data' (Device or resource busy)"
     )
-    assert not progress_indicator.progress_bar
+    assert progress_indicator.progress_bar
 
     # test if percentages are parsed correctly and update is performed
     for percentage in range(0, 47):
@@ -46,4 +46,4 @@ def test_update_progress_bar():
 
     # test if the finishing print is detected and updated correctly.
     progress_indicator.display_progress_bar(line="Total xfer: 1.00x\n")
-    assert progress_indicator.progress_bar.value == 1.0
+    assert progress_indicator.progress_bar.value == 0.99