diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java index 2d82729..6530fc7 100644 --- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java b/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java index 9760dff..b2b5375 100644 --- a/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityHelp.java b/app/src/main/java/com/jens/automation2/ActivityHelp.java index 5f88e1d..99bbd0d 100644 --- a/app/src/main/java/com/jens/automation2/ActivityHelp.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityMainPoi.java b/app/src/main/java/com/jens/automation2/ActivityMainPoi.java index f205ee7..997d918 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainPoi.java +++ b/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; diff --git a/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java b/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java index 65e7346..26de041 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java +++ b/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; diff --git a/app/src/main/java/com/jens/automation2/ActivityMainRules.java b/app/src/main/java/com/jens/automation2/ActivityMainRules.java index 8c1d104..8030414 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainRules.java +++ b/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; diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java index d7966dc..9392885 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java +++ b/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; diff --git a/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java b/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java index 28e60d9..e3f1baa 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java +++ b/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); - - this.setTheme(R.style.AppThemeCompat); + Miscellaneous.setUiTheme(this); if(Settings.tabsPlacement == 1) setContentView(R.layout.main_tab_layout_tabs_at_bottom); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java b/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java index 811171d..005b746 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java index f9e8ec2..5ad4541 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java b/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java index b5e75d1..78362b1 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java index 3c54bc9..ab522fb 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java index 63c26da..a2271a6 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionLocationService.java b/app/src/main/java/com/jens/automation2/ActivityManageActionLocationService.java index 1105ce8..a2abe93 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionLocationService.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java b/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java index 21bd238..163f364 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java b/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java index 59b6b68..1433585 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java index 2f39ff9..79abb38 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java index fa60b10..483e9c5 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java index 5771663..9a4ad9c 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java index 89a6813..918249b 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java index 19868b2..105da72 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java index 7db149a..d73c79a 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java b/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java index 5ed0b13..3ec09e0 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java b/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java index c91549c..2c3fe63 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java index e8767a3..cc564af 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java index 0fe79d2..968d945 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java index beafcec..f411e31 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageProfile.java b/app/src/main/java/com/jens/automation2/ActivityManageProfile.java index ad22065..be89639 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageProfile.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java index cee0f6a..34166a9 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java index 620664e..973c0b4 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java index 65282ac..18155cf 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCalendar.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerCalendar.java index 6c2280e..44db049 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCalendar.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCharging.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerCharging.java index 0845f09..6b46005 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCharging.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java index 39f42df..fb57bfc 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java index 449e85c..907820a 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java index c84686b..c010e5e 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java index 690751d..ebe3235 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java index 98c6ecb..ba12e41 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java index a73b50e..abe57ec 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java index ec7c71f..ee01b80 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java index 51b5b32..f19102d 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java index dff7719..2144393 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java +++ b/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) diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java index aa93d77..0a59773 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java index 8f33ff7..fcef240 100644 --- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/ActivitySettings.java b/app/src/main/java/com/jens/automation2/ActivitySettings.java index 8ac0a12..4ca4add 100644 --- a/app/src/main/java/com/jens/automation2/ActivitySettings.java +++ b/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)) diff --git a/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java b/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java index 91cdc0b..af378bf 100644 --- a/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java +++ b/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); diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java index d321172..dc90200 100644 --- a/app/src/main/java/com/jens/automation2/Miscellaneous.java +++ b/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)) diff --git a/app/src/main/java/com/jens/automation2/Settings.java b/app/src/main/java/com/jens/automation2/Settings.java index dac8e33..f44e3fd 100644 --- a/app/src/main/java/com/jens/automation2/Settings.java +++ b/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); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 40e539d..70c0d99 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -46,11 +46,11 @@ android:inputType="number" /> + android:key="uiTheme" + android:title="@string/uiTheme" + android:summary="@string/uiThemeSummary" + android:entries="@array/uiThemeOptions" + android:entryValues="@array/uiThemeOptionsValues" /> 1 - + 1 - - 0 - 1 - 2 - 3 - --> @string/overview @@ -82,4 +78,6 @@ French Polish Chinese (China) + Classic UI theme + Material design UI theme \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1f2553..799e2f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -960,4 +960,6 @@ Disable Enable Permission FOREGROUND_SERVICE_TYPE_SPECIAL_USE is required to start. + UI theme + The theme of the graphical user interface. Application required. \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 607f3c7..03c426b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,5 +4,6 @@