UI theme can be changed

app/src/main/java/com/jens/automation2/ActivityControlCenter.java

@@ -41,6 +41,7 @@ public class ActivityControlCenter extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_control_center);
 
 

app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java

@@ -22,6 +22,7 @@ public class ActivityDisplayLongMessage extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_display_long_message);
 
         tvMessageTitle = (TextView)findViewById(R.id.tvMessageTitle);

app/src/main/java/com/jens/automation2/ActivityHelp.java

@@ -14,6 +14,7 @@ public class ActivityHelp extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(layout.activity_help_text);
 
 		TextView tvHelpTextEnergySaving = (TextView) findViewById(R.id.tvHelpTextEnergySaving);

app/src/main/java/com/jens/automation2/ActivityMainPoi.java

@@ -45,6 +45,7 @@ public class ActivityMainPoi extends ActivityGeneric
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.main_poi_layout);
 
 		instance = this;

app/src/main/java/com/jens/automation2/ActivityMainProfiles.java

@@ -41,6 +41,7 @@ public class ActivityMainProfiles extends ActivityGeneric
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.main_profile_layout);
 
 		instance = this;

app/src/main/java/com/jens/automation2/ActivityMainRules.java

@@ -49,6 +49,7 @@ public class ActivityMainRules extends ActivityGeneric
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.main_rule_layout);
 
 		instance = this;

app/src/main/java/com/jens/automation2/ActivityMainScreen.java

@@ -57,6 +57,7 @@ public class ActivityMainScreen extends ActivityGeneric
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.main_overview_layout);
 
 		activityMainScreenInstance = this;

app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java

@@ -24,8 +24,7 @@ public class ActivityMainTabLayout extends TabActivity
 		super.onCreate(savedInstanceState);
 		Settings.readFromPersistentStorage(ActivityMainTabLayout.this);
 		Miscellaneous.setDisplayLanguage(this);
-
+		Miscellaneous.setUiTheme(this);
-		this.setTheme(R.style.AppThemeCompat);
 
 		if(Settings.tabsPlacement == 1)
 			setContentView(R.layout.main_tab_layout_tabs_at_bottom);

app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java

@@ -27,6 +27,7 @@ public class ActivityManageActionBrightnessSetting extends Activity
     {
         setContentView(R.layout.activity_manage_action_brightness_settings);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         super.onCreate(savedInstanceState);
 
         chkAutoBrightness = (CheckBox)findViewById(R.id.chkAutoBrightness);

app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java

@@ -260,6 +260,7 @@ public class ActivityManageActionCloseNotification extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_action_close_notification);
 
 		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);

app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java

@@ -20,6 +20,7 @@ public class ActivityManageActionControlMedia extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_control_media);
 
         rbMediaPlayPause = (RadioButton)findViewById(R.id.rbMediaPlayPause);

app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java

@@ -20,6 +20,7 @@ public class ActivityManageActionCopyToClipboard extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         this.setContentView(R.layout.activity_manage_action_copy_to_clipboard);
 
         bSaveCopyToClipboard = (Button) findViewById(R.id.bSaveCopyToClipboard);

app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java

@@ -25,6 +25,7 @@ public class ActivityManageActionCreateNotification extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_create_notification);
 
         etNotificationTitle = (EditText) findViewById(R.id.etNotificationTitle);

app/src/main/java/com/jens/automation2/ActivityManageActionLocationService.java

@@ -20,6 +20,7 @@ public class ActivityManageActionLocationService extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_location_service);
 
         rbActionLocationServiceOff = (RadioButton) findViewById(R.id.rbActionLocationServiceOff);

app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java

@@ -22,6 +22,7 @@ public class ActivityManageActionMakePhoneCall extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_make_phone_call);
 
         etTargetPhoneNumber = (EditText)findViewById(R.id.etTargetPhoneNumber);

app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java

@@ -27,6 +27,7 @@ public class ActivityManageActionPlaySound extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_play_sound);
 
         chkPlaySoundAlwaysPlay = (CheckBox)findViewById(R.id.chkPlaySoundAlwaysPlay);

app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java

@@ -29,6 +29,7 @@ public class ActivityManageActionRunExecutable extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_run_executable);
 
         chkRunExecAsRoot = (CheckBox)findViewById(R.id.chkRunExecAsRoot);

app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java

@@ -38,6 +38,7 @@ public class ActivityManageActionSendBroadcast extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_send_broadcast);
 
         etBroadcastToSend = (EditText)findViewById(R.id.etBroadcastToSend);

app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java

@@ -49,6 +49,7 @@ public class ActivityManageActionSendTextMessage extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_action_send_textmessage);
 		
 		etSendTextMessage = (EditText)findViewById(R.id.etSendTextMessage);

app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java

@@ -25,6 +25,7 @@ public class ActivityManageActionSetVariable extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_action_set_variable);
 
 		etVariableSetKey = (EditText)findViewById(R.id.etVariableSetKey);

app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java

@@ -23,6 +23,7 @@ public class ActivityManageActionSpeakText extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_action_speak_text);
 		
 		etSpeakText = (EditText)findViewById(R.id.etTextToSpeak);

app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java

@@ -70,6 +70,7 @@ public class ActivityManageActionStartActivity extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_action_start_activity);
 
 		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);

app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java

@@ -54,6 +54,7 @@ public class ActivityManageActionTriggerUrl extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_action_trigger_url);
 		
 		etTriggerUrl = (EditText)findViewById(R.id.etTriggerUrl);

app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java

@@ -28,6 +28,7 @@ public class ActivityManageActionVibrate extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_vibrate);
 
         etVibratePattern = (EditText)findViewById(R.id.etVibratePattern);

app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java

@@ -28,6 +28,7 @@ public class ActivityManageActionWakeLock extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_wakelock);
 
         rbWakeLockActivate = (RadioButton)findViewById(R.id.rbWakeLockActivate);

app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java

@@ -24,6 +24,7 @@ public class ActivityManageActionWifi extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_action_wifi);
 
         chkWifiRunAsRoot = (CheckBox)findViewById(R.id.chkWifiRunAsRoot);

app/src/main/java/com/jens/automation2/ActivityManagePoi.java

@@ -66,6 +66,7 @@ public class ActivityManagePoi extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_specific_poi);
 		
 		myLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);

app/src/main/java/com/jens/automation2/ActivityManageProfile.java

@@ -85,6 +85,7 @@ public class ActivityManageProfile extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		this.setContentView(R.layout.activity_manage_specific_profile);
 		
 		checkBoxChangeSoundMode = (CheckBox)findViewById(R.id.checkBoxChangeSoundMode);

app/src/main/java/com/jens/automation2/ActivityManageRule.java

@@ -160,8 +160,8 @@ public class ActivityManageRule extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setTheme(R.style.AppThemeCompat);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_specific_rule);
 
 

app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java

@@ -33,6 +33,7 @@ public class ActivityManageTriggerBluetooth extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_trigger_bluetooth);
 		
 		radioAnyBluetoothDevice = (RadioButton)findViewById(R.id.radioAnyBluetoothDevice);

app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java

@@ -29,6 +29,7 @@ public class ActivityManageTriggerBroadcast extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_broadcasts);
 
         bBroadcastShowSuggestions = findViewById(R.id.bBroadcastShowSuggestions);

app/src/main/java/com/jens/automation2/ActivityManageTriggerCalendar.java

@@ -51,6 +51,7 @@ public class ActivityManageTriggerCalendar extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_calendar);
 
         chkCalendarEventActive = (CheckBox) findViewById(R.id.chkCalendarEventActive);

app/src/main/java/com/jens/automation2/ActivityManageTriggerCharging.java

@@ -22,6 +22,7 @@ public class ActivityManageTriggerCharging extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_charging);
 
         rbChargingOn = (RadioButton) findViewById(R.id.rbChargingOn);

app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java

@@ -24,6 +24,7 @@ public class ActivityManageTriggerCheckVariable extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_check_variable);
 
         etVariableKeyTrigger = (EditText) findViewById(R.id.etVariableKeyTrigger);

app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java

@@ -105,6 +105,7 @@ public class ActivityManageTriggerDeviceOrientation extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_device_orientation);
 
         currentAzimuth = (TextView) findViewById(R.id.tvCurrentAzimuth);

app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java

@@ -40,6 +40,7 @@ public class ActivityManageTriggerNfc extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_trigger_nfc);
 		
 		etNewNfcIdValue = (EditText)findViewById(R.id.etNewNfcIdValue);

app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java

@@ -259,6 +259,7 @@ public class ActivityManageTriggerNotification extends Activity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_manage_trigger_notification);
 
 		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);

app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java

@@ -36,6 +36,7 @@ public class ActivityManageTriggerPhoneCall extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_phone_call);
 
         etTriggerPhoneCallPhoneNumber = (EditText)findViewById(R.id.etTriggerPhoneCallPhoneNumber);

app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java

@@ -32,6 +32,7 @@ public class ActivityManageTriggerProfile extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_profile);
 
         bSaveTriggerProfile = (Button)findViewById(R.id.bSaveTriggerProfile);

app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java

@@ -22,6 +22,7 @@ public class ActivityManageTriggerSubSystemState extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_subsystemstate);
 
         rbSubSystemStateWifi = (RadioButton)findViewById(R.id.rbSubSystemStateWifi);

app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java

@@ -27,6 +27,7 @@ public class ActivityManageTriggerTethering extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_tethering);
 
         rbTetheringOn = (RadioButton) findViewById(R.id.rbTetheringOn);

app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java

@@ -36,8 +36,14 @@ public class ActivityManageTriggerTimeFrame extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		this.setTheme(R.style.AppThemeCompat);
 		Miscellaneous.setDisplayLanguage(this);
+
+		/*
+			A modern theme is required for this activity. Classic theme can cause crashes with the TimePicker.
+			The value configured in settings is ignored.
+		 */
+		this.setTheme(R.style.AppThemeCompat);
+
 		setContentView(R.layout.activity_manage_trigger_timeframe);
 
 		if(Build.VERSION.SDK_INT == 34)

app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java

@@ -53,6 +53,7 @@ public class ActivityManageTriggerWifi extends Activity
     {
         super.onCreate(savedInstanceState);
         Miscellaneous.setDisplayLanguage(this);
+        Miscellaneous.setUiTheme(this);
         setContentView(R.layout.activity_manage_trigger_wifi);
 
         rbTriggerWifiConnected = (RadioButton) findViewById(R.id.rbTriggerWifiConnected);

app/src/main/java/com/jens/automation2/ActivityPermissions.java

@@ -84,6 +84,7 @@ public class ActivityPermissions extends Activity
         {
             super.onCreate(savedInstanceState);
             Miscellaneous.setDisplayLanguage(this);
+            Miscellaneous.setUiTheme(this);
             setContentView(R.layout.permissions_activity);
 
             bCancelPermissions = (Button)findViewById(R.id.bCancelPermissions);

app/src/main/java/com/jens/automation2/ActivitySettings.java

@@ -17,6 +17,9 @@ public class ActivitySettings extends PreferenceActivity
 	{
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		if(Settings.uiTheme != 0)
+			this.setTheme(R.style.AppThemeCompatLight);
+//		Miscellaneous.setUiTheme(this);
 		addPreferencesFromResource(layout.activity_settings);
 
 		if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_apk))

app/src/main/java/com/jens/automation2/ActivityVolumeTest.java

@@ -31,6 +31,7 @@ public class ActivityVolumeTest extends Activity
 		
 		super.onCreate(savedInstanceState);
 		Miscellaneous.setDisplayLanguage(this);
+		Miscellaneous.setUiTheme(this);
 		setContentView(R.layout.activity_volume_calibration);
 		
 		tvCurrentVolume = (TextView)findViewById(R.id.tvCurrentVolume);

app/src/main/java/com/jens/automation2/Miscellaneous.java

@@ -2195,6 +2195,22 @@ public class Miscellaneous extends Service
 		return context.getApplicationContext().getApplicationInfo().targetSdkVersion;
 	}
 
+	public static void setUiTheme(Context context)
+	{
+		switch(Settings.uiTheme)
+		{
+			case 0:
+				context.setTheme(R.style.AppTheme);
+				break;
+			case 1:
+				context.setTheme(R.style.AppThemeCompat);
+				break;
+			default:
+				context.setTheme(R.style.AppTheme);
+				break;
+		}
+	}
+
 	public static void setDisplayLanguage(Context context)
 	{
 		if(!Settings.displayLanguage.equals(Settings.default_displayLanguage))

app/src/main/java/com/jens/automation2/Settings.java

@@ -63,6 +63,7 @@ public class Settings implements SharedPreferences
 	public static int activityDetectionFrequency;
 	public static int activityDetectionRequiredProbability;
 	public static boolean privacyLocationing;
+	public static int uiTheme;	
 	public static int startScreen;
 	public static int tabsPlacement;
 	public static boolean executeRulesAndProfilesWithSingleClick;
@@ -131,6 +132,7 @@ public class Settings implements SharedPreferences
 	public static final int default_activityDetectionFrequency = 60;
 	public static final int default_activityDetectionRequiredProbability = 75;
 	public static final boolean default_privacyLocationing = false;
+	public static final int default_uiTheme = 0;	
 	public static final int default_startScreen = 0;
 	public static final int default_tabsPlacement = 0;
 	public static final boolean default_executeRulesAndProfilesWithSingleClick = false;
@@ -264,6 +266,7 @@ public class Settings implements SharedPreferences
 			activityDetectionRequiredProbability = Integer.parseInt(prefs.getString("activityDetectionRequiredProbability", String.valueOf(default_activityDetectionRequiredProbability)));
 
 			privacyLocationing = prefs.getBoolean("privacyLocationing", default_privacyLocationing);
+			uiTheme = Integer.parseInt(prefs.getString("uiTheme", String.valueOf(default_uiTheme)));			
 			startScreen = Integer.parseInt(prefs.getString("startScreen", String.valueOf(default_startScreen)));
 			tabsPlacement = Integer.parseInt(prefs.getString("tabsPlacement", String.valueOf(default_tabsPlacement)));
 
@@ -460,6 +463,9 @@ public class Settings implements SharedPreferences
 			if(!prefs.contains("privacyLocationing") || force)
 				editor.putBoolean("privacyLocationing", default_privacyLocationing);
 
+			if(!prefs.contains("uiTheme") || force)
+				editor.putString("uiTheme", String.valueOf(default_uiTheme));			
+
 			if(!prefs.contains("startScreen") || force)
 				editor.putString("startScreen", String.valueOf(default_startScreen));
 
@@ -560,6 +566,7 @@ public class Settings implements SharedPreferences
 				editor.putString("activityDetectionFrequency", String.valueOf(activityDetectionFrequency));
 				editor.putString("activityDetectionRequiredProbability", String.valueOf(activityDetectionRequiredProbability));
 				editor.putBoolean("privacyLocationing", privacyLocationing);
+				editor.putString("uiTheme", String.valueOf(uiTheme));			
 				editor.putString("startScreen", String.valueOf(startScreen));
 				editor.putString("tabsPlacement", String.valueOf(tabsPlacement));
 				editor.putBoolean("executeRulesAndProfilesWithSingleClick", executeRulesAndProfilesWithSingleClick);

app/src/main/res/layout/activity_settings.xml

@@ -46,11 +46,11 @@
 			android:inputType="number" />
 
 		<ListPreference
-			android:key="appTheme"
+			android:key="uiTheme"
-			android:title="@string/startScreen"
+			android:title="@string/uiTheme"
-			android:summary="@string/startScreenSummary"
+			android:summary="@string/uiThemeSummary"
-			android:entries="@array/startScreenOptions"
+			android:entries="@array/uiThemeOptions"
-			android:entryValues="@array/startScreenOptionsValues" />
+			android:entryValues="@array/uiThemeOptionsValues" />
 
 		<ListPreference
 			android:key="startScreen"

app/src/main/res/values/arrays.xml

@@ -9,18 +9,14 @@
         <item name="1">1</item>
     </string-array>
 
-    <!--<string-array name="appThemeOptions">
+    <string-array name="uiThemeOptions">
-        <item name="0">@string/overview</item>
+        <item name="0">@string/uiThemeClassic</item>
-        <item name="1">@string/pois</item>
+        <item name="1">@string/uiThemeCompat</item>
-        <item name="2">@string/rules</item>
+    </string-array>
-        <item name="3">@string/profiles</item>
+    <string-array name="uiThemeOptionsValues">
+        <item name="0">0</item>     <!-- classic -->
+        <item name="1">1</item>     <!-- AppThemeCompat -->
     </string-array>
-    <string-array name="startScreenOptionsValues">
-        <item name="0">0</item>
-        <item name="1">1</item>
-        <item name="2">2</item>
-        <item name="3">3</item>
-    </string-array>-->
 
     <string-array name="startScreenOptions">
         <item name="0">@string/overview</item>
@@ -82,4 +78,6 @@
     <string name="languageFrench">French</string>
     <string name="languagePolish">Polish</string>
     <string name="languageChineseChina">Chinese (China)</string>
+    <string name="uiThemeClassic">Classic UI theme</string>
+    <string name="uiThemeCompat">Material design UI theme</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -960,4 +960,6 @@
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
     <string name="permissionForegroundServiceTypeSpecialUseRequired">Permission FOREGROUND_SERVICE_TYPE_SPECIAL_USE is required to start.</string>
+    <string name="uiTheme">UI theme</string>
+    <string name="uiThemeSummary">The theme of the graphical user interface. Application required.</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -4,5 +4,6 @@
     <style name="AppThemeMaterial" parent="Theme.MaterialComponents.DayNight" />    <!-- very dark -->
     <style name="AppThemeMaterial3" parent="Theme.Material3.DayNight" />        <!-- very dark -->
     <style name="AppThemeCompat" parent="Theme.AppCompat.DayNight" />       <!-- greyish -->
+    <style name="AppThemeCompatLight" parent="Theme.AppCompat.Light" />       <!-- greyish -->
 
 </resources>

fastlane/metadata/android/en-US/changelogs/145.txt

@@ -1 +1,3 @@
 * Fixed: Crash in Play Store version when starting the service
+* Fixed: Crash when clicking +/- when creating/editing TimeFrame trigger
+* Added Possibility to select UI theme, hence enabling modern UI designs