Simplify texts

openandroidinstaller/views/addon_view.py

@@ -50,28 +50,33 @@ def build(self):
             modal=True,
             title=Text("What kind of addons are supported?"),
             content=Markdown(
-                """## Google Apps:
-There are different packages of Google Apps available. Most notable
-- [MindTheGapps](https://wiki.lineageos.org/gapps#downloads) and
-- [NikGApps](https://nikgapps.com).
+                """Please select all addons you want to install at once. See for the most common ones below.
 
-These packages are only dependent on your OS version and processor architecture, which can be found on each device specific info page.
-Filenames on MindTheGApps are of the format `MindTheGapps-<AndroidVersion>-<architecture>-<date>_<time>.zip` (with Android 12L being 12.1)
-and NikGApps are of the format `NikGapps-<flavour>-<architecture>-<AndroidVersion>-<date>-signed.zip`.
+## Google Apps:
+The packages listed here will bring back Google functionality to your phone, required by many proprietary apps.
+The most notable Google Apps packages are:
 
-NikGApps come in different flavours ranging from minimal Google support (core) to the full experience (full).
+- **[MicroG](https://github.com/microg/GmsCore/wiki)** ([Download](https://github.com/IsHacker003/microG_no_sigspoof/releases)):
+  **free-as-in-freedom re-implementation of Google**'s proprietary Android user space apps and libraries (installable after custom ROM installation as APK but might have problems with spoofing)
+- **[MindTheGapps](https://wiki.lineageos.org/gapps/)** ([Download](https://wiki.lineageos.org/gapps/#downloads)):
+  **full Google set** including all apps you can find on a standard Android device
+- **[NikGApps](https://nikgapps.com)** ([Download](https://sourceforge.net/projects/nikgapps/files/Releases/)):
+  choose your **set of Google Apps** and have NikGApps manage them more sustainable
 
-## MicroG
+These are dependend on the version of your **Android OS version** (Stock ROM) and the **phone's architecture**. You can find that information most likely on [LineageOS' device page](https://wiki.lineageos.org/devices).
 
-The [MicroG](https://microg.org) project offers a free-as-in-freedom re-implementation of Google's proprietary Android user space apps and libraries.
+If you got that, get your file from the above link like this (you can **only use one** at a time):
 
-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).
+- `MindTheGapps-<AndroidVersion>-<architecture>-<date>_<time>.zip` (with Android 12L being 12.1)
+- `NikGapps-<flavour>-<architecture>-<AndroidVersion>-<date>-signed.zip` (with [flavours](https://nikgapps.com/downloads) from minimal Google support (`core`) to full experience (`full`))
+- MircoG has only one zip
 
 ## 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).
+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, just like the Google Play Store.
+
+Recommended **installation** is to use the zip from here:
+[https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota](https://f-droid.org/en/packages/org.fdroid.fdroid.privileged.ota).
 """,
             ),
             actions=[

openandroidinstaller/views/install_addons_view.py

@@ -73,11 +73,11 @@ def check_advanced_switch(e):
         ]
         self.right_view.controls = [
             Markdown(
-                """In the next steps, you flash the selected Addons.
+                """In the next steps, you **flash the selected Addons**.
 
 Confirm to install.
 
-This might take a while. At the end your phone will boot into the new OS.
+This might take a while. At the end your phone will **boot into the new OS**.
 """
             )
         ]

openandroidinstaller/views/install_view.py

@@ -88,21 +88,28 @@ def check_addons_switch(e):
         ]
         self.right_view.controls = [
             Markdown(
-                """In the next steps, you finally flash the selected OS image.
+                """In the next steps, you finally **flash the selected OS image**.
 
-Connect your device with your computer with the USB-Cable. This step will format your phone and wipe all the data.
-It will also remove encryption and delete all files stored in the internal storage.
-Then the OS image will be installed. Confirm to install.
+**Connect your device** with your computer with the USB-Cable.
 
-This might take a while. At the end your phone will boot into the new OS.
+#### Install addons
+If you want to **install any addons like Google Apps, microG or F-droid**, use the toggle below ***before*** starting the install process!
+After the installation you'll be taken through the process.
 
-#### **Install addons:**
-If you want to install any addons like Google Apps, microG or F-droid, use the toggle below **before** starting the install process!
-After the installation you'll be taken through the process. Note, that this process is still somewhat experimental and using ROMs with
-included Google Apps (like PixelExperience) or microG (lineageOS for microG) is recommended.
+Note, that this process is still somewhat experimental and **instead using ROMs with
+included** Google Apps (like PixelExperience) or microG (lineageOS for microG) is recommended.
 
 #### **Warning:**
-Don't try to add addons like Google Apps if your OS ROM already has Google Apps or microG included! Otherwise your system will break!
+**Don't** try to add addons like Google Apps if your OS ROM **already has Google Apps or microG included! Otherwise your system will break!**
+
+This step will **format your phone and wipe all the data**.
+It will also **remove encryption and delete all files** stored in the internal storage.Then the OS image will be installed.
+
+Make sure to **take backups** if needed.
+
+Confirm to install.
+
+This might take a while. At the end your phone will boot into the new OS.
 """
             )
         ]

openandroidinstaller/views/requirements_view.py

@@ -154,10 +154,10 @@ def build(self):
                                         alignment="spaceBetween",
                                     ),
                                     Markdown(
-                                        f"""Before following these instructions please ensure that the device is currently using Android {required_android_version} firmware.
+                                        f"""Before following these instructions please ensure that the device is **currently using Android {required_android_version}** firmware.
 If the vendor provided multiple updates for that version, e.g. security updates, make sure you are on the latest!
 If your current installation is newer or older than Android {required_android_version}, please upgrade or downgrade to the required
-version before proceeding (guides can be found on the internet!).
+version before proceeding (flashing stock ROM with adb sideload, guides can be found on the internet!).
                         """
                                     ),
                                     android_checkbox,
@@ -264,9 +264,10 @@ def get_boot_stock_check(self):
                     [
                         Markdown(
                             """
-#### Boot your device with the stock OS at least once and check every functionality.
+#### Boot with the stock OS and check every functionality
 Make sure that you can send and receive SMS and place and receive calls (also via WiFi and LTE, if available),
 otherwise it won\'t work on your custom ROM either! Additionally, some devices require that VoLTE/VoWiFi be utilized once on stock to provision IMS.
+This is not required but to be sure all works.
             """
                         ),
                         boot_stock_checkbox,

openandroidinstaller/views/select_view.py

@@ -278,7 +278,7 @@ def build(self):
                         f"""
 The recovery image should look something like `twrp-3.7.1_12-0-{self.state.config.device_code}.img`.
 
-**Note:** This tool **only supports TWRP recoveries**.""",
+Note: This tool **only supports TWRP recoveries**.""",
                         extension_set="gitHubFlavored",
                     ),
                     Row(

openandroidinstaller/views/start_view.py

@@ -113,7 +113,7 @@ def check_recovery_already_flashed(e):
             self.state.toggle_flash_recovery()
 
         self.recovery_switch = Switch(
-            label="Custom recovery is already flashed.",
+            label="Custom recovery (TWRP or similar) is already flashed.",
             on_change=check_recovery_already_flashed,
             disabled=True,
             inactive_thumb_color=Colors.YELLOW,
@@ -184,11 +184,18 @@ def build(self):
                 Divider(),
                 Markdown(
                     """
-If you **already unlocked the bootloader** of your device or already **flashed a custom recovery**, please toggle the respective switch below, to skip the procedure.
-If you don't know what this means, you most likely don't need to do anything and you can just continue.
+If you already
+
+- **unlocked the bootloader**
+- **flashed a custom recovery**
+
+**toggle the respective switch** below after a device has been detected.
+If you **don't know what this means**, do not toggle them and continue.
             """
                 ),
+                Divider(),
                 self.device_infobox,
+                ResponsiveRow([self.bootloader_switch, self.recovery_switch]),
                 Row(
                     [
                         self.back_button,
@@ -203,8 +210,6 @@ def build(self):
                     ],
                     alignment="center",
                 ),
-                Divider(),
-                ResponsiveRow([self.bootloader_switch, self.recovery_switch]),
             ]
         )
         return self.view

openandroidinstaller/views/welcome_view.py

@@ -71,7 +71,7 @@ def build(self):
                 Markdown(
                     """
 Before you continue, make sure
-- your devices is on the latest system update.
+- 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!