Skip to content

Commit 3734cd0

Browse files
committed
Update texts for isntalling addons
1 parent 721d15d commit 3734cd0

3 files changed

Lines changed: 27 additions & 33 deletions

File tree

openandroidinstaller/views/addon_view.py

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,19 @@ def build(self):
5353
# dialog box to explain OS images and recovery
5454
self.dlg_explain_addons = AlertDialog(
5555
modal=True,
56-
title=Text("What is an OS image and recovery and why do I need it?"),
56+
title=Text("What kind of addons are supported?"),
5757
content=Markdown(
58-
"""## OS image or ROM
59-
An operating system (OS) is system software that manages computer hardware,
60-
software resources, and provides common services for computer programs.
61-
Popular, custom operating systems for mobile devices based on Android are
62-
- [LineageOS](https://lineageos.org/)
63-
- [/e/OS](https://e.foundation/e-os/) or
64-
- [LineageOS for microG](https://lineage.microg.org/)
65-
- and many others.
66-
67-
Often, the related OS images are called 'ROM'. 'ROM' stands for *R*ead-*o*nly *m*emory,
68-
which is a type of non-volatile memory used in computers for storing software that is
69-
rarely changed during the life of the system, also known as firmware.
70-
71-
## Recovery Image
72-
A custom recovery is used for installing custom software on your device.
73-
This custom software can include smaller modifications like rooting your device or even
74-
replacing the firmware of the device with a completely custom ROM.
75-
76-
OpenAndroidInstaller works with the [TWRP recovery project](https://twrp.me/about/).""",
58+
"""## Google Apps:
59+
There are different packages of Google Apps available. Most notable
60+
- [MindTheGapps](https://wiki.lineageos.org/gapps#downloads) and
61+
- [NikGApps](https://nikgapps.com/).
62+
63+
These packages are only dependent on your OS version and processor architecture, which can be found on each device specific info page.
64+
Filenames on MindTheGApps are of the format `MindTheGapps-<AndroidVersion>-<architecture>-<date>_<time>.zip` (with Android 12L being 12.1)
65+
and NikGApps are of the format `NikGapps-<flavour>-<architecture>-<AndroidVersion>-<date>-signed.zip`.
66+
67+
NikGApps come in different flavours ranging from minimal Google support (core) to the full experience (full).
68+
""",
7769
on_tap_link=lambda e: self.page.launch_url(e.data),
7870
),
7971
actions=[
@@ -99,18 +91,18 @@ def build(self):
9991

10092
# create help/info button to show the help dialog
10193
info_button = OutlinedButton(
102-
"What is this?",
94+
"What kind of addons?",
10395
on_click=self.open_explain_addons_dlg,
10496
expand=True,
10597
icon=icons.HELP_OUTLINE_OUTLINED,
10698
icon_color=colors.DEEP_ORANGE_500,
107-
tooltip="Get more details on custom operating system images and recoveries.",
99+
tooltip="Get more details on what addons are supported.",
108100
)
109101

110102
# add title
111103
self.right_view_header.controls.append(
112104
get_title(
113-
"You can select additional addons to install. Otherwise you can safely continue",
105+
"You can select additional addons to install.",
114106
info_button=info_button,
115107
step_indicator_img="steps-header-select.png",
116108
)
@@ -123,14 +115,14 @@ def build(self):
123115
self.right_view.controls.append(
124116
Column(
125117
[
126-
Text("Here you can download the right GApps for your device."),
118+
Text("Here you can find instructions on how to download the right GApps for your device."),
127119
Row(
128120
[
129121
ElevatedButton(
130-
"Download LineageOS image",
122+
"Download Google Apps",
131123
icon=icons.DOWNLOAD_OUTLINED,
132124
on_click=lambda _: webbrowser.open(
133-
"https://wiki.lineageos.org/gapps"
125+
"https://wiki.lineageos.org/gapps#downloads"
134126
),
135127
expand=True,
136128
),
@@ -144,10 +136,10 @@ def build(self):
144136
self.right_view.controls.extend(
145137
[
146138
Text("Select addons:", style="titleSmall"),
147-
Markdown(
148-
f"""
149-
The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
150-
),
139+
#Markdown(
140+
#f"""
141+
#The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
142+
# ),
151143
Row(
152144
[
153145
FilledButton(

openandroidinstaller/views/install_addons_view.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def check_advanced_switch(e):
8585
]
8686
self.right_view.controls = [
8787
Markdown(
88-
"""In the next steps, you finally flash the selected Addons.
88+
"""In the next steps, you flash the selected Addons.
8989
9090
Confirm to install.
9191

openandroidinstaller/views/install_view.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ def check_addons_switch(e):
108108
It will also remove encryption and delete all files stored in the internal storage.
109109
Then the OS image will be installed. Confirm to install.
110110
111-
#### If you want to install any addons like Google Apps, microg or F-droid, use the toggle below **before** starting the install process!
112-
After the installation you'll be taken trough the process.
111+
#### **Install addons:**
112+
If you want to install any addons like Google Apps, microg or F-droid, use the toggle below **before** starting the install process!
113+
After the installation you'll be taken through the process. Note, that this process is still somewhat experimental and using ROMs with
114+
included Google Apps (like PixelExperience) or MicroG (lineageOS for microg) is recommended.
113115
114116
This might take a while. At the end your phone will boot into the new OS.
115117
"""

0 commit comments

Comments
 (0)