isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 09:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename night mode to dark theme; abide by system-wide settings (API 29)

Browse Source 
Closes issue #513
This commit is contained in:
Alinson S. Xavier
2019-12-29 12:22:19 -06:00
parent 3658aef2e2
commit bf644f4e09
5 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
View File

@@ -186,7 +186,7 @@ public class Preferences
public int getTheme()
{
return storage.getInt("pref_theme", ThemeSwitcher.THEME_LIGHT);
return storage.getInt("pref_theme", ThemeSwitcher.THEME_AUTOMATIC);
}
public void setTheme(int theme)

37
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java
View File

@@ -27,7 +27,9 @@ public abstract class ThemeSwitcher
{
public static final int THEME_DARK = 1;
public static final int THEME_LIGHT = 0;
public static final int THEME_LIGHT = 2;
public static final int THEME_AUTOMATIC = 0;
private final Preferences preferences;
@@ -38,7 +40,7 @@ public abstract class ThemeSwitcher
public void apply()
{
if (preferences.getTheme() == THEME_DARK)
if (isNightMode())
{
if (preferences.isPureBlackEnabled()) applyPureBlackTheme();
else applyDarkTheme();
@@ -55,19 +57,36 @@ public abstract class ThemeSwitcher
public abstract void applyPureBlackTheme();
public abstract int getSystemTheme();
public boolean isNightMode()
{
return preferences.getTheme() == THEME_DARK;
}
int systemTheme = getSystemTheme();
int userTheme = preferences.getTheme();
public void setTheme(int theme)
{
preferences.setTheme(theme);
return (userTheme == THEME_DARK ||
(systemTheme == THEME_DARK && userTheme == THEME_AUTOMATIC));
}
public void toggleNightMode()
{
if (isNightMode()) setTheme(THEME_LIGHT);
else setTheme(THEME_DARK);
int systemTheme = getSystemTheme();
int userTheme = preferences.getTheme();
if(userTheme == THEME_AUTOMATIC)
{
if(systemTheme == THEME_LIGHT) preferences.setTheme(THEME_DARK);
if(systemTheme == THEME_DARK) preferences.setTheme(THEME_LIGHT);
}
else if(userTheme == THEME_LIGHT)
{
if (systemTheme == THEME_LIGHT) preferences.setTheme(THEME_DARK);
if (systemTheme == THEME_DARK) preferences.setTheme(THEME_AUTOMATIC);
}
else if(userTheme == THEME_DARK)
{
if (systemTheme == THEME_LIGHT) preferences.setTheme(THEME_AUTOMATIC);
if (systemTheme == THEME_DARK) preferences.setTheme(THEME_LIGHT);
}
}
}