diff --git a/app/src/main/java/org/tasks/injection/ActivityModule.java b/app/src/main/java/org/tasks/injection/ActivityModule.java index 1593fd319..51611cc16 100644 --- a/app/src/main/java/org/tasks/injection/ActivityModule.java +++ b/app/src/main/java/org/tasks/injection/ActivityModule.java @@ -43,7 +43,7 @@ public class ActivityModule { @Provides @ActivityScope public ThemeColor getThemeColor(ColorProvider colorProvider, Preferences preferences) { - return colorProvider.getThemeColor(preferences.getInt(R.string.p_theme_color, 0), true); + return colorProvider.getThemeColor(preferences.getDefaultThemeColor(), true); } @Provides diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java index 4b830e6f6..4338bc124 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.java +++ b/app/src/main/java/org/tasks/preferences/Preferences.java @@ -38,6 +38,7 @@ import org.tasks.BuildConfig; import org.tasks.R; import org.tasks.billing.Purchase; import org.tasks.data.TaskAttachment; +import org.tasks.themes.ColorProvider; import org.tasks.themes.ThemeBase; import org.tasks.time.DateTime; import timber.log.Timber; @@ -546,4 +547,8 @@ public class Preferences { public void setAlreadyNotified(String account, String scope, boolean value) { setBoolean(context.getString(R.string.p_notified_oauth_error, account, scope), value); } + + public int getDefaultThemeColor() { + return getInt(R.string.p_theme_color, ColorProvider.BLUE); + } } diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt index 9b37778a1..b7db7f21f 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt @@ -311,7 +311,7 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange themeColor.primaryColor ) ?: themeColor.primaryColor - if (preferences.getInt(R.string.p_theme_color, -1) != color) { + if (preferences.defaultThemeColor != color) { preferences.setInt(R.string.p_theme_color, color) recreate() } diff --git a/app/src/main/java/org/tasks/themes/ColorProvider.kt b/app/src/main/java/org/tasks/themes/ColorProvider.kt index 6999c7594..b93d14df9 100644 --- a/app/src/main/java/org/tasks/themes/ColorProvider.kt +++ b/app/src/main/java/org/tasks/themes/ColorProvider.kt @@ -11,9 +11,9 @@ import javax.inject.Inject class ColorProvider @Inject constructor(@ForActivity private val context: Context, preferences: Preferences) { companion object { + const val BLUE = -14575885 private const val RED = -769226 private const val AMBER = -16121 - private const val BLUE = -14575885 private const val GREY = -6381922 private const val WHITE = -1 private const val BLACK = -16777216