More themes

This commit is contained in:
M66B
2019-12-26 16:15:46 +01:00
parent 37f526ec21
commit 78f8e3a445
7 changed files with 234 additions and 46 deletions

View File

@@ -83,27 +83,53 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
if (!this.getClass().equals(ActivityMain.class)) {
String theme = prefs.getString("theme", "light");
int uiMode = getResources().getConfiguration().uiMode;
Log.i("UI mode=" + uiMode);
if ("dark".equals(theme))
setTheme(R.style.AppThemeBlueOrangeDark);
else if ("black".equals(theme))
setTheme(R.style.AppThemeBlack);
else if ("grey_light".equals(theme))
setTheme(R.style.AppThemeGreySteelBlueLight);
else if ("grey_dark".equals(theme))
setTheme(R.style.AppThemeGreySteelBlueDark);
else if ("system".equals(theme)) {
int uiMode = getResources().getConfiguration().uiMode;
Log.i("UI mode=" + uiMode);
if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
setTheme(R.style.AppThemeBlack);
} else if ("grey_system".equals(theme)) {
int uiMode = getResources().getConfiguration().uiMode;
Log.i("UI mode=" + uiMode);
if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
setTheme(R.style.AppThemeGreySteelBlueDark);
else
switch (theme) {
case "light":
case "blue_orange_light":
setTheme(R.style.AppThemeBlueOrangeLight);
break;
case "yellow_purple_light":
setTheme(R.style.AppThemeYellowPurpleLight);
break;
case "green_red_light":
setTheme(R.style.AppThemeGreenRedLight);
break;
case "grey_light":
setTheme(R.style.AppThemeGreySteelBlueLight);
break;
case "dark":
case "blue_orange_dark":
setTheme(R.style.AppThemeBlueOrangeDark);
break;
case "yellow_purple_dark":
setTheme(R.style.AppThemeYellowPurpleDark);
break;
case "green_red_dark":
setTheme(R.style.AppThemeGreenRedDark);
break;
case "grey_dark":
setTheme(R.style.AppThemeGreySteelBlueDark);
break;
case "black":
setTheme(R.style.AppThemeBlack);
break;
case "system":
if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
setTheme(R.style.AppThemeBlueOrangeDark);
else
setTheme(R.style.AppThemeBlueOrangeLight);
break;
case "grey_system":
if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
setTheme(R.style.AppThemeGreySteelBlueDark);
else
setTheme(R.style.AppThemeGreySteelBlueLight);
break;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {