From 31483a0aba5bda3210660073f56441ce37e7316c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 24 Feb 2020 13:40:11 -0600 Subject: [PATCH] Rename actionBarTint to colorOnPrimary --- .../java/org/tasks/tasklist/ActionUtils.java | 4 ++-- .../java/org/tasks/themes/ThemeCache.java | 11 ++-------- .../java/org/tasks/themes/ThemeColor.java | 22 +++++++++---------- .../main/java/org/tasks/ui/ChipProvider.java | 4 ++-- .../java/org/tasks/widget/TasksWidget.java | 6 ++--- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/tasks/tasklist/ActionUtils.java b/app/src/main/java/org/tasks/tasklist/ActionUtils.java index b5f42f3af..e9d27298f 100644 --- a/app/src/main/java/org/tasks/tasklist/ActionUtils.java +++ b/app/src/main/java/org/tasks/tasklist/ActionUtils.java @@ -45,12 +45,12 @@ public class ActionUtils { TextView title = contextView.findViewById(R.id.action_bar_title); if (title != null) { - title.setTextColor(themeColor.getActionBarTint()); + title.setTextColor(themeColor.getColorOnPrimary()); } ImageView closeButton = contextView.findViewById(R.id.action_mode_close_button); if (closeButton != null) { - closeButton.setColorFilter(themeColor.getActionBarTint()); + closeButton.setColorFilter(themeColor.getColorOnPrimary()); } } diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java index 1376cb001..32a448473 100644 --- a/app/src/main/java/org/tasks/themes/ThemeCache.java +++ b/app/src/main/java/org/tasks/themes/ThemeCache.java @@ -68,8 +68,7 @@ public class ThemeCache { colorNames[i], i, resolveAttribute(theme, R.attr.colorPrimary), - resolveAttribute(theme, R.attr.colorPrimaryVariant), - resolveAttribute(theme, R.attr.colorOnPrimary))); + resolveAttribute(theme, R.attr.colorPrimaryVariant))); } String[] accentNames = resources.getStringArray(R.array.accents); for (int i = 0; i < ThemeAccent.ACCENTS.length; i++) { @@ -87,13 +86,7 @@ public class ThemeCache { getColor(context, i == 0 ? R.color.black_54 : R.color.white_70))); } untaggedColor = - new ThemeColor( - context, - null, - 19, - getColor(context, R.color.tag_color_none_background), - 0, - getColor(context, R.color.black_87)); + new ThemeColor(context, null, 19, getColor(context, R.color.tag_color_none_background), 0); } private static int resolveAttribute(Resources.Theme theme, int attribute) { diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java index 2ec1acf60..11dd702c1 100644 --- a/app/src/main/java/org/tasks/themes/ThemeColor.java +++ b/app/src/main/java/org/tasks/themes/ThemeColor.java @@ -110,7 +110,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable { }; private final String name; private final int index; - private final int actionBarTint; + private final int colorOnPrimary; private final int style; private final int colorPrimary; private final int colorPrimaryVariant; @@ -121,24 +121,22 @@ public class ThemeColor implements ColorPickerDialog.Pickable { String name, int index, int colorPrimary, - int colorPrimaryVariant, - int actionBarTint) { + int colorPrimaryVariant) { this.name = name; this.index = index; - this.actionBarTint = actionBarTint; this.style = COLORS[index]; this.colorPrimary = colorPrimary; this.colorPrimaryVariant = colorPrimaryVariant; - double contrast = - ColorUtils.calculateContrast( - context.getResources().getColor(R.color.white_100), colorPrimary); + int whiteText = context.getResources().getColor(R.color.white_100); + double contrast = ColorUtils.calculateContrast(whiteText, colorPrimary); this.isDark = contrast < 3; + colorOnPrimary = isDark ? context.getResources().getColor(R.color.black_87) : whiteText; } private ThemeColor(Parcel source) { name = source.readString(); index = source.readInt(); - actionBarTint = source.readInt(); + colorOnPrimary = source.readInt(); style = source.readInt(); colorPrimary = source.readInt(); colorPrimaryVariant = source.readInt(); @@ -251,13 +249,13 @@ public class ThemeColor implements ColorPickerDialog.Pickable { return colorPrimary; } - public int getActionBarTint() { - return actionBarTint; + public int getColorOnPrimary() { + return colorOnPrimary; } public void apply(Toolbar toolbar) { toolbar.setBackgroundColor(getPrimaryColor()); - MenuColorizer.colorToolbar(toolbar, actionBarTint); + MenuColorizer.colorToolbar(toolbar, colorOnPrimary); } @Override @@ -269,7 +267,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable { public void writeToParcel(Parcel dest, int flags) { dest.writeString(name); dest.writeInt(index); - dest.writeInt(actionBarTint); + dest.writeInt(colorOnPrimary); dest.writeInt(style); dest.writeInt(colorPrimary); dest.writeInt(colorPrimaryVariant); diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java index de4b59b88..b165ffc68 100644 --- a/app/src/main/java/org/tasks/ui/ChipProvider.java +++ b/app/src/main/java/org/tasks/ui/ChipProvider.java @@ -197,8 +197,8 @@ public class ChipProvider { ThemeColor color = getColor(theme); chip.setText(name); chip.setCloseIconTint( - new ColorStateList(new int[][] {new int[] {}}, new int[] {color.getActionBarTint()})); - chip.setTextColor(color.getActionBarTint()); + new ColorStateList(new int[][] {new int[] {}}, new int[] {color.getColorOnPrimary()})); + chip.setTextColor(color.getColorOnPrimary()); chip.getChipDrawable().setAlpha(iconAlpha); chip.setChipBackgroundColor( new ColorStateList( diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java index b17257fbc..35b7c9e18 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.java +++ b/app/src/main/java/org/tasks/widget/TasksWidget.java @@ -84,9 +84,9 @@ public class TasksWidget extends InjectingAppWidgetProvider { remoteViews.setViewVisibility(R.id.widget_header, View.VISIBLE); remoteViews.setViewVisibility( R.id.widget_reconfigure, widgetPreferences.showSettings() ? View.VISIBLE : View.GONE); - remoteViews.setInt(R.id.widget_title, "setTextColor", color.getActionBarTint()); - remoteViews.setInt(R.id.widget_button, "setColorFilter", color.getActionBarTint()); - remoteViews.setInt(R.id.widget_reconfigure, "setColorFilter", color.getActionBarTint()); + remoteViews.setInt(R.id.widget_title, "setTextColor", color.getColorOnPrimary()); + remoteViews.setInt(R.id.widget_button, "setColorFilter", color.getColorOnPrimary()); + remoteViews.setInt(R.id.widget_reconfigure, "setColorFilter", color.getColorOnPrimary()); } else { remoteViews.setViewVisibility(R.id.widget_header, View.GONE); }