SetupWizard: various optimization

setup-wizard/META-INF/com/google/android/aroma-config

@@ -1,4 +1,4 @@
-ini_set("rom_name",	"NanoDroid Setup Wizard");
+ini_set("rom_name",	"NanoDroid SetupWizard");
 ini_set("rom_version",	"20.5");
 ini_set("rom_author",	"Nanolx");
 ini_set("rom_device",	"Generic (LOS/AOSP)");
@@ -16,23 +16,23 @@ viewbox(
 	"	Rom\t		<b><#selectbg_g>"+ini_get("rom_name")+"</#></b>\n"+
 	"	Version\t	<b><#selectbg_g>"+ini_get("rom_version")+"</#></b>\n"+
 	"	Date\t		<b><#selectbg_g>"+ini_get("rom_date")+"</#></b>\n\n"+
-	"<b><#f00>"+ini_get("rom_device")+"</#></b>\n\n\n",
+	"	Device\t	<b><#f00>"+ini_get("rom_device")+"</#></b>\n\n\n",
 	"@welcome"
 );
 
 agreebox(
-	"\nTerms Of Use",
-	"<@center>\nPlease read the NanoDroid terms of use\n\n</@>",
+	"Terms Of Use",
+	"<@center>Please read the NanoDroid terms of use</@>",
 	"@license",
-	"" + readfile_aroma("license.txt"),
+	"<@center>" + readfile_aroma("license.txt") + "</@>",
 	"I agree with these terms of use",
-	"<@center>\nYou must accept the terms</@>"
+	"<@center>You must accept the terms</@>"
 );
 
 selectbox(
 	"Configuration Location",
 	"Configuration Location",
-	"icons/update",
+	"@customize",
 	"location.prop",
 
 	"Where to store configuration", "", 2, #-- Group 1. key = "selected.1"
@@ -44,7 +44,7 @@ selectbox(
 checkbox(
 	"Generic Setup",
 	"Generic Setup",
-	"icons/update",
+	"@customize",
 	"setup.prop",
 
 	"Adjust the basic settings", "", 2, #-- Group 1
@@ -67,7 +67,7 @@ checkbox(
 selectbox(
 	"microG",
 	"microG",
-	"icons/update",
+	"@customize",
 	"ug.prop",
 
 	"Select whether to install microG", "", 2, #-- Group 1. key = "selected.1"
@@ -79,7 +79,7 @@ selectbox(
 selectbox(
 	"microG GmsCore",
 	"microG GmsCore",
-	"icons/update",
+	"@customize",
 	"gmscore.prop",
 
 	"Select which microG GmsCore to install (if any)", "", 2, #-- Group 1. key = "selected.1"
@@ -90,19 +90,20 @@ selectbox(
 checkbox(
 	"nlpBackends",
 	"nlpBackends",
-	"icons/update",
+	"@customize",
 	"nlp.prop",
 
 	"Select the location backends for microG", "", 2, #-- Group 1
 	"Déjà Vu",	"Install Déjà Vu backend",		1,
 	"Ichnaea",	"Install Mozilla backend",		0,
-	"Apple",	"Install Apple backend",		0
+	"Apple",	"Install Apple backend",		0,
+	"Radiocell",	"Install Radiocells.org backend",	0
 );
 
 selectbox(
 	"Google App Store",
 	"Google App Store",
-	"icons/update",
+	"@customize",
 	"store.prop",
 
 	"Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
@@ -119,7 +120,7 @@ selectbox(
 checkbox(
 	"App Setup",
 	"App Setup",
-	"icons/update",
+	"@customize",
 	"apps.prop",
 
 	"Select which Apps to install (if enabled)", "", 2, #-- Group 1
@@ -158,7 +159,7 @@ checkbox(
 checkbox(
 	"Debloat Setup",
 	"Debloat Setup",
-	"icons/update",
+	"@customize",
 	"debloat.prop",
 
 	"Select which Apps to Debloat (if enabled)", "", 2, #-- Group 1
@@ -194,22 +195,25 @@ checkbox(
 	"WallpaperPickerGoogle",	"Wallpaper App (Google)",	1
 );
 
-viewbox(
-	"Ready",
-	"The wizard is ready to begin the process.\n\n"+
-	"Press <b>Next</b> to begin the process.\n\n"+
-	"If you want to review or change any of your selection, press <b>Back</b>.",
-	"@install"
+menubox(
+	"NanoDroid SetupWizard",
+	"<@center>Ready to create configuration.</@>",
+	"@update",
+	"menu.prop",
+	"Create Configuration", "", "@install",
+	"Abort SetupWizard", "", "@exit"
 );
 
+if prop("menu.prop","selected")=="2"
+then
+  exit("");
+endif;
+
 setvar("retstatus",
   install(
 	"Please Wait...",
-	"<b>"+ini_get("rom_name")+"</b>\n\n"+
-	"Please wait while processing your selection.",
-	"@install",
-	""
-  )
+	"<@center><b>"+ini_get("rom_name")+"</b></@>",
+	"")
 );
 
 ini_set("text_next", "Finish");
@@ -217,10 +221,9 @@ ini_set("text_next", "Finish");
 if getvar("retstatus")=="0" then
 	viewbox(
 	"Installation Completed",
-	"<@center>\nCongratulations!\n"+
-	"NanoDroid setup successfully created\n\n\n</@>",
-	""
-	);
+	"<@center>\nCongratulations!\n\n"+
+	"NanoDroid setup successfully created.</@>",
+	"");
 else
 	viewbox("Installation Failed",
 	"\n\nInstaller Status: "+ getvar("retstatus"),

setup-wizard/META-INF/com/google/android/aroma/license.txt

@@ -1,13 +1,11 @@
-<@center><b><#selectbg_g>Terms of Use</#></b>
+<@center><b><#selectbg_g>Terms of Use</#></b></@>
 
-By using this package, you take full responsibility of it's use, I (setialpha/Nanolx) am not responsible of any damage this package may cause to your device.
+<@left>By using this package, you take full responsibility of it's use, I (Nanolx) am not responsible of any damage this package may cause to your device.</@>
 
-<@center><b><#selectbg_g>Read before installation</#>
-<@left>
-Welcome to the NanoDroid Setup Wizard.
+<@center><b><#selectbg_g>Read before installation</#></b></@>
+
+<@left>Welcome to the NanoDroid Setup Wizard.
 
 With this AROMA installer you will create NanoDroid configuration files.
 
-You need to flash any of the modules afterwards!
-
-Check "I Agree with this" and press Next.
+You need to flash any of the modules afterwards!</@>

setup-wizard/META-INF/com/google/android/updater-script

@@ -1,4 +1,3 @@
-show_progress(1.000000, 0);
 set_progress(0.0);
 ui_print(" ");
 ui_print("> NanoDroid Setup Wizard 20.5.99999999");
@@ -7,7 +6,7 @@ set_progress(0.1);
 
 ui_print("> Creating Configuration Files");
 package_extract_file("nanodroid-setup", "/tmp/nanodroid-setup");
-set_metadata("/tmp/nanodroid-setup", "uid", 0, "gid", 0, "mode", 0777);
+set_perm(0, 0, 0777, "/tmp/nanodroid-setup");
 run_program("/tmp/nanodroid-setup");
 
 ui_print(" ");

setup-wizard/nanodroid-setup

@@ -62,8 +62,13 @@ if grep -q "selected.1=1" "${location_prop}"; then
 	ui_print " > saving configuration in: /sdcard"
 	configpath="/sdcard"
 elif grep -q "selected.1=2" "${location_prop}"; then
+	if -d /external_sd; then
 		ui_print " > saving configuration in: /external_sd"
 		configpath="/external_sd"
+	else
+		ui_print " > saving configuration in: /sdcard"
+		configpath="/sdcard"
+	fi
 elif grep -q "selected.1=3" "${location_prop}"; then
 	ui_print " > saving configuration in: /data"
 	configpath="/data"
@@ -137,7 +142,12 @@ if grep -q "item.1.3=1" "${nlp_prop}"; then
 else	nlp_Apple=0
 fi
 
-echo "nanodroid_nlpbackend=${nlp_Dejavu}${nlp_Ichnaea}${nlp_Apple}" >> "${nanodroid_setup}"
+if grep -q "item.1.4=1" "${nlp_prop}"; then
+	nlp_Radiocell=1
+else	nlp_Radiocell=0
+fi
+
+echo "nanodroid_nlpbackend=${nlp_Dejavu}${nlp_Ichnaea}${nlp_Apple}${nlp_Radiocell}" >> "${nanodroid_setup}"
 
 if grep -q "selected.1=1" "${ug_prop}"; then
 	ui_print "  <>> setting property: nanodroid_microg [None]"
@@ -225,5 +235,3 @@ overlay_add 27 ViaBrowser
 overlay_add 28 Wallpaper
 overlay_add 29 WallpaperBackup
 overlay_add 30 WallpaperPickerGoogle
-
-exit 0