From f292f31ac19ae4da4f88c63e5a5c91f86e7789a5 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 26 Nov 2023 22:54:29 +0800
Subject: [PATCH] Refine DownloadsScreen icons (#349)

* Convert big download icon to ImageVector

* Tweak download label icons
---
 .../com/hippo/ehviewer/icons/big/Download.kt  | 44 +++++++++++++++++++
 .../ehviewer/ui/scene/DownloadsFragment.kt    | 12 ++---
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/kotlin/com/hippo/ehviewer/icons/big/Download.kt

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/icons/big/Download.kt b/app/src/main/kotlin/com/hippo/ehviewer/icons/big/Download.kt
new file mode 100644
index 000000000..935cd5616
--- /dev/null
+++ b/app/src/main/kotlin/com/hippo/ehviewer/icons/big/Download.kt
@@ -0,0 +1,44 @@
+package com.hippo.ehviewer.icons.big
+
+import androidx.compose.material.icons.materialPath
+import com.hippo.ehviewer.icons.EhIcons
+import com.hippo.ehviewer.icons.bigIcon
+import com.hippo.ehviewer.util.unsafeLazy
+
+val EhIcons.Big.Filled.Download by unsafeLazy {
+    bigIcon(name = "Download") {
+        materialPath {
+            moveTo(0.0F, 19.0F)
+            verticalLineTo(24.0F)
+            horizontalLineTo(24.0F)
+            verticalLineTo(19.0F)
+            horizontalLineTo(0.0F)
+            close()
+            moveTo(16.0F, 22.0F)
+            horizontalLineTo(15.0F)
+            verticalLineTo(21.0F)
+            horizontalLineTo(16.0F)
+            verticalLineTo(22.0F)
+            close()
+            moveTo(19.0F, 22.0F)
+            horizontalLineTo(18.0F)
+            verticalLineTo(21.0F)
+            horizontalLineTo(19.0F)
+            verticalLineTo(22.0F)
+            close()
+            moveTo(22.0F, 22.0F)
+            horizontalLineTo(21.0F)
+            verticalLineTo(21.0F)
+            horizontalLineTo(22.0F)
+            verticalLineTo(22.0F)
+            moveTo(15.0F, 11.0F)
+            lineTo(15.0F, 0.0F)
+            lineTo(9.0F, 0.0F)
+            lineTo(9.0F, 11.0F)
+            lineTo(5.0F, 11.0F)
+            lineTo(12.0F, 18.0F)
+            lineTo(19.0F, 11.0F)
+            close()
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt
index 812a0f5c1..fbfb3d745 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsFragment.kt
@@ -29,14 +29,14 @@ import androidx.compose.foundation.text2.input.rememberTextFieldState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.DriveFileMove
 import androidx.compose.material.icons.automirrored.outlined.Label
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Archive
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.DoneAll
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.NewLabel
 import androidx.compose.material.icons.filled.Pause
 import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.DismissDirection
 import androidx.compose.material3.DismissValue
 import androidx.compose.material3.DropdownMenu
@@ -81,7 +81,7 @@ import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.icons.EhIcons
-import com.hippo.ehviewer.icons.big.History
+import com.hippo.ehviewer.icons.big.Download
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.confirmRemoveDownloadRange
 import com.hippo.ehviewer.ui.main.DownloadCard
@@ -177,7 +177,7 @@ fun DownloadsScreen(navigator: NavController) {
                             }
                         },
                     ) {
-                        Icon(imageVector = Icons.Default.Add, contentDescription = null)
+                        Icon(imageVector = Icons.Default.NewLabel, contentDescription = null)
                     }
                     val letMeSelect = stringResource(R.string.let_me_select)
                     IconButton(
@@ -201,7 +201,7 @@ fun DownloadsScreen(navigator: NavController) {
                             }
                         },
                     ) {
-                        Icon(imageVector = Icons.Default.Archive, contentDescription = null)
+                        Icon(imageVector = Icons.Default.Settings, contentDescription = null)
                     }
                 },
             )
@@ -472,7 +472,7 @@ fun DownloadsScreen(navigator: NavController) {
                     horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Image(
-                        imageVector = EhIcons.Big.Default.History,
+                        imageVector = EhIcons.Big.Default.Download,
                         contentDescription = null,
                         modifier = Modifier.padding(16.dp),
                     )