From 64ad6ca94bb136c9f3a667d820c020ca5fe513dc Mon Sep 17 00:00:00 2001
From: Kanahia <kaushalkanahia@gmail.com>
Date: Fri, 19 Jul 2024 20:17:13 +0530
Subject: [PATCH] Fixed refresh icon visibility in light mode

---
 .../fr/free/nrw/commons/upload/worker/UploadWorker.kt |  1 +
 app/src/main/res/drawable/ic_refresh_grey_24dp.xml    | 11 +++++++++++
 app/src/main/res/layout/item_failed_upload.xml        |  2 +-
 app/src/main/res/menu/menu_uploads.xml                |  2 +-
 app/src/main/res/values/attrs.xml                     |  1 +
 app/src/main/res/values/styles.xml                    |  2 ++
 6 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_refresh_grey_24dp.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index bd78192e8..e4f57318f 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -429,6 +429,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
             Timber.e(exception)
             Timber.e("Stash upload failed for contribution: $filename")
             showFailedNotification(contribution)
+            contribution.errorInfo=exception.message
             contribution.state=Contribution.STATE_FAILED
             clearChunks(contribution)
         }
diff --git a/app/src/main/res/drawable/ic_refresh_grey_24dp.xml b/app/src/main/res/drawable/ic_refresh_grey_24dp.xml
new file mode 100644
index 000000000..ae9eace8a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh_grey_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="@color/achievement_background_dark"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/item_failed_upload.xml b/app/src/main/res/layout/item_failed_upload.xml
index cdfcc6305..a60b3e99c 100644
--- a/app/src/main/res/layout/item_failed_upload.xml
+++ b/app/src/main/res/layout/item_failed_upload.xml
@@ -50,7 +50,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="@dimen/dimen_10"
-    android:src="@drawable/ic_refresh_white_24dp" />
+    android:src="?attr/refresh_icon_drawable" />
 
   <ImageView
     android:id="@+id/deleteButton"
diff --git a/app/src/main/res/menu/menu_uploads.xml b/app/src/main/res/menu/menu_uploads.xml
index a3cdf387a..3934c71a9 100644
--- a/app/src/main/res/menu/menu_uploads.xml
+++ b/app/src/main/res/menu/menu_uploads.xml
@@ -22,7 +22,7 @@
   <item
     android:id="@+id/retry_icon"
     android:title="Retry"
-    android:icon="@drawable/ic_refresh_white_24dp"
+    android:icon="?attr/refresh_icon_drawable"
     android:orderInCategory="1"
     app:showAsAction="ifRoom"
     />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index dab337c4b..fd7227a37 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <attr name="card_item_color" format="reference"/>
     <attr name="notification_icon_drawable" format="reference"/>
     <attr name="upload_icon_drawable" format="reference"/>
+    <attr name="refresh_icon_drawable" format="reference"/>
     <attr name="notification_icon_text_color" format="reference"/>
     <attr name="toggle_theme" format="reference"/>
     <attr name="contributionsListTextSecondary" format="reference"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 94856e4eb..4a6584c9d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -49,6 +49,7 @@
         <item name="more_bottom_sheet_drawable_color">@color/white</item>
         <item name="card_item_color">@color/white</item>
         <item name="upload_icon_drawable">@drawable/ic_upload_white_24dp</item>
+        <item name="refresh_icon_drawable">@drawable/ic_refresh_white_24dp</item>
         <item name="notification_icon_drawable">@drawable/ic_notifications_white_24dp</item>
         <item name="notification_icon_text_color">@color/white</item>
         <item name="toggle_theme">@style/SwitchThemeDark</item>
@@ -110,6 +111,7 @@
         <item name="more_bottom_sheet_drawable_color">@color/black</item>
         <item name="card_item_color">@color/primaryDarkColor</item>
         <item name="upload_icon_drawable">@drawable/ic_upload_blue_24dp</item>
+        <item name="refresh_icon_drawable">@drawable/ic_refresh_grey_24dp</item>
         <item name="notification_icon_drawable">@drawable/ic_notifications_blue_24dp</item>
         <item name="notification_icon_text_color">@color/primaryDarkColor</item>
         <item name="toggle_theme">@style/SwitchThemeLight</item>