From c5e225104863d700224b42df374cb614245945c7 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 3 May 2020 22:21:16 +0300
Subject: [PATCH] rename ic_clear_black_24dp.xml to avoid clash with a private
 SDK resource

---
 .../ktnx/mobileledger/ui/AutoCompleteTextViewWithClear.java  | 2 +-
 .../java/net/ktnx/mobileledger/ui/EditTextWithClear.java     | 2 +-
 .../java/net/ktnx/mobileledger/ui/TextViewClearHelper.java   | 2 +-
 .../{ic_clear_black_24dp.xml => ic_clear_accent_24dp.xml}    | 0
 app/src/main/res/layout/nav_profile_list_head.xml            | 5 +++--
 app/src/main/res/layout/transaction_list_fragment.xml        | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename app/src/main/res/drawable-anydpi-v21/{ic_clear_black_24dp.xml => ic_clear_accent_24dp.xml} (100%)

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/AutoCompleteTextViewWithClear.java b/app/src/main/java/net/ktnx/mobileledger/ui/AutoCompleteTextViewWithClear.java
index 8b73de1d..78e62d4c 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/AutoCompleteTextViewWithClear.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/AutoCompleteTextViewWithClear.java
@@ -57,7 +57,7 @@ public final class AutoCompleteTextViewWithClear extends AppCompatAutoCompleteTe
         setCompoundDrawablesRelative(null, null, null, null);
     }
     private void showClearDrawable() {
-        setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_black_24dp, 0);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_accent_24dp, 0);
     }
     @Override
     protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/EditTextWithClear.java b/app/src/main/java/net/ktnx/mobileledger/ui/EditTextWithClear.java
index 56d132fd..e39f7454 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/EditTextWithClear.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/EditTextWithClear.java
@@ -57,7 +57,7 @@ public final class EditTextWithClear extends androidx.appcompat.widget.AppCompat
         setCompoundDrawablesRelative(null, null, null, null);
     }
     private void showClearDrawable() {
-        setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_black_24dp, 0);
+        setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_accent_24dp, 0);
     }
     @Override
     protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/TextViewClearHelper.java b/app/src/main/java/net/ktnx/mobileledger/ui/TextViewClearHelper.java
index 3060ebaf..e6e7793b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/TextViewClearHelper.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/TextViewClearHelper.java
@@ -98,7 +98,7 @@ public class TextViewClearHelper {
         view.setCompoundDrawablesRelative(null, null, null, null);
     }
     private void showClearDrawable() {
-        view.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_black_24dp,
+        view.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_clear_accent_24dp,
                 0);
     }
     public boolean onTouchEvent(EditText view, MotionEvent event) {
diff --git a/app/src/main/res/drawable-anydpi-v21/ic_clear_black_24dp.xml b/app/src/main/res/drawable-anydpi-v21/ic_clear_accent_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v21/ic_clear_black_24dp.xml
rename to app/src/main/res/drawable-anydpi-v21/ic_clear_accent_24dp.xml
diff --git a/app/src/main/res/layout/nav_profile_list_head.xml b/app/src/main/res/layout/nav_profile_list_head.xml
index 97550331..3e1234a3 100644
--- a/app/src/main/res/layout/nav_profile_list_head.xml
+++ b/app/src/main/res/layout/nav_profile_list_head.xml
@@ -34,7 +34,8 @@
         app:layout_constraintEnd_toStartOf="@id/nav_profile_list_head_buttons"
         app:layout_constraintStart_toEndOf="@id/nav_profiles_label"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_add_circle_white_24dp" />
+        app:srcCompat="@drawable/ic_add_circle_white_24dp"
+        android:contentDescription="@string/icon" />
 
     <LinearLayout
         android:id="@+id/nav_profile_list_head_buttons"
@@ -52,7 +53,7 @@
             android:id="@+id/nav_profiles_cancel_edit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/ic_clear_black_24dp"
+            android:background="@drawable/ic_clear_accent_24dp"
             android:gravity="end|center_vertical"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
diff --git a/app/src/main/res/layout/transaction_list_fragment.xml b/app/src/main/res/layout/transaction_list_fragment.xml
index 115a8a37..680e8f74 100644
--- a/app/src/main/res/layout/transaction_list_fragment.xml
+++ b/app/src/main/res/layout/transaction_list_fragment.xml
@@ -51,7 +51,7 @@
             android:id="@+id/clearAccountNameFilter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/ic_clear_black_24dp"
+            android:background="@drawable/ic_clear_accent_24dp"
             android:backgroundTint="?colorAccent"
             android:clickable="true"
             android:focusable="true" />
-- 
2.39.2