diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index c9b14ebdf..ad11602c8 100644
--- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -27,6 +27,8 @@ public abstract class InjectingPreferenceActivity extends PreferenceActivity imp
objectGraph = ((Injector) getApplication()).getObjectGraph().plus(new ActivityModule(this));
inject(this);
+ activityPreferences.applyThemeAndStatusBarColor();
+
super.onCreate(savedInstanceState);
ViewGroup root = (ViewGroup) findViewById(android.R.id.content);
@@ -46,8 +48,6 @@ public abstract class InjectingPreferenceActivity extends PreferenceActivity imp
finish();
}
});
-
- activityPreferences.applyLightStatusBarColor();
}
@Override
diff --git a/src/main/java/org/tasks/preferences/ActivityPreferences.java b/src/main/java/org/tasks/preferences/ActivityPreferences.java
index a252020eb..9d780787e 100644
--- a/src/main/java/org/tasks/preferences/ActivityPreferences.java
+++ b/src/main/java/org/tasks/preferences/ActivityPreferences.java
@@ -13,7 +13,6 @@ import org.tasks.R;
import javax.inject.Inject;
import javax.inject.Singleton;
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
@Singleton
@@ -40,7 +39,7 @@ public class ActivityPreferences extends Preferences {
}
public void applyTheme() {
- applyTheme(isDarkTheme() ? R.style.Tasks_Dark : R.style.Tasks);
+ applyTheme(isDarkTheme() ? R.style.TasksDark : R.style.Tasks);
}
public void applyStatusBarColor() {
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index 5ecff5ba9..0a0543c4e 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -5,6 +5,6 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/asAbBackgroundColor"
android:elevation="4dp"
- tasks:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+ tasks:popupTheme="?attr/popup_theme"
tasks:theme="@style/ActionBarThemeOverlay"
tasks:titleTextAppearance="@style/ActionBar.TitleText" />
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index 6561e04e2..01a84d7c9 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -1,9 +1,5 @@
-
diff --git a/src/main/res/values-v21/styles_dark.xml b/src/main/res/values-v21/styles_dark.xml
new file mode 100644
index 000000000..83c213694
--- /dev/null
+++ b/src/main/res/values-v21/styles_dark.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/values-v21/styles_light.xml b/src/main/res/values-v21/styles_light.xml
new file mode 100644
index 000000000..8d2305dc4
--- /dev/null
+++ b/src/main/res/values-v21/styles_light.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 13bea10a0..5bbe0e294 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -54,6 +54,7 @@
+
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index fab92a3d3..95e9812cf 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -2,114 +2,6 @@
-
-
-
-
-
-
@@ -124,22 +16,6 @@
- #3fff
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml
new file mode 100644
index 000000000..ad0d015a0
--- /dev/null
+++ b/src/main/res/values/styles_light.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file