From 865b579057692f3165645f1f5b98ad31b88e9c1b Mon Sep 17 00:00:00 2001
From: Aditya-Sood <sood.aditya.08@gmail.com>
Date: Thu, 27 Jun 2019 20:40:46 +0530
Subject: [PATCH] Bug fix: Correct the usage of close icon

MainActivity, AnimationUtils & tab_switcher.xml were using the "ic_close_white_24dp" (whose colouring was corrected in a previous commit of this branch from black to white, which caused the 'Close all tabs' button to appear completely white without any icons)
---
 .../java/org/kiwix/kiwixmobile/main/MainActivity.java  |  2 +-
 .../org/kiwix/kiwixmobile/utils/AnimationUtils.java    |  2 +-
 app/src/main/res/drawable/ic_close_black_24dp.xml      | 10 ++++++++++
 app/src/main/res/layout/tab_switcher.xml               |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_close_black_24dp.xml

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index a618bd884..ab66be396 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -529,7 +529,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
 
     drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
     closeAllTabsButton.setImageDrawable(
-        ContextCompat.getDrawable(this, R.drawable.ic_close_white_24dp));
+        ContextCompat.getDrawable(this, R.drawable.ic_close_black_24dp));
     tabSwitcherRoot.setVisibility(View.GONE);
     progressBar.setVisibility(View.VISIBLE);
     contentFrame.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/AnimationUtils.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/AnimationUtils.java
index ad0cab05e..54e3e4c0b 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/AnimationUtils.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/AnimationUtils.java
@@ -86,7 +86,7 @@ public class AnimationUtils {
 
       public void onAnimationStart(Animation animation) {
         v.setImageDrawable(
-            ContextCompat.getDrawable(v.getContext(), R.drawable.ic_close_white_24dp));
+            ContextCompat.getDrawable(v.getContext(), R.drawable.ic_close_black_24dp));
       }
     });
   }
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/app/src/main/res/drawable/ic_close_black_24dp.xml
new file mode 100644
index 000000000..e5085c6ef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp">
+  <path
+      android:fillColor="#000000"
+      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/tab_switcher.xml b/app/src/main/res/layout/tab_switcher.xml
index fc51c5089..ba1307ad4 100644
--- a/app/src/main/res/layout/tab_switcher.xml
+++ b/app/src/main/res/layout/tab_switcher.xml
@@ -25,6 +25,6 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:srcCompat="@drawable/ic_close_white_24dp"
+      app:srcCompat="@drawable/ic_close_black_24dp"
       />
 </androidx.constraintlayout.widget.ConstraintLayout>