diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index f8ee83509..b2b402be7 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -539,8 +539,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener { LocalPinnableContainer.current!!.run { remember { pin() } } Column { GalleryDetailHeaderCard( - galleryInfo = galleryInfo, - galleryDetail = galleryDetail, + info = galleryDetail ?: galleryInfo, onInfoCardClick = ::onGalleryInfoCardClick, onCategoryChipClick = ::onCategoryChipClick, onUploaderChipClick = ::onUploaderChipClick, @@ -598,8 +597,7 @@ class GalleryDetailScene : BaseScene(), DownloadInfoListener { modifier = Modifier.fillMaxWidth(), ) { GalleryDetailHeaderCard( - galleryInfo = galleryInfo, - galleryDetail = galleryDetail, + info = galleryDetail ?: galleryInfo, onInfoCardClick = ::onGalleryInfoCardClick, onCategoryChipClick = ::onCategoryChipClick, onUploaderChipClick = ::onUploaderChipClick, diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt index e192b5122..7e8d5cd18 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt @@ -91,8 +91,7 @@ fun GalleryDetailHeaderInfoCard( @Composable fun GalleryDetailHeaderCard( - galleryInfo: GalleryInfo, - galleryDetail: GalleryDetail?, + info: GalleryInfo, onInfoCardClick: () -> Unit, onUploaderChipClick: () -> Unit, onBlockUploaderIconClick: () -> Unit, @@ -102,7 +101,7 @@ fun GalleryDetailHeaderCard( Row { Card { EhAsyncCropThumb( - model = galleryInfo.thumb, + model = info.thumb, modifier = Modifier.height(dimensionResource(id = R.dimen.gallery_detail_thumb_height)).width(dimensionResource(id = R.dimen.gallery_detail_thumb_width)), ) } @@ -111,7 +110,7 @@ fun GalleryDetailHeaderCard( modifier = Modifier.height(dimensionResource(id = R.dimen.gallery_detail_thumb_height)), horizontalAlignment = Alignment.End, ) { - galleryDetail?.let { + (info as? GalleryDetail)?.let { GalleryDetailHeaderInfoCard( detail = it, onClick = onInfoCardClick, @@ -119,7 +118,7 @@ fun GalleryDetailHeaderCard( ) } Spacer(modifier = Modifier.weight(1F)) - val categoryText = EhUtils.getCategory(galleryInfo.category).uppercase() + val categoryText = EhUtils.getCategory(info.category).uppercase() AssistChip( onClick = onCategoryChipClick, label = { Text(text = categoryText, maxLines = 1) }, @@ -131,7 +130,7 @@ fun GalleryDetailHeaderCard( ) }, ) - val uploaderText = galleryInfo.uploader.orEmpty().uppercase() + val uploaderText = info.uploader.orEmpty().uppercase() AssistChip( onClick = onUploaderChipClick, label = { Text(text = uploaderText, maxLines = 1) },