rework design colors and make it compatible with older ROMs

3 files changed, 17 insertions, 5 deletions

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index d51172093..16a35eb2b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -113,7 +113,7 @@
     <attr name="popupOverlayStyle" format="reference" />
 
     <attr name="color_bubble_light" format="reference|color" />
-    <attr name="color_bubble_blue" format="reference|color" />
+    <attr name="color_bubble_dark" format="reference|color" />
     <attr name="color_bubble_date" format="reference|color" />
     <attr name="color_bubble_warning" format="reference|color" />
 
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index e8f3b0d79..67ffc3423 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <color name="primary_dark_orange">#ffB27300</color>
     <color name="primary_orange_dark">#ffce8500</color>
     <color name="primary_dark_orange_dark">#ffa06700</color>
-    <color name="accent_orange">#ffffa500 </color>
+    <color name="accent_orange">#ffffa500</color>
 
     <color name="accent">#ff0091ea</color> <!-- light blue accent -->
     <color name="black">#ff000000</color>
@@ -51,7 +51,9 @@
     <color name="darkred">#ffb71c1c</color>  <!-- red 900 -->
     <color name="darkgreen">#ff1b5e20</color>  <!-- green 900 -->
 
-    <color name="lightorange">#fffff6e5</color> <!-- blue 100 -->
+    <color name="lightorange">#ffffb732</color>
+    <color name="lightorange2">#ffcc8400</color>
+    <color name="middleorange">#ff996300</color>
     <color name="darkorange">#ff4c3100</color>
 
     <color name="online">#ff388e3c</color> <!-- green 700 -->
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index de539df44..ea5230cef 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -26,7 +26,7 @@
         <item name="EmojiColor">@color/realblack</item>
 
         <item name="color_bubble_light">@color/lightwhite</item>
-        <item name="color_bubble_blue">@color/lightblue</item>
+        <item name="color_bubble_dark">@color/lightblue</item>
         <item name="color_bubble_date">@color/lightgreen</item>
         <item name="color_bubble_warning">@color/lightred</item>
 
@@ -185,7 +185,7 @@
         <item name="EmojiColor">@color/realwhite</item>
 
         <item name="color_bubble_light">@color/darkwhite</item>
-        <item name="color_bubble_blue">@color/darkblue</item>
+        <item name="color_bubble_dark">@color/darkblue</item>
         <item name="color_bubble_date">@color/darkgreen</item>
         <item name="color_bubble_warning">@color/darkred</item>
 
@@ -325,6 +325,11 @@
         <item name="colorAccent">@color/accent_orange</item>
         <item name="colorControlNormal">@color/accent_orange</item>
         <item name="colorControlActivated">@color/accent_orange</item>
+
+        <item name="color_bubble_light">@color/lightorange</item>
+        <item name="color_bubble_dark">@color/lightorange2</item>
+        <item name="color_bubble_date">@color/darkred</item>
+        <item name="color_bubble_warning">@color/darkgreen</item>
     </style>
 
     <style name="ConversationsTheme.Orange.Dark" parent="ConversationsTheme.Dark">
@@ -333,6 +338,11 @@
         <item name="colorAccent">@color/accent_orange</item>
         <item name="colorControlNormal">@color/accent_orange</item>
         <item name="colorControlActivated">@color/accent_orange</item>
+
+        <item name="color_bubble_light">@color/middleorange</item>
+        <item name="color_bubble_dark">@color/darkorange</item>
+        <item name="color_bubble_date">@color/darkred</item>
+        <item name="color_bubble_warning">@color/darkgreen</item>
     </style>
 
     <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">