archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch colorPrimaryDark with colorPrimaryVariant

Browse Source
pull/848/head
Alex Baker 6 years ago
parent 7bab3b87d0
commit 309377ee31
24 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/tasks/themes/ThemeCache.java
Unescape Escape View File

@ -67,7 +67,7 @@ public class ThemeCache {
colorNames[i], colorNames[i],
i, i,
resolveAttribute(theme, R.attr.colorPrimary), resolveAttribute(theme, R.attr.colorPrimary),
resolveAttribute(theme, R.attr.colorPrimaryDark), resolveAttribute(theme, R.attr.colorPrimaryVariant),
resolveAttribute(theme, R.attr.actionBarPrimaryText), resolveAttribute(theme, R.attr.actionBarPrimaryText),
resolveBoolean(theme, R.attr.dark_status_bar))); resolveBoolean(theme, R.attr.dark_status_bar)));
} }

18
app/src/main/java/org/tasks/themes/ThemeColor.java
Unescape Escape View File

@ -109,14 +109,14 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
private final int actionBarTint; private final int actionBarTint;
private final int style; private final int style;
private final int colorPrimary; private final int colorPrimary;
private final int colorPrimaryDark; private final int colorPrimaryVariant;
private final boolean isDark; private final boolean isDark;
public ThemeColor( public ThemeColor(
String name, String name,
int index, int index,
int colorPrimary, int colorPrimary,
int colorPrimaryDark, int colorPrimaryVariant,
int actionBarTint, int actionBarTint,
boolean isDark) { boolean isDark) {
this.name = name; this.name = name;
@ -124,7 +124,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
this.actionBarTint = actionBarTint; this.actionBarTint = actionBarTint;
this.style = COLORS[index]; this.style = COLORS[index];
this.colorPrimary = colorPrimary; this.colorPrimary = colorPrimary;
this.colorPrimaryDark = colorPrimaryDark; this.colorPrimaryVariant = colorPrimaryVariant;
this.isDark = isDark; this.isDark = isDark;
} }
@ -134,7 +134,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
actionBarTint = source.readInt(); actionBarTint = source.readInt();
style = source.readInt(); style = source.readInt();
colorPrimary = source.readInt(); colorPrimary = source.readInt();
colorPrimaryDark = source.readInt(); colorPrimaryVariant = source.readInt();
isDark = source.readInt() == 1; isDark = source.readInt() == 1;
} }
@ -148,13 +148,13 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
public void setStatusBarColor(Activity activity) { public void setStatusBarColor(Activity activity) {
if (atLeastLollipop()) { if (atLeastLollipop()) {
activity.getWindow().setStatusBarColor(getColorPrimaryDark()); activity.getWindow().setStatusBarColor(getColorPrimaryVariant());
} }
} }
public void applyToStatusBar(DrawerLayout drawerLayout) { public void applyToStatusBar(DrawerLayout drawerLayout) {
if (atLeastLollipop()) { if (atLeastLollipop()) {
drawerLayout.setStatusBarBackgroundColor(getColorPrimaryDark()); drawerLayout.setStatusBarBackgroundColor(getColorPrimaryVariant());
} }
if (atLeastMarshmallow()) { if (atLeastMarshmallow()) {
int systemUiVisibility = applyLightStatusBarFlag(drawerLayout.getSystemUiVisibility()); int systemUiVisibility = applyLightStatusBarFlag(drawerLayout.getSystemUiVisibility());
@ -242,8 +242,8 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
return actionBarTint; return actionBarTint;
} }
private int getColorPrimaryDark() { private int getColorPrimaryVariant() {
return colorPrimaryDark; return colorPrimaryVariant;
} }
public void apply(Toolbar toolbar) { public void apply(Toolbar toolbar) {
@ -263,7 +263,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
dest.writeInt(actionBarTint); dest.writeInt(actionBarTint);
dest.writeInt(style); dest.writeInt(style);
dest.writeInt(colorPrimary); dest.writeInt(colorPrimary);
dest.writeInt(colorPrimaryDark); dest.writeInt(colorPrimaryVariant);
dest.writeInt(isDark ? 1 : 0); dest.writeInt(isDark ? 1 : 0);
} }
} }

2
app/src/main/res/layout/activity_location_picker.xml
Unescape Escape View File

@ -21,7 +21,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:contentScrim="?attr/colorPrimary" app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:statusBarScrim="?attr/colorPrimaryDark" app:statusBarScrim="?attr/colorPrimaryVariant"
app:titleEnabled="false"> app:titleEnabled="false">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

2
app/src/main/res/values/theme_amber.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Amber" parent="BlackToolbarTheme"> <style name="Amber" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/amber_500</item> <item name="colorPrimary">@color/amber_500</item>
<item name="colorPrimaryDark">@color/amber_700</item> <item name="colorPrimaryVariant">@color/amber_700</item>
</style> </style>
<style name="AmberAccent" parent="BlackTint"> <style name="AmberAccent" parent="BlackTint">

2
app/src/main/res/values/theme_blue.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Blue" parent="WhiteToolbarTheme"> <style name="Blue" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/blue_500</item> <item name="colorPrimary">@color/blue_500</item>
<item name="colorPrimaryDark">@color/blue_700</item> <item name="colorPrimaryVariant">@color/blue_700</item>
</style> </style>
<style name="BlueAccent" parent="WhiteTint"> <style name="BlueAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_blue_grey.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="BlueGrey" parent="WhiteToolbarTheme"> <style name="BlueGrey" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/blue_grey_500</item> <item name="colorPrimary">@color/blue_grey_500</item>
<item name="colorPrimaryDark">@color/blue_grey_700</item> <item name="colorPrimaryVariant">@color/blue_grey_700</item>
</style> </style>
<style name="BlueGreyAccent" parent="WhiteTint"> <style name="BlueGreyAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_brown.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Brown" parent="WhiteToolbarTheme"> <style name="Brown" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/brown_500</item> <item name="colorPrimary">@color/brown_500</item>
<item name="colorPrimaryDark">@color/brown_700</item> <item name="colorPrimaryVariant">@color/brown_700</item>
</style> </style>
</resources> </resources>

2
app/src/main/res/values/theme_cyan.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Cyan" parent="BlackToolbarTheme"> <style name="Cyan" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/cyan_500</item> <item name="colorPrimary">@color/cyan_500</item>
<item name="colorPrimaryDark">@color/cyan_700</item> <item name="colorPrimaryVariant">@color/cyan_700</item>
</style> </style>
<style name="CyanAccent" parent="BlackTint"> <style name="CyanAccent" parent="BlackTint">

2
app/src/main/res/values/theme_dark_grey.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="DarkGrey" parent="WhiteToolbarTheme"> <style name="DarkGrey" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/grey_900</item> <item name="colorPrimary">@color/grey_900</item>
<item name="colorPrimaryDark">@color/grey_statusbar</item> <item name="colorPrimaryVariant">@color/grey_statusbar</item>
</style> </style>
</resources> </resources>

2
app/src/main/res/values/theme_deep_orange.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="DeepOrange" parent="WhiteToolbarTheme"> <style name="DeepOrange" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/deep_orange_500</item> <item name="colorPrimary">@color/deep_orange_500</item>
<item name="colorPrimaryDark">@color/deep_orange_700</item> <item name="colorPrimaryVariant">@color/deep_orange_700</item>
</style> </style>
<style name="DeepOrangeAccent" parent="WhiteTint"> <style name="DeepOrangeAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_deep_purple.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="DeepPurple" parent="WhiteToolbarTheme"> <style name="DeepPurple" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/deep_purple_500</item> <item name="colorPrimary">@color/deep_purple_500</item>
<item name="colorPrimaryDark">@color/deep_purple_700</item> <item name="colorPrimaryVariant">@color/deep_purple_700</item>
</style> </style>
<style name="DeepPurpleAccent" parent="WhiteTint"> <style name="DeepPurpleAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_green.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Green" parent="BlackToolbarTheme"> <style name="Green" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/green_500</item> <item name="colorPrimary">@color/green_500</item>
<item name="colorPrimaryDark">@color/green_700</item> <item name="colorPrimaryVariant">@color/green_700</item>
</style> </style>
<style name="GreenAccent" parent="BlackTint"> <style name="GreenAccent" parent="BlackTint">

2
app/src/main/res/values/theme_grey.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Grey" parent="BlackToolbarTheme"> <style name="Grey" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/grey_500</item> <item name="colorPrimary">@color/grey_500</item>
<item name="colorPrimaryDark">@color/grey_700</item> <item name="colorPrimaryVariant">@color/grey_700</item>
</style> </style>
</resources> </resources>

2
app/src/main/res/values/theme_indigo.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Indigo" parent="WhiteToolbarTheme"> <style name="Indigo" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/indigo_500</item> <item name="colorPrimary">@color/indigo_500</item>
<item name="colorPrimaryDark">@color/indigo_700</item> <item name="colorPrimaryVariant">@color/indigo_700</item>
</style> </style>
<style name="IndigoAccent" parent="WhiteTint"> <style name="IndigoAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_light_blue.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="LightBlue" parent="BlackToolbarTheme"> <style name="LightBlue" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/light_blue_500</item> <item name="colorPrimary">@color/light_blue_500</item>
<item name="colorPrimaryDark">@color/light_blue_700</item> <item name="colorPrimaryVariant">@color/light_blue_700</item>
</style> </style>
<style name="LightBlueAccent" parent="BlackTint"> <style name="LightBlueAccent" parent="BlackTint">

2
app/src/main/res/values/theme_light_green.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="LightGreen" parent="BlackToolbarTheme"> <style name="LightGreen" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/light_green_500</item> <item name="colorPrimary">@color/light_green_500</item>
<item name="colorPrimaryDark">@color/light_green_700</item> <item name="colorPrimaryVariant">@color/light_green_700</item>
</style> </style>
<style name="LightGreenAccent" parent="BlackTint"> <style name="LightGreenAccent" parent="BlackTint">

2
app/src/main/res/values/theme_lime.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Lime" parent="BlackToolbarTheme"> <style name="Lime" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/lime_500</item> <item name="colorPrimary">@color/lime_500</item>
<item name="colorPrimaryDark">@color/lime_700</item> <item name="colorPrimaryVariant">@color/lime_700</item>
</style> </style>
<style name="LimeAccent" parent="BlackTint"> <style name="LimeAccent" parent="BlackTint">

2
app/src/main/res/values/theme_orange.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Orange" parent="BlackToolbarTheme"> <style name="Orange" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/orange_500</item> <item name="colorPrimary">@color/orange_500</item>
<item name="colorPrimaryDark">@color/orange_700</item> <item name="colorPrimaryVariant">@color/orange_700</item>
</style> </style>
<style name="OrangeAccent" parent="BlackTint"> <style name="OrangeAccent" parent="BlackTint">

2
app/src/main/res/values/theme_pink.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Pink" parent="WhiteToolbarTheme"> <style name="Pink" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/pink_500</item> <item name="colorPrimary">@color/pink_500</item>
<item name="colorPrimaryDark">@color/pink_700</item> <item name="colorPrimaryVariant">@color/pink_700</item>
</style> </style>
<style name="PinkAccent" parent="WhiteTint"> <style name="PinkAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_purple.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Purple" parent="WhiteToolbarTheme"> <style name="Purple" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/purple_500</item> <item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryDark">@color/purple_700</item> <item name="colorPrimaryVariant">@color/purple_700</item>
</style> </style>
<style name="PurpleAccent" parent="WhiteTint"> <style name="PurpleAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_red.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Red" parent="WhiteToolbarTheme"> <style name="Red" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/red_500</item> <item name="colorPrimary">@color/red_500</item>
<item name="colorPrimaryDark">@color/red_700</item> <item name="colorPrimaryVariant">@color/red_700</item>
</style> </style>
<style name="RedAccent" parent="WhiteTint"> <style name="RedAccent" parent="WhiteTint">

2
app/src/main/res/values/theme_teal.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Teal" parent="WhiteToolbarTheme"> <style name="Teal" parent="WhiteToolbarTheme">
<item name="colorPrimary">@color/teal_500</item> <item name="colorPrimary">@color/teal_500</item>
<item name="colorPrimaryDark">@color/teal_700</item> <item name="colorPrimaryVariant">@color/teal_700</item>
</style> </style>
<style name="TealAccent" parent="BlackTint"> <style name="TealAccent" parent="BlackTint">

2
app/src/main/res/values/theme_white.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="White" parent="BlackToolbarTheme"> <style name="White" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/white_100</item> <item name="colorPrimary">@color/white_100</item>
<item name="colorPrimaryDark">@color/white_100</item> <item name="colorPrimaryVariant">@color/white_100</item>
</style> </style>
</resources> </resources>

2
app/src/main/res/values/theme_yellow.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<style name="Yellow" parent="BlackToolbarTheme"> <style name="Yellow" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/yellow_500</item> <item name="colorPrimary">@color/yellow_500</item>
<item name="colorPrimaryDark">@color/yellow_700</item> <item name="colorPrimaryVariant">@color/yellow_700</item>
</style> </style>
<style name="YellowAccent" parent="BlackTint"> <style name="YellowAccent" parent="BlackTint">

Write Preview
Loading…
Cancel
Save