Skip to content

Commit

Permalink
Update texts for isntalling addons
Browse files Browse the repository at this point in the history
  • Loading branch information
tsterbak committed Feb 6, 2023
1 parent 721d15d commit 3734cd0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 33 deletions.
52 changes: 22 additions & 30 deletions openandroidinstaller/views/addon_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,19 @@ def build(self):
# dialog box to explain OS images and recovery
self.dlg_explain_addons = AlertDialog(
modal=True,
title=Text("What is an OS image and recovery and why do I need it?"),
title=Text("What kind of addons are supported?"),
content=Markdown(
"""## OS image or ROM
An operating system (OS) is system software that manages computer hardware,
software resources, and provides common services for computer programs.
Popular, custom operating systems for mobile devices based on Android are
- [LineageOS](https://lineageos.org/)
- [/e/OS](https://e.foundation/e-os/) or
- [LineageOS for microG](https://lineage.microg.org/)
- and many others.
Often, the related OS images are called 'ROM'. 'ROM' stands for *R*ead-*o*nly *m*emory,
which is a type of non-volatile memory used in computers for storing software that is
rarely changed during the life of the system, also known as firmware.
## Recovery Image
A custom recovery is used for installing custom software on your device.
This custom software can include smaller modifications like rooting your device or even
replacing the firmware of the device with a completely custom ROM.
OpenAndroidInstaller works with the [TWRP recovery project](https://twrp.me/about/).""",
"""## Google Apps:
There are different packages of Google Apps available. Most notable
- [MindTheGapps](https://wiki.lineageos.org/gapps#downloads) and
- [NikGApps](https://nikgapps.com/).
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`.
NikGApps come in different flavours ranging from minimal Google support (core) to the full experience (full).
""",
on_tap_link=lambda e: self.page.launch_url(e.data),
),
actions=[
Expand All @@ -99,18 +91,18 @@ def build(self):

# create help/info button to show the help dialog
info_button = OutlinedButton(
"What is this?",
"What kind of addons?",
on_click=self.open_explain_addons_dlg,
expand=True,
icon=icons.HELP_OUTLINE_OUTLINED,
icon_color=colors.DEEP_ORANGE_500,
tooltip="Get more details on custom operating system images and recoveries.",
tooltip="Get more details on what addons are supported.",
)

# add title
self.right_view_header.controls.append(
get_title(
"You can select additional addons to install. Otherwise you can safely continue",
"You can select additional addons to install.",
info_button=info_button,
step_indicator_img="steps-header-select.png",
)
Expand All @@ -123,14 +115,14 @@ def build(self):
self.right_view.controls.append(
Column(
[
Text("Here you can download the right GApps for your device."),
Text("Here you can find instructions on how to download the right GApps for your device."),
Row(
[
ElevatedButton(
"Download LineageOS image",
"Download Google Apps",
icon=icons.DOWNLOAD_OUTLINED,
on_click=lambda _: webbrowser.open(
"https://wiki.lineageos.org/gapps"
"https://wiki.lineageos.org/gapps#downloads"
),
expand=True,
),
Expand All @@ -144,10 +136,10 @@ def build(self):
self.right_view.controls.extend(
[
Text("Select addons:", style="titleSmall"),
Markdown(
f"""
The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
),
#Markdown(
#f"""
#The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
# ),
Row(
[
FilledButton(
Expand Down
2 changes: 1 addition & 1 deletion openandroidinstaller/views/install_addons_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def check_advanced_switch(e):
]
self.right_view.controls = [
Markdown(
"""In the next steps, you finally flash the selected Addons.
"""In the next steps, you flash the selected Addons.
Confirm to install.
Expand Down
6 changes: 4 additions & 2 deletions openandroidinstaller/views/install_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ def check_addons_switch(e):
It will also remove encryption and delete all files stored in the internal storage.
Then the OS image will be installed. Confirm to install.
#### 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 trough 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.
This might take a while. At the end your phone will boot into the new OS.
"""
Expand Down

0 comments on commit 3734cd0

Please sign in to comment.