introduce new orange theme color

5 files changed, 130 insertions, 5 deletions

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 8cb8025d2..4e2065d63 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -10,6 +10,14 @@
         <item>dark</item>
         <item>auto</item>
     </string-array>
+    <string-array name="themecolors">
+        <item>@string/pref_theme_blue</item>
+        <item>@string/pref_theme_orange</item>
+    </string-array>
+    <string-array name="themecolor_values">
+        <item>blue</item>
+        <item>orange</item>
+    </string-array>
 
     <string-array name="filesizes">
         <item>@string/never</item>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 3b9c7c3df..e8f3b0d79 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -3,6 +3,13 @@
     <color name="realgreen">#ff388e3c</color>  <!-- green 700 -->
     <color name="primary">#ff0D47A1</color>  <!-- blue 900 -->
     <color name="primary_dark">#ff1A237E</color>  <!-- indigo 900 -->
+
+    <color name="primary_orange">#ffe59400</color>
+    <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">#ff0091ea</color> <!-- light blue accent -->
     <color name="black">#ff000000</color>
     <color name="black87">#de000309</color>
@@ -32,12 +39,11 @@
     <color name="red500">#fff44336</color>  <!-- red 500 -->
     <color name="red700">#ffd50000</color> <!-- red 700 -->
     <color name="orange500">#ffff9800</color> <!-- orange 500 -->
-    <color name="bubble">#ff37474f</color> <!-- blue grey 800 -->
     <color name="realwhite">#ffffffff</color> <!-- white -->
 
     <!-- bubbles -->
-    <color name="lightwhite">#fafafa</color> <!-- green 50 -->
-    <color name="lightblue">#bbdefb</color> <!-- blue 100 -->
+    <color name="lightwhite">#fffafafa</color> <!-- green 50 -->
+    <color name="lightblue">#ffbbdefb</color> <!-- blue 100 -->
     <color name="lightred">#ffffcdd2</color> <!-- red 100 -->
     <color name="lightgreen">#ffc8e6c9</color> <!-- green 100 -->
     <color name="darkwhite">#ff424242</color> <!-- grey 800 -->
@@ -45,6 +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="darkorange">#ff4c3100</color>
+
     <color name="online">#ff388e3c</color> <!-- green 700 -->
     <color name="away">#ffff9800</color> <!-- orange 500 -->
     <color name="notavailable">#fff44336</color> <!-- red 500 -->
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 26d1179ae..64e8a648c 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -68,6 +68,7 @@
     <string name="quick_action">recent</string>
     <string name="omemo_setting_default">default_off</string>
     <string name="theme">auto</string>
+    <string name="theme_color">blue</string>
     <string name="default_font_size">small</string>
     <string name="default_channel_discovery">JABBER_NETWORK</string>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e0d3b9120..c525cdfc1 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -741,7 +741,7 @@
     <string name="pref_theme_light">Light theme</string>
     <string name="pref_theme_dark">Dark theme</string>
     <string name="pref_theme_auto">Automatic</string>
-    <string name="pref_theme_options_summary">Select the color palette</string>
+    <string name="pref_theme_options_summary">Select the theme brightness</string>
     <string name="pref_theme_options">Theme</string>
     <string name="chooce_account">Choose account</string>
     <string name="pref_font_size">Font Size</string>
@@ -989,4 +989,8 @@
     <string name="pref_notification_grace_period">Grace Period</string>
     <string name="pref_notification_grace_period_summary">The length of time notifications are silenced after detecting activity on one of your other devices.</string>
     <string name="ask_for_writeaccess">Please ask for write access</string>
+    <string name="pref_theme_blue">blue</string>
+    <string name="pref_theme_orange">orange</string>
+    <string name="pref_theme_color_options_summary">Select the theme color palette</string>
+    <string name="pref_theme_color_options">Theme color</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index cebd97038..de539df44 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -319,6 +319,21 @@
         <item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange" parent="ConversationsTheme">
+        <item name="colorPrimary">@color/primary_orange</item>
+        <item name="colorPrimaryDark">@color/primary_dark_orange</item>
+        <item name="colorAccent">@color/accent_orange</item>
+        <item name="colorControlNormal">@color/accent_orange</item>
+        <item name="colorControlActivated">@color/accent_orange</item>
+    </style>
+
+    <style name="ConversationsTheme.Orange.Dark" parent="ConversationsTheme.Dark">
+        <item name="colorPrimary">@color/primary_orange_dark</item>
+        <item name="colorPrimaryDark">@color/primary_dark_orange_dark</item>
+        <item name="colorAccent">@color/accent_orange</item>
+        <item name="colorControlNormal">@color/accent_orange</item>
+        <item name="colorControlActivated">@color/accent_orange</item>
+    </style>
 
     <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="colorPrimary">@color/primary</item>
@@ -332,6 +347,12 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dialog" parent="ConversationsTheme.Dialog">
+        <item name="colorPrimary">@color/primary_orange</item>
+        <item name="colorPrimaryDark">@color/primary_dark_orange</item>
+        <item name="colorAccent">@color/accent_orange</item>
+    </style>
+
     <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
@@ -343,26 +364,52 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dark.Dialog" parent="ConversationsTheme.Dark.Dialog">
+        <item name="colorPrimary">@color/primary_orange_dark</item>
+        <item name="colorPrimaryDark">@color/primary_dark_orange_dark</item>
+        <item name="colorAccent">@color/accent_orange</item>
+    </style>
+
     <style name="ConversationsTheme.Dialog.Medium" parent="ConversationsTheme.Dialog">
         <item name="TextSizeBody2">16sp</item>
         <item name="TextSizeDisplay2">51sp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dialog.Medium" parent="ConversationsTheme.Orange.Dialog">
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeDisplay2">51sp</item>
+    </style>
+
     <style name="ConversationsTheme.Dark.Dialog.Medium" parent="ConversationsTheme.Dark.Dialog">
         <item name="TextSizeBody2">16sp</item>
         <item name="TextSizeDisplay2">51sp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dark.Dialog.Medium" parent="ConversationsTheme.Orange.Dark.Dialog">
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeDisplay2">51sp</item>
+    </style>
+
     <style name="ConversationsTheme.Dialog.Large" parent="ConversationsTheme.Dialog">
         <item name="TextSizeBody2">18sp</item>
         <item name="TextSizeDisplay2">56sp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dialog.Large" parent="ConversationsTheme.Orange.Dialog">
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeDisplay2">56sp</item>
+    </style>
+
     <style name="ConversationsTheme.Dark.Dialog.Large" parent="ConversationsTheme.Dark.Dialog">
         <item name="TextSizeBody2">18sp</item>
         <item name="TextSizeTitle">56sp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Dark.Dialog.Large" parent="ConversationsTheme.Orange.Dark.Dialog">
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeTitle">56sp</item>
+    </style>
+
     <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
@@ -407,6 +454,48 @@
         <item name="TextSizeHeadline">20sp</item>
     </style>
 
+    <style name="ConversationsTheme.Orange.Medium" parent="ConversationsTheme.Orange">
+        <item name="TextSizeCaption">14sp</item>
+        <item name="TextSizeBody1">16sp</item>
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeSubhead">18sp</item>
+        <item name="TextSizeTitle">22sp</item>
+        <item name="TextSizeInput">18sp</item>
+        <item name="TextSeparation">6sp</item>
+        <item name="IconSize">20sp</item>
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Orange.Dark.Medium" parent="ConversationsTheme.Orange.Dark">
+        <item name="TextSizeCaption">14sp</item>
+        <item name="TextSizeBody1">16sp</item>
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeSubhead">18sp</item>
+        <item name="TextSizeTitle">22sp</item>
+        <item name="TextSizeInput">18sp</item>
+        <item name="TextSeparation">6sp</item>
+        <item name="IconSize">20sp</item>
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Large" parent="ConversationsTheme">
+        <item name="TextSizeCaption">16sp</item>
+        <item name="TextSizeBody1">18sp</item>
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeSubhead">20sp</item>
+        <item name="TextSizeTitle">24sp</item>
+        <item name="TextSizeInput">20sp</item>
+        <item name="TextSeparation">7sp</item>
+        <item name="IconSize">22sp</item>
+        <item name="TextSizeInfo">16sp</item>
+        <item name="TextSizeBody">18sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
     <style name="ConversationsTheme.Dark.Large" parent="ConversationsTheme.Dark">
         <item name="TextSizeCaption">16sp</item>
         <item name="TextSizeBody1">18sp</item>
@@ -421,7 +510,21 @@
         <item name="TextSizeHeadline">22sp</item>
     </style>
 
-    <style name="ConversationsTheme.Large" parent="ConversationsTheme">
+    <style name="ConversationsTheme.Orange.Large" parent="ConversationsTheme.Orange">
+        <item name="TextSizeCaption">16sp</item>
+        <item name="TextSizeBody1">18sp</item>
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeSubhead">20sp</item>
+        <item name="TextSizeTitle">24sp</item>
+        <item name="TextSizeInput">20sp</item>
+        <item name="TextSeparation">7sp</item>
+        <item name="IconSize">22sp</item>
+        <item name="TextSizeInfo">16sp</item>
+        <item name="TextSizeBody">18sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
+    <style name="ConversationsTheme.Orange.Dark.Large" parent="ConversationsTheme.Orange.Dark">
         <item name="TextSizeCaption">16sp</item>
         <item name="TextSizeBody1">18sp</item>
         <item name="TextSizeBody2">18sp</item>