From b07f6f5066d34fa46455621b2a1c6e109a3cf62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Thu, 13 Oct 2022 14:50:12 +0200
Subject: [PATCH] Fix lint issues

---
 library/ui-styles/src/main/res/values/styles_edit_text.xml  | 2 +-
 vector/src/main/res/color/selector_rich_text_menu_icon.xml  | 6 +++---
 vector/src/main/res/layout/composer_rich_text_layout.xml    | 2 +-
 .../composer_rich_text_layout_constraint_set_compact.xml    | 2 +-
 .../composer_rich_text_layout_constraint_set_expanded.xml   | 2 +-
 vector/src/main/res/layout/view_rich_text_menu_button.xml   | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index 0a0b91fea29..922312a07ea 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -11,7 +11,7 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
-    <style name="Widget.Vector.EditText.Composer.RichText" parent="Widget.AppCompat.EditText">
+    <style name="Widget.Vector.EditText.Composer.RichTextComposer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">12</item>
diff --git a/vector/src/main/res/color/selector_rich_text_menu_icon.xml b/vector/src/main/res/color/selector_rich_text_menu_icon.xml
index e1c7d26f185..0d8789d6c55 100644
--- a/vector/src/main/res/color/selector_rich_text_menu_icon.xml
+++ b/vector/src/main/res/color/selector_rich_text_menu_icon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?attr/vctr_content_quinary" />
-    <item android:state_pressed="true" android:color="?attr/colorAccent" />
-    <item android:state_hovered="true" android:color="?attr/colorAccent" />
-    <item android:state_selected="true" android:color="?attr/colorAccent" />
+    <item android:state_pressed="true" android:color="?attr/colorSecondary" />
+    <item android:state_hovered="true" android:color="?attr/colorSecondary" />
+    <item android:state_selected="true" android:color="?attr/colorSecondary" />
     <item android:color="?attr/vctr_content_tertiary" />
 </selector>
diff --git a/vector/src/main/res/layout/composer_rich_text_layout.xml b/vector/src/main/res/layout/composer_rich_text_layout.xml
index af52df422b6..dd503545b26 100644
--- a/vector/src/main/res/layout/composer_rich_text_layout.xml
+++ b/vector/src/main/res/layout/composer_rich_text_layout.xml
@@ -105,7 +105,7 @@
 
     <io.element.android.wysiwyg.EditorEditText
         android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer.RichText"
+        style="@style/Widget.Vector.EditText.Composer.RichTextComposer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
index 008e4396f6a..43834a9aaaa 100644
--- a/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml
@@ -136,7 +136,7 @@
 
     <io.element.android.wysiwyg.EditorEditText
         android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer.RichText"
+        style="@style/Widget.Vector.EditText.Composer.RichTextComposer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/room_message_placeholder"
diff --git a/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
index 773968c5f53..3bd282fbebc 100644
--- a/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
@@ -150,7 +150,7 @@
 
     <io.element.android.wysiwyg.EditorEditText
         android:id="@+id/composerEditText"
-        style="@style/Widget.Vector.EditText.Composer.RichText"
+        style="@style/Widget.Vector.EditText.Composer.RichTextComposer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/room_message_placeholder"
diff --git a/vector/src/main/res/layout/view_rich_text_menu_button.xml b/vector/src/main/res/layout/view_rich_text_menu_button.xml
index 2cdeaec18de..f1fc43cbfbd 100644
--- a/vector/src/main/res/layout/view_rich_text_menu_button.xml
+++ b/vector/src/main/res/layout/view_rich_text_menu_button.xml
@@ -6,9 +6,8 @@
     android:layout_height="48dp"
     android:layout_marginHorizontal="2dp"
     android:background="@drawable/bg_rich_text_menu_button"
-    android:contentDescription="@string/rich_text_editor_format_bold"
     app:tint="@color/selector_rich_text_menu_icon"
+    tools:contentDescription="@string/rich_text_editor_format_bold"
     tools:src="@drawable/ic_composer_bold">
-    <!-- The contentDescription attr is populated programmatically. This is just to fix lint issues. -->
 
 </ImageButton>