From 7240e4562abf19a8c61869e5fe7dba08c2253d77 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 22 Aug 2020 11:00:54 +0200
Subject: [PATCH] Remove unused drawables since merge

---
 .../res/drawable/bg_search_edit_text_sc.xml   |  5 ---
 .../drawable/bg_unread_notification_sc.xml    |  9 -----
 .../bg_unread_notification_sc_light.xml       |  9 -----
 .../highlighted_message_background.xml        |  4 +--
 .../highlighted_message_background_sc.xml     | 35 -------------------
 .../drawable/vector_label_background_sc.xml   | 13 -------
 vector/src/main/res/values/theme_sc.xml       |  6 ++--
 7 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/bg_search_edit_text_sc.xml
 delete mode 100644 vector/src/main/res/drawable/bg_unread_notification_sc.xml
 delete mode 100644 vector/src/main/res/drawable/bg_unread_notification_sc_light.xml
 delete mode 100644 vector/src/main/res/drawable/highlighted_message_background_sc.xml
 delete mode 100644 vector/src/main/res/drawable/vector_label_background_sc.xml

diff --git a/vector/src/main/res/drawable/bg_search_edit_text_sc.xml b/vector/src/main/res/drawable/bg_search_edit_text_sc.xml
deleted file mode 100644
index 54dc7e0bd2..0000000000
--- a/vector/src/main/res/drawable/bg_search_edit_text_sc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/background_black_sc" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_sc.xml b/vector/src/main/res/drawable/bg_unread_notification_sc.xml
deleted file mode 100644
index 8a37aa5e11..0000000000
--- a/vector/src/main/res/drawable/bg_unread_notification_sc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="40dp" />
-
-    <solid android:color="@color/accent_sc" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml b/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml
deleted file mode 100644
index 8a37aa5e11..0000000000
--- a/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="40dp" />
-
-    <solid android:color="@color/accent_sc" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/highlighted_message_background.xml b/vector/src/main/res/drawable/highlighted_message_background.xml
index 5975ff06b3..3d771c12fa 100644
--- a/vector/src/main/res/drawable/highlighted_message_background.xml
+++ b/vector/src/main/res/drawable/highlighted_message_background.xml
@@ -17,7 +17,7 @@
                 <shape>
                     <size android:width="4dp" />
                     <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="@color/riotx_accent" />
+                    <solid android:color="?colorAccent" />
                 </shape>
             </item>
 
@@ -32,4 +32,4 @@
     </item>
 
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/vector/src/main/res/drawable/highlighted_message_background_sc.xml b/vector/src/main/res/drawable/highlighted_message_background_sc.xml
deleted file mode 100644
index 0e2955acea..0000000000
--- a/vector/src/main/res/drawable/highlighted_message_background_sc.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-
-        <layer-list>
-
-            <!-- Draw the BG. -->
-            <item android:left="6dp" android:right="2dp">
-                <shape>
-                    <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="?riotx_background" />
-                </shape>
-            </item>
-
-            <item android:gravity="start" android:left="2dp">
-                <shape>
-                    <size android:width="4dp" />
-                    <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="?colorAccent" />
-                </shape>
-            </item>
-
-        </layer-list>
-
-    </item>
-
-    <item android:state_checked="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-
-</selector>
diff --git a/vector/src/main/res/drawable/vector_label_background_sc.xml b/vector/src/main/res/drawable/vector_label_background_sc.xml
deleted file mode 100644
index aecd01d7b5..0000000000
--- a/vector/src/main/res/drawable/vector_label_background_sc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="3dp" />
-
-    <solid android:color="@color/background_black_sc" />
-
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/black" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index 5a2e406203..c3668fb7ad 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -22,10 +22,11 @@
         <item name="riotx_unread_room_indent">@color/background_dark_sc</item>
         <item name="riotx_android_status_bar">@color/background_black_sc</item>
         <item name="riotx_line_break_mobile">@color/text_color_disabled_sc</item>
-        <item name="riotx_unread_room_badge">@color/background_floating_sc</item>
+        <item name="riotx_unread_room_badge">?colorAccent</item>
         <item name="riotx_fab_secondary_bg">@color/background_floating_sc</item>
         <item name="riotx_fab_secondary_color">@color/text_color_secondary_sc</item>
         <item name="riotx_fab_label_bg">@color/background_floating_sc</item>
+        <item name="riotx_fab_label_stroke">@color/black</item>
         <item name="riotx_fab_label_color">#ff808080</item><!-- TODO: this is used on light background for motion_fab_menu_merge / style:VectorLabel -->
         <item name="riotx_touch_guard_bg">@color/background_black_sc</item>
         <item name="riotx_attachment_selector_background">?riotx_background</item>
@@ -35,9 +36,6 @@
 
         <item name="riotx_bottom_nav_icon_color">#ff808080</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_sc</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorPrimaryVariant">@color/background_dark_sc</item>