From 5f70d71203e637234ca632fadea105196973d121 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 23 Jan 2023 14:15:06 +0800
Subject: [PATCH] Refine InfoCard

---
 .../HistoryComposeScreenFragmentBridge.kt     | 20 ++++++++++++++++---
 .../ui/scene/history/HistoryScreen.kt         | 18 ++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt
index d93fe5982..6cafd9a47 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt
@@ -4,9 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.MainThread
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.GravityCompat
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.ui.scene.history.HistoryScreen
 
 class HistoryComposeScreenFragmentBridge : BaseScene() {
@@ -18,11 +21,22 @@ class HistoryComposeScreenFragmentBridge : BaseScene() {
         return ComposeView(requireContext()).apply {
             setContent {
                 Mdc3Theme {
-                    HistoryScreen {
-                        toggleDrawer(GravityCompat.START)
-                    }
+                    HistoryScreen(this@HistoryComposeScreenFragmentBridge)
                 }
             }
         }
     }
+
+    @MainThread
+    fun toggleNavigationDrawer() {
+        toggleDrawer(GravityCompat.START)
+    }
+
+    @MainThread
+    fun navToDetail(gi: GalleryInfo) {
+        val args = Bundle()
+        args.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GALLERY_INFO)
+        args.putParcelable(GalleryDetailScene.KEY_GALLERY_INFO, gi)
+        navigate(R.id.galleryDetailScene, args)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt
index 1638e80ff..6c7da877c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt
@@ -3,6 +3,7 @@ package com.hippo.ehviewer.ui.scene.history
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -55,6 +56,7 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.ui.scene.HistoryComposeScreenFragmentBridge
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.system.pxToDp
 import java.util.Locale
@@ -63,7 +65,7 @@ val downloadManager = EhApplication.downloadManager
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun HistoryScreen(toggleDrawer: () -> Unit) {
+fun HistoryScreen(hostFragment: HistoryComposeScreenFragmentBridge) {
     val coroutineScope = rememberCoroutineScope()
     val historyData = remember {
         Pager(
@@ -82,7 +84,7 @@ fun HistoryScreen(toggleDrawer: () -> Unit) {
                     Text(text = stringResource(id = R.string.history))
                 },
                 navigationIcon = {
-                    IconButton(onClick = { toggleDrawer() }) {
+                    IconButton(onClick = { hostFragment.toggleNavigationDrawer() }) {
                         Icon(imageVector = Icons.Default.Menu, contentDescription = "")
                     }
                 },
@@ -105,7 +107,10 @@ fun HistoryScreen(toggleDrawer: () -> Unit) {
                 key = { item -> item.gid }
             ) {
                 it?.let {
-                    InfoCard(info = it)
+                    InfoCard(
+                        info = it,
+                        modifier = Modifier.clickable { hostFragment.navToDetail(it) }
+                    )
                 }
             }
         }
@@ -169,9 +174,12 @@ private fun NoHistory() {
 }
 
 @Composable
-private fun InfoCard(info: GalleryInfo) {
+private fun InfoCard(
+    info: GalleryInfo,
+    modifier: Modifier = Modifier
+) {
     OutlinedCard(
-        modifier = Modifier.padding(6.dp),
+        modifier = modifier.padding(6.dp),
         border = remember { BorderStroke(1.dp, Color.Transparent) }
     ) {
         val listCardSize = remember { Settings.getListThumbSize().pxToDp }