rename ic_clear_black_24dp.xml to avoid clash with a private SDK resource

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 8b73de1d331c68c4ff7207c2e2913ae446c82332..78e62d4cf2d7813842af6a1a7980b0ac0d414097 100644 (file)
--- 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 56d132fd58388b412db6c06fd03ad59da9a0dca9..e39f7454938fc96921e38a9670a4d854d55ba9c1 100644 (file)
--- 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 3060ebaff3aeb90c4537356bedd2654dc8766dc2..e6e7793b2ac21a1eeb4589b0c030757e64871807 100644 (file)
--- 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_accent_24dp.xml b/app/src/main/res/drawable-anydpi-v21/ic_clear_accent_24dp.xml
new file mode 100644 (file)
index 0000000..51c798a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/ic_clear_accent_24dp.xml
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright Google Inc.
+  ~
+  ~ Licensed under the Apache License, version 2.0 ("the License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the license at:
+  ~
+  ~ https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distribution under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Modified/adapted by Damyan Ivanov for MoLe
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorAccent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>

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_black_24dp.xml
deleted file mode 100644 (file)
index 51c798a..0000000
--- a/app/src/main/res/drawable-anydpi-v21/ic_clear_black_24dp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  ~ Copyright Google Inc.
-  ~
-  ~ Licensed under the Apache License, version 2.0 ("the License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the license at:
-  ~
-  ~ https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distribution under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ Modified/adapted by Damyan Ivanov for MoLe
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorAccent"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>

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 97550331ab2a5cbdacf7435244814f8dfee520f1..3e1234a3d5b736a82100074a3a1d374f7558dba3 100644 (file)
--- 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 115a8a377a50a0a393b0fda6013f6fef5e77a1a2..680e8f74dba7169956895e34e061534358109533 100644 (file)
--- 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" />