From acbd4c3aba145e8d7ab5b742ba9816f1da69b777 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 09:30:25 +0200
Subject: [PATCH] Lint: fixes UseCompatTextViewDrawableXml issues

---
 vector/lint.xml                                        |  1 +
 vector/src/main/res/layout/dialog_no_sticker_pack.xml  |  5 +++--
 .../res/layout/fragment_bootstrap_enter_passphrase.xml |  6 +++---
 .../res/layout/fragment_bootstrap_setup_recovery.xml   |  4 ++--
 vector/src/main/res/layout/fragment_ssss_reset_all.xml | 10 +++++-----
 .../res/layout/item_bottom_sheet_message_status.xml    |  5 +++--
 vector/src/main/res/layout/item_public_room.xml        |  6 +++---
 vector/src/main/res/layout/item_room_category.xml      |  5 +++--
 vector/src/main/res/layout/item_room_invitation.xml    |  4 ++--
 .../src/main/res/layout/item_timeline_event_create.xml |  5 +++--
 .../res/layout/item_timeline_event_merged_utd_stub.xml |  4 ++--
 .../res/layout/item_timeline_event_redacted_stub.xml   |  4 ++--
 .../layout/item_timeline_event_verification_stub.xml   |  5 +++--
 vector/src/main/res/layout/view_active_call_view.xml   |  4 ++--
 .../main/res/layout/view_active_conference_view.xml    |  4 ++--
 .../src/main/res/layout/view_jump_to_read_marker.xml   |  5 +++--
 16 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/vector/lint.xml b/vector/lint.xml
index bd49091a3f..4ac0f20e51 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -27,6 +27,7 @@
     <issue id="DisableBaselineAlignment" severity="error" />
     <issue id="ScrollViewSize" severity="error" />
     <issue id="NegativeMargin" severity="error" />
+    <issue id="UseCompatTextViewDrawableXml" severity="error" />
 
     <!-- RTL -->
     <issue id="RtlEnabled" severity="error" />
diff --git a/vector/src/main/res/layout/dialog_no_sticker_pack.xml b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
index 427916cd89..1cf225a30f 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:drawableBottom="@drawable/stickerpack_rabbit"
     android:drawablePadding="16dp"
     android:gravity="center_horizontal"
     android:maxWidth="300dp"
     android:paddingTop="16dp"
-    android:text="@string/no_sticker_application_dialog_content" />
+    android:text="@string/no_sticker_application_dialog_content"
+    app:drawableBottomCompat="@drawable/stickerpack_rabbit" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 41b6c9b48c..5984ba8b86 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -54,12 +54,12 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:drawableStart="@drawable/ic_alert_triangle"
             android:drawablePadding="4dp"
-            android:drawableTint="@color/riotx_destructive_accent"
             android:gravity="center_vertical"
             android:text="@string/bootstrap_dont_reuse_pwd"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            app:drawableStartCompat="@drawable/ic_alert_triangle"
+            app:drawableTint="@color/riotx_destructive_accent" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 14a4b45ded..5c4590dc40 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -83,8 +83,8 @@
         android:layout_marginEnd="16dp"
         android:text="@string/reset_secure_backup_warning"
         android:textColor="@color/riotx_destructive_accent"
-        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        app:drawableStartCompat="@drawable/ic_warning_badge" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index a3b2984bce..d64750eef3 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -16,16 +16,16 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:drawableStart="@drawable/ic_alert_triangle"
             android:drawablePadding="8dp"
-            android:drawableTint="?riot_primary_text_color"
             android:text="@string/secure_backup_reset_all"
             android:textColor="?riotx_text_primary"
             android:textSize="20sp"
             android:textStyle="bold"
             android:tint="?riot_primary_text_color"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:drawableTint="?riot_primary_text_color"
+            app:drawableStartCompat="@drawable/ic_alert_triangle" />
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
@@ -48,14 +48,14 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:drawableStart="@drawable/ic_smartphone"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:textSize="17sp"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_all_description"
             tools:text="Show 2 devices you can verify with now"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:drawableStartCompat="@drawable/ic_smartphone" />
 
         <TextView
             android:id="@+id/ssss_reset_text3"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 742fa69a7b..fcb373fa0d 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messageStatusInfo"
     android:layout_width="match_parent"
@@ -24,10 +25,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_weight="1"
-        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
         android:textColor="?riotx_text_secondary"
         android:textStyle="bold"
-        tools:text="@string/unable_to_send_message" />
+        tools:text="@string/unable_to_send_message"
+        app:drawableStartCompat="@drawable/ic_warning_badge" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index ae8287fdc4..bb9d379f31 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -65,9 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="8dp"
-        android:drawableStart="@drawable/ic_user"
         android:drawablePadding="8dp"
-        android:drawableTint="?riotx_text_secondary"
         android:gravity="center_vertical"
         android:minWidth="56dp"
         android:textColor="?riotx_text_secondary"
@@ -75,7 +73,9 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
         app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomTopic"
-        tools:text="148" />
+        tools:text="148"
+        app:drawableTint="?riotx_text_secondary"
+        app:drawableStartCompat="@drawable/ic_user" />
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index d27aea5bcf..3454d0119d 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/roomCategoryRootView"
     android:layout_width="match_parent"
@@ -21,14 +22,14 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         tools:drawableEnd="@drawable/ic_expand_more_white"
-        android:drawableTint="?riotx_text_secondary"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
         android:textStyle="bold"
-        tools:text="@string/room_participants_header_direct_chats" />
+        tools:text="@string/room_participants_header_direct_chats"
+        app:drawableTint="?riotx_text_secondary" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 92660634e0..82b30991c7 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -36,7 +36,6 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:drawableEnd="@drawable/ic_arrow_right"
         android:drawablePadding="8dp"
         android:duplicateParentState="true"
         android:ellipsize="end"
@@ -49,7 +48,8 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomInvitationAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/matrix.json/data/displayName"
+        app:drawableEndCompat="@drawable/ic_arrow_right" />
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 0fd63515d9..adc83066a7 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -12,11 +13,11 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/riotx_keys_backup_banner_accent_color"
-        android:drawableStart="@drawable/error"
         android:drawablePadding="16dp"
         android:gravity="center|start"
         android:minHeight="80dp"
         android:padding="16dp"
-        tools:text="This room is continuation…" />
+        tools:text="This room is continuation…"
+        app:drawableStartCompat="@drawable/error" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 3f0c269e90..538a8930c4 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -25,13 +25,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="8dp"
-            android:drawableStart="@drawable/ic_clock"
             android:drawablePadding="2dp"
             android:gravity="start"
             android:text="@string/notice_crypto_unable_to_decrypt_merged"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
-            app:drawableTint="?riotx_text_secondary" />
+            app:drawableTint="?riotx_text_secondary"
+            app:drawableStartCompat="@drawable/ic_clock" />
 
 
         <TextView
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index acc60e6590..2e7c29a0fb 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -2,10 +2,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_trash_16"
     android:drawablePadding="8dp"
     android:gravity="center_vertical"
     android:text="@string/event_redacted"
     android:textColor="?riotx_text_primary_body_contrast"
     android:textSize="14sp"
-    app:drawableTint="?riotx_text_primary_body_contrast" />
\ No newline at end of file
+    app:drawableTint="?riotx_text_primary_body_contrast"
+    app:drawableStartCompat="@drawable/ic_trash_16" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 41a5c37042..cdfbd0add2 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -11,13 +12,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:drawableStart="@drawable/ic_shield_black"
         android:drawablePadding="6dp"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@string/verification_request" />
+        tools:text="@string/verification_request"
+        app:drawableStartCompat="@drawable/ic_shield_black" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/view_active_call_view.xml b/vector/src/main/res/layout/view_active_call_view.xml
index 5634dcee8f..e8b21de7e8 100644
--- a/vector/src/main/res/layout/view_active_call_view.xml
+++ b/vector/src/main/res/layout/view_active_call_view.xml
@@ -14,7 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/ic_call"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -23,7 +22,8 @@
         android:paddingBottom="12dp"
         android:text="@string/active_call"
         android:textColor="@color/white"
-        app:drawableTint="@color/white" />
+        app:drawableTint="@color/white"
+        app:drawableStartCompat="@drawable/ic_call" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/returnToCallButton"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 66a47b728d..a618f36661 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
-        android:drawableStart="@drawable/ic_call"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -22,7 +21,8 @@
         android:textColor="@color/white"
         android:textColorLink="@color/white"
         app:drawableTint="@color/white"
-        tools:text="@string/ongoing_conference_call" />
+        tools:text="@string/ongoing_conference_call"
+        app:drawableStartCompat="@drawable/ic_call" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/deleteWidgetButton"
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 019480e6fe..06db3f7af7 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -12,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/closeJumpToReadMarkerView"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/arrow_up_circle"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -20,7 +20,8 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         android:text="@string/room_jump_to_first_unread"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        app:drawableStartCompat="@drawable/arrow_up_circle" />
 
     <ImageView
         android:id="@+id/closeJumpToReadMarkerView"