From 3aa9fddfd514261db69b193861034cabeebbb957 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 11 May 2023 15:43:02 +0800
Subject: [PATCH] Refine name and drop unused res

---
 .../hippo/ehviewer/ui/scene/GalleryHolder.kt  |  4 +--
 .../hippo/ehviewer/ui/scene/HistoryScene.kt   |  4 +--
 .../ehviewer/ui/widget/GalleryInfoCard.kt     |  2 +-
 app/src/main/res/drawable/spacer_x6.xml       | 26 -----------------
 app/src/main/res/drawable/v_download_x16.xml  | 28 -------------------
 app/src/main/res/drawable/v_heart_x16.xml     | 28 -------------------
 6 files changed, 5 insertions(+), 87 deletions(-)
 delete mode 100644 app/src/main/res/drawable/spacer_x6.xml
 delete mode 100644 app/src/main/res/drawable/v_download_x16.xml
 delete mode 100644 app/src/main/res/drawable/v_heart_x16.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
index 7cd24872f..e5430af3d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
@@ -30,7 +30,7 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.ui.widget.EhAsyncThumb
-import com.hippo.ehviewer.ui.widget.ListInfoCard
+import com.hippo.ehviewer.ui.widget.GalleryInfoListItem
 import com.hippo.ehviewer.ui.widget.setMD3Content
 import eu.kanade.tachiyomi.util.system.pxToDp
 
@@ -52,7 +52,7 @@ class ListGalleryHolder(
 
     override fun bind(galleryInfo: GalleryInfo, onClick: () -> Unit, onLongClick: () -> Unit) {
         composeView.setMD3Content {
-            ListInfoCard(
+            GalleryInfoListItem(
                 onClick = onClick,
                 onLongClick = onLongClick,
                 info = galleryInfo,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
index e3237f018..95edcf6ab 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
@@ -73,8 +73,8 @@ import com.hippo.ehviewer.ui.addToFavorites
 import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter
 import com.hippo.ehviewer.ui.removeFromFavorites
 import com.hippo.ehviewer.ui.widget.Deferred
+import com.hippo.ehviewer.ui.widget.GalleryInfoListItem
 import com.hippo.ehviewer.ui.widget.LazyColumnWithScrollBar
-import com.hippo.ehviewer.ui.widget.ListInfoCard
 import com.hippo.ehviewer.ui.widget.rememberDialogState
 import com.hippo.ehviewer.ui.widget.setMD3Content
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
@@ -153,7 +153,7 @@ class HistoryScene : BaseScene() {
                                     dismissContent = {
                                         // TODO: item delete & add animation
                                         // Bug tracker: https://issuetracker.google.com/issues/150812265
-                                        ListInfoCard(
+                                        GalleryInfoListItem(
                                             onClick = ::onItemClick.partially1(it),
                                             onLongClick = ::onItemLongClick.partially1(it),
                                             info = it,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
index 003585206..867cf4758 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt
@@ -31,7 +31,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.download.DownloadManager
 
 @Composable
-fun ListInfoCard(
+fun GalleryInfoListItem(
     onClick: () -> Unit,
     onLongClick: () -> Unit,
     info: GalleryInfo,
diff --git a/app/src/main/res/drawable/spacer_x6.xml b/app/src/main/res/drawable/spacer_x6.xml
deleted file mode 100644
index f380d8c49..000000000
--- a/app/src/main/res/drawable/spacer_x6.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Hippo Seven
-  ~
-  ~ 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
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed 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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="6dp"
-        android:height="6dp" />
-
-    <solid android:color="@android:color/transparent" />
-
-</shape>
diff --git a/app/src/main/res/drawable/v_download_x16.xml b/app/src/main/res/drawable/v_download_x16.xml
deleted file mode 100644
index 913b7d0ff..000000000
--- a/app/src/main/res/drawable/v_download_x16.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Hippo Seven
-  ~
-  ~ 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
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:tint="?android:attr/textColorSecondary"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="@string/pd_download" />
-
-</vector>
diff --git a/app/src/main/res/drawable/v_heart_x16.xml b/app/src/main/res/drawable/v_heart_x16.xml
deleted file mode 100644
index 2e4b7f483..000000000
--- a/app/src/main/res/drawable/v_heart_x16.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Hippo Seven
-  ~
-  ~ 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
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:tint="?android:attr/textColorSecondary"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="@string/pd_heart" />
-
-</vector>