From d441e92adce921fa3451d9ffe91dbf4a0e475c91 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 23 Jan 2023 14:19:08 +0800 Subject: [PATCH] Refine InfoCard --- .../com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 6c7da877c..5e9c8ac1b 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,7 +3,6 @@ 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 @@ -108,8 +107,8 @@ fun HistoryScreen(hostFragment: HistoryComposeScreenFragmentBridge) { ) { it?.let { InfoCard( + { hostFragment.navToDetail(it) }, info = it, - modifier = Modifier.clickable { hostFragment.navToDetail(it) } ) } } @@ -173,13 +172,15 @@ private fun NoHistory() { } } +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun InfoCard( + onClick: () -> Unit, info: GalleryInfo, - modifier: Modifier = Modifier ) { OutlinedCard( - modifier = modifier.padding(6.dp), + onClick = onClick, + modifier = Modifier.padding(6.dp), border = remember { BorderStroke(1.dp, Color.Transparent) } ) { val listCardSize = remember { Settings.getListThumbSize().pxToDp }