From b5c60ee7792b08b945c75532c367249cc3d37dbe Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 30 Apr 2018 15:17:21 +0200 Subject: [PATCH] changed accent color back to blue --- .../eu/siacs/conversations/utils/StylingHelper.java | 2 +- .../eu/siacs/conversations/utils/ThemeHelper.java | 4 +--- src/main/res/values/colors.xml | 6 ++---- src/main/res/values/themes.xml | 12 ++++++------ 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java index 84eae1e41..06dfaef90 100644 --- a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java @@ -97,7 +97,7 @@ public class StylingHelper { int start = indexOfIgnoreCase(string, needle, 0); while (start != -1) { int end = start + length; - editable.setSpan(new BackgroundColorSpan(ContextCompat.getColor(context, dark ? R.color.deep_purple_a100 : R.color.deep_purple_a200)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); + editable.setSpan(new BackgroundColorSpan(ContextCompat.getColor(context, dark ? R.color.blue_a100 : R.color.blue_a200)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, dark ? R.color.black87 : R.color.white)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); start = indexOfIgnoreCase(string, needle, start + length); } diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java index 72998c729..32feb61b0 100644 --- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java @@ -37,11 +37,9 @@ import android.preference.PreferenceManager; import android.support.annotation.StyleRes; import android.support.design.widget.Snackbar; import android.support.v4.content.ContextCompat; -import android.util.Log; import android.util.TypedValue; import android.widget.TextView; -import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.ui.SettingsActivity; @@ -99,7 +97,7 @@ public class ThemeHelper { if (text != null && action != null) { text.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); action.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); - action.setTextColor(ContextCompat.getColor(context, R.color.deep_purple_a100)); + action.setTextColor(ContextCompat.getColor(context, R.color.blue_a100)); } } } diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 7842d6ae2..ebb8b824c 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -20,10 +20,8 @@ #ffff8a80 #ffc62828 #ffff9800 - #ffB388FF - #ff7C4DFF - #ff651FFF - #ff6200EA + #ff82B1FF + #ff448AFF #ff4CAF50 #ff43A047 #ff388E3C diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index e4fef7249..5215cd881 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -4,7 +4,7 @@