SetupWizard: allow installing AuroraDroid instead of FDroid

SetupWizard/META-INF/com/google/android/aroma-config

@@ -48,7 +48,6 @@ checkbox(
 	"setup.prop",
 
 	"Adjust the basic settings", "", 2, #-- Group 1
-	"F-Droid",	"Install F-Droid FOSS App Store",			1,
 	"Apps",		"Install Apps (customized later)",			1,
 	"Overlay",	"Debloat Apps (customized later)",			1,
 	"Zelda Tunes",	"Install The Legend of Zelda rintones and sounds",	1,
@@ -70,11 +69,23 @@ selectbox(
 	"ug.prop",
 
 	"Select whether to install microG", "", 2, #-- Group 1. key = "selected.1"
-	"None",		"Don't install microG",							0,	#-- selected.1 = 1
+	"None",		"Don't install microG (does not effect NanoDroid-microG)",		0,	#-- selected.1 = 1
 	"Full",		"Install microG [GmsCore, GsfProxy, DroidGuard Helper, Nominatim]",	1,	#-- selected.1 = 2
 	"Minimal",	"Install microG [GmsCore, Nominatim]",					0	#-- selected.1 = 3
 );
 
+selectbox(
+	"F-Droid",
+	"F-Droid",
+	"@customize",
+	"fd.prop",
+
+	"Select whether to install F-Droid", "", 2, #-- Group 1. key = "selected.1"
+	"None",		"Don't install F-Droid (does not effect NanoDroid-FDroid)",	0,	#-- selected.1 = 1
+	"Official",	"Install official F-Droid client",				1,	#-- selected.1 = 2
+	"Aurora Droid",	"Install unofficial Aurora Droid client",			0	#-- selected.1 = 3
+);
+
 checkbox(
 	"nlpBackends",
 	"nlpBackends",

SetupWizard/nanodroid-setup

@@ -50,6 +50,7 @@ debloat_prop="${aromapath}/debloat.prop"
 location_prop="${aromapath}/location.prop"
 nlp_prop="${aromapath}/nlp.prop"
 ug_prop="${aromapath}/ug.prop"
+fd_prop="${aromapath}/fd.prop"
 
 ui_print " "
 ui_print "****************************"
@@ -99,19 +100,18 @@ done
 ui_print " "
 ui_print " < Installer Configuration"
 
-setup_add 1 nanodroid_fdroid
-setup_add 2 nanodroid_apps
-setup_add 3 nanodroid_overlay
-setup_add 4 nanodroid_zelda
-setup_add 5 nanodroid_mapsv1
-setup_add 6 nanodroid_init
-setup_add 7 nanodroid_gsync
-setup_add 8 nanodroid_swipe
-setup_add 9 nanodroid_forcesystem
-setup_add 10 nanodroid_bash
-setup_add 11 nanodroid_nano
-setup_add 12 nanodroid_utils
-setup_add 13 nanodroid_fonts
+setup_add 1 nanodroid_apps
+setup_add 2 nanodroid_overlay
+setup_add 3 nanodroid_zelda
+setup_add 4 nanodroid_mapsv1
+setup_add 5 nanodroid_init
+setup_add 6 nanodroid_gsync
+setup_add 7 nanodroid_swipe
+setup_add 8 nanodroid_forcesystem
+setup_add 9 nanodroid_bash
+setup_add 10 nanodroid_nano
+setup_add 11 nanodroid_utils
+setup_add 12 nanodroid_fonts
 
 if grep -q "selected.1=1" "${store_prop}"; then
 	ui_print "  <>> setting property: nanodroid_play [None]"
@@ -169,6 +169,17 @@ elif grep -q "selected.1=3" "${ug_prop}"; then
 	echo "nanodroid_microg=2" >> "${nanodroid_setup}"
 fi
 
+if grep -q "selected.1=1" "${fd_prop}"; then
+	ui_print "  <>> setting property: nanodroid_fdroid [None]"
+	echo "nanodroid_fdroid=0" >> "${nanodroid_setup}"
+elif grep -q "selected.1=2" "${fd_prop}"; then
+	ui_print "  <>> setting property: nanodroid_microg [Official]"
+	echo "nanodroid_fdroid=1" >> "${nanodroid_setup}"
+elif grep -q "selected.1=3" "${fd_prop}"; then
+	ui_print "  <>> setting property: nanodroid_microg [Aurora Droid]"
+	echo "nanodroid_fdroid=2" >> "${nanodroid_setup}"
+fi
+
 ui_print " "
 ui_print " < Installed Applications"