changed accent color back to blue

Daniel Gultsch created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/utils/StylingHelper.java |  2 
src/main/java/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(-)

Detailed changes

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

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

src/main/res/values/colors.xml

@@ -20,10 +20,8 @@
 	<color name="red_a100">#ffff8a80</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
-	<color name="deep_purple_a100">#ffB388FF</color>
-	<color name="deep_purple_a200">#ff7C4DFF</color>
-	<color name="deep_purple_a400">#ff651FFF</color>
-	<color name="deep_purple_a700">#ff6200EA</color>
+	<color name="blue_a100">#ff82B1FF</color>
+	<color name="blue_a200">#ff448AFF</color>
 	<color name="green500">#ff4CAF50</color>
 	<color name="green600">#ff43A047</color>
 	<color name="green700">#ff388E3C</color>

src/main/res/values/themes.xml

@@ -4,7 +4,7 @@
     <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/green600</item>
         <item name="colorPrimaryDark">@color/green800</item>
-        <item name="colorAccent">@color/deep_purple_a200</item>
+        <item name="colorAccent">@color/blue_a200</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
 
         <item name="color_background_primary">@color/grey50</item>
@@ -19,7 +19,7 @@
         <item name="EmojiColor">@color/black</item>
 
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/deep_purple_a200</item>
+        <item name="android:actionModeBackground">@color/blue_a200</item>
 
         <item name="TextSizeCaption">12sp</item>
         <item name="TextSizeBody1">14sp</item>
@@ -99,7 +99,7 @@
     <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/green800</item>
         <item name="colorPrimaryDark">@color/green900</item>
-        <item name="colorAccent">@color/deep_purple_a100</item>
+        <item name="colorAccent">@color/blue_a100</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
 
         <item name="color_background_primary">@color/grey800</item>
@@ -114,7 +114,7 @@
         <item name="EmojiColor">@color/white</item>
 
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/deep_purple_a100</item>
+        <item name="android:actionModeBackground">@color/blue_a100</item>
 
         <item name="TextSizeCaption">12sp</item>
         <item name="TextSizeBody1">14sp</item>
@@ -253,7 +253,7 @@
     <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="colorPrimary">@color/green600</item>
         <item name="colorPrimaryDark">@color/green700</item>
-        <item name="colorAccent">@color/deep_purple_a200</item>
+        <item name="colorAccent">@color/blue_a200</item>
         <item name="color_background_primary">@color/grey50</item>
         <item name="divider">@color/black12</item>
         <item name="TextSizeBody2">14sp</item>
@@ -264,7 +264,7 @@
     <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog">
         <item name="colorPrimary">@color/green800</item>
         <item name="colorPrimaryDark">@color/green900</item>
-        <item name="colorAccent">@color/deep_purple_a100</item>
+        <item name="colorAccent">@color/blue_a100</item>
         <item name="color_background_primary">@color/grey800</item>
         <item name="divider">@color/white12</item>
         <item name="TextSizeBody2">14sp</item>