Fix default theme color

pull/935/head
Alex Baker 6 years ago
parent 8d4a00d459
commit 8f34cbf542

@ -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

@ -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);
}
}

@ -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()
}

@ -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

Loading…
Cancel
Save