Add download buttons for f-droid and microg

Author: tsterbak

openandroidinstaller/views/addon_view.py

@@ -72,6 +72,11 @@ def build(self):
 
 The recommended way to install MicroG is to use the zip file provided here:
 - [https://github.com/FriendlyNeighborhoodShane/MinMicroG_releases/releases](https://github.com/FriendlyNeighborhoodShane/MinMicroG_releases/releases).
+
+## F-Droid Appstore
+
+F-Droid is an installable catalogue of libre software apps for Android. The F-Droid client app makes it easy to browse, install, and keep track of updates on your device.
+You can get the zip file to install this addon here: [https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota/](https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota/).
 """,
                 on_tap_link=lambda e: self.page.launch_url(e.data),
             ),
@@ -122,7 +127,20 @@ def build(self):
         self.right_view.controls.append(
             Column(
                 [
-                    Text("Here you can find instructions on how to download the right GApps for your device."),
+                    Text("Here you can download the F-Droid App-Store:"),
+                    Row(
+                        [
+                            ElevatedButton(
+                                "Download F-Droid App-Store",
+                                icon=icons.DOWNLOAD_OUTLINED,
+                                on_click=lambda _: webbrowser.open(
+                                    "https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota/"
+                                ),
+                                expand=True,
+                            ),
+                        ]
+                    ),
+                    Text("Here you can find instructions on how to download the right Google apps for your device."),
                     Row(
                         [
                             ElevatedButton(
@@ -135,6 +153,19 @@ def build(self):
                             ),
                         ]
                     ),
+                    Text("Here you can download MicroG:"),
+                    Row(
+                        [
+                            ElevatedButton(
+                                "Download MicroG",
+                                icon=icons.DOWNLOAD_OUTLINED,
+                                on_click=lambda _: webbrowser.open(
+                                    "https://github.com/FriendlyNeighborhoodShane/MinMicroG_releases/releases"
+                                ),
+                                expand=True,
+                            ),
+                        ]
+                    ),
                     Divider(),
                 ]
             )

openandroidinstaller/views/step_view.py

@@ -337,10 +337,10 @@ def display_progress_bar(self, line: str):
         if (type(line) == str) and line.strip():
             result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:|adb: failed to read command: Success)", line.strip())
         if result:
-            if result.group(1):
-                percentage_done = int(result.group(1))
-            elif result.group(2):
+            if result.group(2):
                 percentage_done = 100
+            elif result.group(1):
+                percentage_done = int(result.group(1))
 
             # create the progress bar on first occurrence
             if percentage_done == 0: