From 332041e13b05f7e982eb43b0ab3fd96fdfff7a71 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@matrix.org>
Date: Thu, 2 Jul 2020 19:29:45 +0300
Subject: [PATCH] Move some of colors from attrs.xml to colors_riotx.xml

---
 .../features/widgets/webview/WidgetWebView.kt |  2 +-
 vector/src/main/res/layout/activity_login.xml |  2 +-
 .../src/main/res/layout/activity_progress.xml |  2 +-
 .../res/layout/activity_vector_settings.xml   |  2 +-
 ...constraint_set_composer_layout_compact.xml |  6 +++---
 ...onstraint_set_composer_layout_expanded.xml |  6 +++---
 .../main/res/layout/fragment_room_widget.xml  |  2 +-
 .../main/res/layout/merge_composer_layout.xml |  6 +++---
 .../res/layout/merge_overlay_waiting_view.xml |  2 +-
 vector/src/main/res/values/attrs.xml          |  6 ------
 vector/src/main/res/values/colors_riotx.xml   | 19 +++++++++++++++++++
 vector/src/main/res/values/theme_black.xml    |  4 ++--
 vector/src/main/res/values/theme_dark.xml     |  6 +++---
 vector/src/main/res/values/theme_light.xml    |  6 +++---
 vector/src/main/res/values/theme_status.xml   |  6 +++---
 15 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
index 6b5ade06c4..8fb1f63e65 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
@@ -32,7 +32,7 @@ import im.vector.riotx.features.webview.WebViewEventListener
 @SuppressLint("NewApi")
 fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
     // xml value seems ignored
-    setBackgroundColor(ThemeUtils.getColor(context, R.attr.vctr_bottom_nav_background_color))
+    setBackgroundColor(ThemeUtils.getColor(context, R.attr.riotx_bottom_nav_background_color))
 
     // clear caches
     clearHistory()
diff --git a/vector/src/main/res/layout/activity_login.xml b/vector/src/main/res/layout/activity_login.xml
index 0add6040a7..9b10f4f391 100644
--- a/vector/src/main/res/layout/activity_login.xml
+++ b/vector/src/main/res/layout/activity_login.xml
@@ -26,7 +26,7 @@
             android:id="@+id/loginTouchArea"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="?vctr_waiting_background_color"
+            android:background="?riotx_waiting_background_color"
             android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/activity_progress.xml b/vector/src/main/res/layout/activity_progress.xml
index 5942160525..fe5623f235 100644
--- a/vector/src/main/res/layout/activity_progress.xml
+++ b/vector/src/main/res/layout/activity_progress.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/vctr_waiting_background_color">
+    android:background="?attr/riotx_waiting_background_color">
 
     <ProgressBar
         android:layout_width="40dp"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index eaba9b33d3..395acd37a4 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -29,7 +29,7 @@
         android:id="@+id/vector_settings_spinner_views"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/vctr_waiting_background_color"
+        android:background="?attr/riotx_waiting_background_color"
         android:clickable="true"
         android:visibility="gone">
 
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index 4607f28f34..a2bf24551d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -13,7 +13,7 @@
         android:id="@+id/related_message_backround"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -32,7 +32,7 @@
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index 17b350542a..f72404339d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -13,7 +13,7 @@
         android:id="@+id/related_message_backround"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -21,7 +21,7 @@
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintEnd_toEndOf="@id/related_message_backround"
         app:layout_constraintStart_toStartOf="@+id/related_message_backround"
         app:layout_constraintTop_toTopOf="@id/related_message_backround" />
@@ -30,7 +30,7 @@
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintBottom_toBottomOf="@id/related_message_backround"
         app:layout_constraintEnd_toEndOf="@id/related_message_backround"
         app:layout_constraintStart_toStartOf="@+id/related_message_backround" />
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 4c1e5bb4a3..f336f6b6e9 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         android:orientation="horizontal"
         android:padding="16dp"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index b0c733c349..237d3956c3 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -15,21 +15,21 @@
         android:id="@+id/related_message_backround"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         tools:ignore="MissingConstraints" />
 
     <View
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         tools:ignore="MissingConstraints" />
 
     <View
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         tools:ignore="MissingConstraints" />
 
     <ImageView
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 3ee572cd71..10ae1a7ae2 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -9,7 +9,7 @@
         android:id="@+id/waiting_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?vctr_waiting_background_color"
+        android:background="?riotx_waiting_background_color"
         android:clickable="true"
         android:focusable="true"
         android:visibility="gone"
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 27d53fe90e..6b913f1903 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -3,12 +3,6 @@
 
     <declare-styleable name="VectorStyles">
 
-        <attr name="vctr_bottom_nav_background_color" format="color" />
-        <attr name="vctr_bottom_nav_background_border_color" format="color" />
-
-        <!-- waiting view background -->
-        <attr name="vctr_waiting_background_color" format="color" />
-
         <!-- application bar text color -->
         <attr name="vctr_toolbar_primary_text_color" format="color" />
         <attr name="vctr_toolbar_secondary_text_color" format="color" />
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index 348deb57bb..ce99b3a0b1 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -185,6 +185,25 @@
     <color name="riotx_room_active_widgets_banner_text_dark">#E3E8F0</color>
     <color name="riotx_room_active_widgets_banner_text_black">#E3E8F0</color>
 
+    <attr name="riotx_bottom_nav_background_color" format="color" />
+    <color name="riotx_bottom_nav_background_color_light">#FFF3F8FD</color>
+    <color name="riotx_bottom_nav_background_color_dark">@color/primary_color_dark</color>
+    <color name="riotx_bottom_nav_background_color_black">@color/primary_color_black</color>
+    <color name="riotx_bottom_nav_background_color_status">@color/riot_primary_background_color_status</color>
+
+    <attr name="riotx_bottom_nav_background_border_color" format="color" />
+    <color name="riotx_bottom_nav_background_border_color_light">##AAAAAAAA</color>
+    <color name="riotx_bottom_nav_background_border_color_dark">#55555555</color>
+    <color name="riotx_bottom_nav_background_border_color_black">#FF15171b</color>
+    <color name="riotx_bottom_nav_background_border_color_status">FFE9EDF1</color>
+
+    <attr name="riotx_waiting_background_color" format="color" />
+    <color name="riotx_waiting_background_color_light">#FFE9EDF1</color>
+    <color name="riotx_waiting_background_color_dark">#FF15171b</color>
+    <color name="riotx_waiting_background_color_status">#AAAAAAAA</color>
+
+
+
     <!-- (color from RiotWeb) -->
     <attr name="riotx_keys_backup_banner_accent_color" format="color" />
     <color name="riotx_keys_backup_banner_accent_color_light">#FFF8E3</color>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 33f04771c1..87d41b8da1 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -85,8 +85,8 @@
 
         <!-- activities background -->
         <item name="android:windowBackground">@color/riot_primary_background_color_black</item>
-        <item name="vctr_bottom_nav_background_color">@color/primary_color_black</item>
-        <item name="vctr_bottom_nav_background_border_color">#FF15171b</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_black</item>
 
         <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
     </style>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index b4002b409c..2cf29005a6 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -67,11 +67,11 @@
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
-        <item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
-        <item name="vctr_bottom_nav_background_border_color">#FF15171b</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_dark</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_dark</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#55555555</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_dark</item>
 
 
         <!-- application bar text color -->
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 3d6a338321..0bad238794 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -66,11 +66,11 @@
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
-        <item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
-        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_light</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_light</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#AAAAAAAA</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_light</item>
 
         <!-- application bar text color -->
         <!-- Base Text Primary-->
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 7607ce30e9..ed260ccfeb 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -21,12 +21,12 @@
 
         <!-- default background color -->
         <item name="android:colorBackground">@color/riot_primary_background_color_status</item>
-        <item name="vctr_bottom_nav_background_color">@color/riot_primary_background_color_status
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_status
         </item>
-        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_status</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#AAAAAAAA</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_status</item>
 
         <!-- application bar text color -->
         <item name="vctr_toolbar_primary_text_color">#FFFFFFFF</item>