From 0bf459d385e7a2310ae64340271272698d0bc440 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Tue, 19 Sep 2023 17:42:20 +0200
Subject: [PATCH] refactor: Use "compat" drawables where appropriate (#72)

Use AppCompatResources.getDrawable() and app:drawableStartCompat.
Resolves existing lint issues.
---
 app/lint-baseline.xml                         | 66 -------------------
 app/src/main/java/app/pachli/MainActivity.kt  |  2 +-
 app/src/main/res/layout/activity_account.xml  |  2 +-
 .../res/layout/activity_tab_preference.xml    |  2 +-
 app/src/main/res/layout/item_follow.xml       |  2 +-
 app/src/main/res/layout/item_status.xml       |  2 +-
 app/src/main/res/layout/view_poll_preview.xml |  4 +-
 7 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 070c80dd2..37f4920ca 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -128,72 +128,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="UseCompatLoadingForDrawables"
-        message="Use `AppCompatResources.getDrawable()`"
-        errorLine1="                        return ctx.getDrawable(R.drawable.avatar_default)!!"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/app/pachli/MainActivity.kt"
-            line="546"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UseCompatTextViewDrawableXml"
-        message="Use `app:drawableStartCompat` instead of `android:drawableStart`"
-        errorLine1="                            android:drawableStart=&quot;@drawable/ic_briefcase&quot;"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_account.xml"
-            line="287"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UseCompatTextViewDrawableXml"
-        message="Use `app:drawableStartCompat` instead of `android:drawableStart`"
-        errorLine1="                android:drawableStart=&quot;@drawable/ic_plus_24dp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_tab_preference.xml"
-            line="60"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UseCompatTextViewDrawableXml"
-        message="Use `app:drawableStartCompat` instead of `android:drawableStart`"
-        errorLine1="        android:drawableStart=&quot;@drawable/ic_person_add_24dp&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/item_follow.xml"
-            line="17"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UseCompatTextViewDrawableXml"
-        message="Use `app:drawableStartCompat` instead of `android:drawableStart`"
-        errorLine1="        android:drawableStart=&quot;@drawable/ic_reblog_18dp&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/item_status.xml"
-            line="20"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UseCompatTextViewDrawableXml"
-        message="Use `app:drawableStartCompat` instead of `android:drawableStart`"
-        errorLine1="        android:drawableStart=&quot;@drawable/ic_poll_24dp&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/view_poll_preview.xml"
-            line="15"
-            column="9"/>
-    </issue>
-
     <issue
         id="MissingQuantity"
         message="For locale &quot;bn&quot; (Bangla) the following quantity should also be defined: `one` (e.g. &quot;সসে 1টি আপেল খেল, সেটা ভাল&quot;)"
diff --git a/app/src/main/java/app/pachli/MainActivity.kt b/app/src/main/java/app/pachli/MainActivity.kt
index c4b8af8ca..5f1e17cef 100644
--- a/app/src/main/java/app/pachli/MainActivity.kt
+++ b/app/src/main/java/app/pachli/MainActivity.kt
@@ -543,7 +543,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
                 override fun placeholder(ctx: Context, tag: String?): Drawable {
                     if (tag == DrawerImageLoader.Tags.PROFILE.name || tag == DrawerImageLoader.Tags.PROFILE_DRAWER_ITEM.name) {
-                        return ctx.getDrawable(R.drawable.avatar_default)!!
+                        return AppCompatResources.getDrawable(ctx, R.drawable.avatar_default)!!
                     }
 
                     return super.placeholder(ctx, tag)
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 13558d8a0..00483c192 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -284,7 +284,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
                             android:drawablePadding="6dp"
-                            android:drawableStart="@drawable/ic_briefcase"
+                            app:drawableStartCompat="@drawable/ic_briefcase"
                             android:textSize="?attr/status_text_medium"
                             android:textColor="?colorOnPrimaryContainer"
                             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_tab_preference.xml b/app/src/main/res/layout/activity_tab_preference.xml
index 0da36a227..b56e6e21f 100644
--- a/app/src/main/res/layout/activity_tab_preference.xml
+++ b/app/src/main/res/layout/activity_tab_preference.xml
@@ -57,7 +57,7 @@
                 android:layout_height="48dp"
                 android:layout_gravity="bottom"
                 android:background="?attr/colorPrimary"
-                android:drawableStart="@drawable/ic_plus_24dp"
+                app:drawableStartCompat="@drawable/ic_plus_24dp"
                 android:drawablePadding="12dp"
                 android:ellipsize="end"
                 android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml
index 959164f5c..a9f138f8b 100644
--- a/app/src/main/res/layout/item_follow.xml
+++ b/app/src/main/res/layout/item_follow.xml
@@ -14,7 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:drawableStart="@drawable/ic_person_add_24dp"
+        app:drawableStartCompat="@drawable/ic_person_add_24dp"
         android:drawablePadding="10dp"
         android:ellipsize="end"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index b54454b19..cbe122533 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -17,7 +17,7 @@
         android:layout_marginStart="14dp"
         android:layout_marginTop="@dimen/status_reblogged_bar_padding_top"
         android:layout_marginEnd="14dp"
-        android:drawableStart="@drawable/ic_reblog_18dp"
+        app:drawableStartCompat="@drawable/ic_reblog_18dp"
         android:drawablePadding="6dp"
         android:gravity="center_vertical"
         android:importantForAccessibility="no"
diff --git a/app/src/main/res/layout/view_poll_preview.xml b/app/src/main/res/layout/view_poll_preview.xml
index ba8c017e3..b1711c199 100644
--- a/app/src/main/res/layout/view_poll_preview.xml
+++ b/app/src/main/res/layout/view_poll_preview.xml
@@ -12,7 +12,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_poll_24dp"
+        app:drawableStartCompat="@drawable/ic_poll_24dp"
         android:drawablePadding="4dp"
         android:gravity="center_vertical"
         android:text="@string/create_poll_title"
@@ -34,4 +34,4 @@
         android:layout_marginTop="4dp"
         tools:text="5 Minutes" />
 
-</merge>
\ No newline at end of file
+</merge>