From 380d1b6acc103e1650c71d005cf30e4829a973af Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 24 Sep 2019 11:16:57 +0200
Subject: [PATCH] Further fixes to theming

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/src/main/res/layout/controller_chat.xml |  4 ++--
 app/src/main/res/values/colors.xml          | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index a85703c88..04ad6a86d 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -94,8 +94,8 @@
         app:outcomingBubblePaddingLeft="@dimen/message_bubble_corners_padding"
         app:outcomingBubblePaddingRight="@dimen/message_bubble_corners_padding"
         app:outcomingBubblePaddingTop="@dimen/message_bubble_corners_padding"
-        app:outcomingDefaultBubbleColor="@color/colorPrimary"
-        app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
+        app:outcomingDefaultBubbleColor="@color/bg_message_list_outcoming_bubble"
+        app:outcomingDefaultBubblePressedColor="@color/bg_message_list_outcoming_bubble"
         app:outcomingDefaultBubbleSelectedColor="@color/transparent"
         app:outcomingImageTimeTextSize="12sp"
         app:outcomingTextColor="@color/nc_outcoming_text_default"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 33bb1729c..9dfe8abc3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -55,22 +55,17 @@
 
     <color name="fg_default">#000000</color>
     <color name="fg_inverse">#FFFFFF</color>
-    <color name="fg_mention_you">#C98879</color>
-    <color name="fg_mention_others">#37505D</color>
-
-    <color name="fg_mention_you_dark">#C98879</color>
-    <color name="fg_mention_others_dark">#4c96bd</color>
 
     <color name="bg_default">#FFFFFF</color>
     <color name="bg_alt">@color/white60</color>
-    <color name="nc_chip_mention_you_background">@color/colorAccent</color>
-    <color name="nc_chip_mention_others_background">#6F6F6F</color>
+    <color name="nc_chip_mention_you_background">#0083C9</color>
+    <color name="nc_chip_mention_others_background">@color/white</color>
     <color name="bg_dark_mention_chips">#333333</color>
 
 
-    <color name="bg_message_list_incoming_bubble">#D5D5D5</color>
-    <color name="bg_message_list_outcoming_bubble">#003F62</color>
+    <color name="bg_message_list_incoming_bubble">#EFEFEF</color>
+    <color name="bg_message_list_outcoming_bubble">@color/colorPrimary</color>
 
-    <color name="nc_author_text">@color/colorPrimary</color>
+    <color name="nc_author_text">#65A7CA</color>
     <color name="bg_bottom_sheet">#46ffffff</color>
 </resources>