From 2919429c99ca0795988bec9c66a81f246192b17a Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Thu, 8 Nov 2018 18:48:23 +0100
Subject: use material colors

---
 .../messenger/ui/adapter/MessageAdapter.java       | 10 ++-
 src/main/res/drawable/infocard_border.xml          |  4 --
 .../res/drawable/message_bubble_received_light.xml |  3 -
 .../drawable/message_bubble_received_warning.xml   |  3 -
 src/main/res/drawable/message_bubble_sent.xml      |  3 -
 src/main/res/values/colors.xml                     | 74 +++++++++++-----------
 6 files changed, 46 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index ce2ce2258..dd24c440d 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -211,6 +211,14 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         }
     }
 
+    private int getWarningTextColor(boolean onDark) {
+        if (onDark) {
+            return ContextCompat.getColor(activity, R.color.white70);
+        } else {
+            return ContextCompat.getColor(activity, R.color.black26);
+        }
+    }
+
     private void displayStatus(ViewHolder viewHolder, final Message message, int type, boolean darkBackground) {
         String filesize = null;
         String info = null;
@@ -965,7 +973,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             } else {
                 viewHolder.message_box.setBackgroundResource(darkBackground ? R.drawable.message_bubble_received_warning_dark: R.drawable.message_bubble_received_warning);
                 viewHolder.encryption.setVisibility(View.VISIBLE);
-                viewHolder.encryption.setTextColor(activity.getWarningTextColor());
+                viewHolder.encryption.setTextColor(this.getWarningTextColor(darkBackground));
                 if (omemoEncryption && !message.isTrusted()) {
                     viewHolder.encryption.setText(R.string.not_trusted);
                 } else {
diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml
index ff3ec366a..61ddb5fc1 100644
--- a/src/main/res/drawable/infocard_border.xml
+++ b/src/main/res/drawable/infocard_border.xml
@@ -5,10 +5,6 @@
 
     <corners android:radius="5dp" />
 
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/black12"></stroke>
-
     <padding
         android:bottom="0dp"
         android:left="0dp"
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 0361d848c..c1a8b456b 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -10,8 +10,5 @@
         android:left="6dp"
         android:right="6dp"
         android:top="2dp" />
-    <stroke
-        android:width="1.5dp"
-        android:color="@color/black12" />
     <solid android:color="@color/lightwhite" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index 6989c328a..cd47cf948 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -10,8 +10,5 @@
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
-    <stroke
-        android:width="1.5dp"
-        android:color="@color/black12" />
     <solid android:color="@color/lightred" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml
index 7908e72e4..677c1fe43 100644
--- a/src/main/res/drawable/message_bubble_sent.xml
+++ b/src/main/res/drawable/message_bubble_sent.xml
@@ -10,8 +10,5 @@
         android:left="6dp"
         android:right="6dp"
         android:top="4dp" />
-    <stroke
-        android:width="1.5dp"
-        android:color="@color/black12" />
     <solid android:color="@color/lightblue" />
 </shape>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 8dfec1519..936c5b36c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="realgreen">#ff259b24</color>
-    <color name="primary">#ff2e4272</color>
-    <color name="primary_dark">#ff08183e</color>
-    <color name="accent">#ff0091ea</color>
+    <color name="realgreen">#388e3c</color>  <!-- green 700 -->
+    <color name="primary">#0D47A1</color>  <!-- blue 900 -->
+    <color name="primary_dark">#1A237E</color>  <!-- indigo 900 -->
+    <color name="accent">#ff0091ea</color> <!-- light blue accent -->
     <color name="black87">#de000309</color>
     <color name="black54">#8a000309</color>
     <color name="black26">#42000000</color>
     <color name="black12">#1f000000</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="realblack">#ff000000</color>
+    <color name="deep_purple_a100">#ffB388FF</color> <!-- deep purple accent 100 -->
+    <color name="deep_purple_a200">#ff7C4DFF</color> <!-- deep purple accent 200 -->
+    <color name="deep_purple_a400">#ff651FFF</color> <!-- deep purple accent 400 -->
+    <color name="deep_purple_a700">#ff6200EA</color> <!-- deep purple accent 700 -->
+    <color name="realblack">#ff000000</color> <!-- black -->
     <color name="white">#ffe2e7f1</color>
     <color name="white12">#1fffffff</color>
     <color name="white70">#b2e2e7f1</color>
     <color name="white87">#deffffff</color>
-    <color name="green500">#ff4CAF50</color>
-    <color name="grey50">#fafafa</color>
-    <color name="grey200">#ffeeeeee</color>
-    <color name="grey300">#ffe0e0e0</color>
-    <color name="grey500">#ff9e9e9e</color>
-    <color name="grey700">#ff616161</color>
-    <color name="grey800">#ff424242</color>
-    <color name="grey900">#ff282828</color>
-    <color name="red800">#ffc62828</color>
-    <color name="red500">#fff44336</color>
-    <color name="red700">#ffd50000</color>
-    <color name="orange500">#ffff9800</color>
-    <color name="bubble">#ff2e4272</color>
-    <color name="realwhite">#ffffffff</color>
+    <color name="green500">#ff4CAF50</color>  <!-- green 500 -->
+    <color name="grey50">#fafafa</color>  <!-- grey 50 -->
+    <color name="grey200">#ffeeeeee</color>  <!-- grey 200 -->
+    <color name="grey300">#ffe0e0e0</color>  <!-- grey 300 -->
+    <color name="grey500">#ff9e9e9e</color>  <!-- grey 500 -->
+    <color name="grey700">#ff616161</color> <!-- grey 700 -->
+    <color name="grey800">#ff424242</color> <!-- grey 800 -->
+    <color name="grey900">#212121</color> <!-- grey 900 -->
+    <color name="red800">#ffc62828</color>  <!-- red 800 -->
+    <color name="red500">#fff44336</color>  <!-- red 500 -->
+    <color name="red700">#d32f2f</color> <!-- red 700 -->
+    <color name="orange500">#ffff9800</color> <!-- orange 500 -->
+    <color name="bubble">#37474f</color> <!-- blue grey 800 -->
+    <color name="realwhite">#ffffffff</color> <!-- white -->
 
     <!-- bubbles -->
-    <color name="lightwhite">#fffafbfd</color>
-    <color name="darkwhite">#ff424242</color>
-    <color name="lightblue">#ffd7deee</color>
-    <color name="darkblue">#ff2e4272</color>
-    <color name="lightred">#fff5d9d9</color>
-    <color name="darkred">#ff521010</color>
-    <color name="lightgreen">#ffcaf2ca</color>
-    <color name="darkgreen">#ff165d15</color>
+    <color name="lightwhite">#fafafa</color> <!-- green 50 -->
+    <color name="lightblue">#bbdefb</color> <!-- blue 100 -->
+    <color name="lightred">#ffcdd2</color> <!-- red 100 -->
+    <color name="lightgreen">#c8e6c9</color> <!-- green 100 -->
+    <color name="darkwhite">#ff424242</color> <!-- grey 800 -->
+    <color name="darkblue">#37474f</color> <!-- blue grey 800 -->
+    <color name="darkred">#b71c1c</color>  <!-- red 900 -->
+    <color name="darkgreen">#1b5e20</color>  <!-- green 900 -->
 
-    <color name="online">#ff259b24</color>
-    <color name="away">#ffff9800</color>
-    <color name="notavailable">#fff44336</color>
-    <color name="warning_button">#fff5d9d9</color>
-    <color name="warning_button_dark">#ff521010</color>
+    <color name="online">#388e3c</color> <!-- green 700 -->
+    <color name="away">#ffff9800</color> <!-- orange 500 -->
+    <color name="notavailable">#fff44336</color> <!-- red 500 -->
+    <color name="warning_button">#ffcdd2</color>  <!-- red 100 -->
+    <color name="warning_button_dark">#C62828</color> <!-- red 800 -->
 
     <!-- scanner -->
-    <color name="scan_result_dots">#c04CAF50</color>
+    <color name="scan_result_dots">#4caf50</color>  <!-- green 500 -->
 </resources>
-- 
cgit v1.2.3