From e2562724ed501f4ca56c2302ef36fb226608c217 Mon Sep 17 00:00:00 2001 From: yunsehwan Date: Sat, 23 Nov 2024 18:38:46 +0900 Subject: [PATCH] =?UTF-8?q?[UI]=20#83=20=EB=A7=81=ED=81=AC=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20bottomSheet=20UI=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=83=81=EC=84=B8=20bottomSheet=EC=97=90?= =?UTF-8?q?=EC=84=9C=20bottomSheet=EB=A5=BC=20=EC=A0=9C=EA=B1=B0=ED=95=9C?= =?UTF-8?q?=20=EB=B6=80=EB=B6=84=EC=9D=84=20=EB=B3=84=EB=8F=84=EC=9D=98=20?= =?UTF-8?q?LinkDetailBottomSheetContent=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../texticonbutton/TextIconButton.kt} | 10 +- .../LinkDetailBottomSheet.kt | 226 +----------------- .../LinkDetailBottomSheetContent.kt | 190 +++++++++++++++ .../template/linkdetailbottomsheet/Preview.kt | 6 - .../ModifyBottomSheetContent.kt | 8 +- .../ui/src/main/res/drawable/icon_24_file.xml | 19 ++ core/ui/src/main/res/values/string.xml | 4 + .../pokit/home/pokit/UnclassifiedScreen.kt | 3 - .../pokit/home/remind/RemindScreen.kt | 3 - .../pokit/linklist/LinkListScreen.kt | 3 - .../pokitdetail/PokitDetailScreen.kt | 3 - .../pokitmons/pokit/search/SearchScreen.kt | 4 - 12 files changed, 234 insertions(+), 245 deletions(-) rename core/ui/src/main/java/pokitmons/pokit/core/ui/components/{template/modifybottomsheet/subcomponents/ModifyBottomSheetItem.kt => block/texticonbutton/TextIconButton.kt} (79%) create mode 100644 core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheetContent.kt create mode 100644 core/ui/src/main/res/drawable/icon_24_file.xml diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/subcomponents/ModifyBottomSheetItem.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/texticonbutton/TextIconButton.kt similarity index 79% rename from core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/subcomponents/ModifyBottomSheetItem.kt rename to core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/texticonbutton/TextIconButton.kt index 8a0d35eb..a1d15cee 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/subcomponents/ModifyBottomSheetItem.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/texticonbutton/TextIconButton.kt @@ -1,4 +1,4 @@ -package pokitmons.pokit.core.ui.components.template.modifybottomsheet.subcomponents +package pokitmons.pokit.core.ui.components.block.texticonbutton import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -10,16 +10,19 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.dp import pokitmons.pokit.core.ui.theme.PokitTheme import pokitmons.pokit.core.ui.utils.noRippleClickable @Composable -internal fun ModifyBottomSheetItem( +internal fun TextIconButton( onClick: () -> Unit, title: String, painter: Painter, + tintColor: Color? = PokitTheme.colors.iconPrimary ) { Row( modifier = Modifier @@ -39,7 +42,8 @@ internal fun ModifyBottomSheetItem( Image( modifier = Modifier.size(24.dp), painter = painter, - contentDescription = null + contentDescription = null, + colorFilter = tintColor?.let { ColorFilter.tint(it) } ) } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheet.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheet.kt index 4b11f0bc..ab86fbe6 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheet.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheet.kt @@ -1,51 +1,17 @@ package pokitmons.pokit.core.ui.components.template.linkdetailbottomsheet -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.painter.Painter -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.dp -import pokitmons.pokit.core.ui.R -import pokitmons.pokit.core.ui.components.block.linkurlcard.LinkUrlCard import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet -import pokitmons.pokit.core.ui.theme.PokitTheme -import pokitmons.pokit.core.ui.theme.color.Orange50 @Composable fun LinkDetailBottomSheet( title: String, memo: String, - url: String, - thumbnailPainter: Painter, bookmark: Boolean, - openWebBrowserByClick: Boolean, pokitName: String, dateString: String, onHideBottomSheet: () -> Unit, show: Boolean = false, - useRemind: Boolean = false, onClickBookmark: (() -> Unit)? = null, onClickRemoveLink: (() -> Unit)? = null, onClickModifyLink: (() -> Unit)? = null, @@ -55,188 +21,16 @@ fun LinkDetailBottomSheet( onHideBottomSheet = onHideBottomSheet, show = show ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp) - ) { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically - ) { - if (useRemind) { - Image( - painter = painterResource(id = R.drawable.icon_24_bell), - contentDescription = null, - modifier = Modifier - .size(20.dp) - .background( - color = PokitTheme.colors.brand, - shape = CircleShape - ) - .padding(2.dp), - colorFilter = ColorFilter.tint(PokitTheme.colors.inverseWh) - ) - - Spacer(modifier = Modifier.width(4.dp)) - } - - Text( - text = pokitName, - modifier = Modifier - .border( - width = 1.dp, - color = PokitTheme.colors.borderTertiary, - shape = RoundedCornerShape(4.dp) - ) - .background( - color = PokitTheme.colors.backgroundBase, - shape = RoundedCornerShape(4.dp) - ) - .padding(horizontal = 8.dp, vertical = 4.dp), - style = PokitTheme.typography.label4.copy(color = PokitTheme.colors.textTertiary) - ) - } - - Spacer(modifier = Modifier.height(8.dp)) - - Text( - text = title, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - style = PokitTheme.typography.title3.copy(color = PokitTheme.colors.textPrimary) - ) - - Spacer(modifier = Modifier.height(8.dp)) - - Text( - modifier = Modifier.fillMaxWidth(), - text = dateString, - style = PokitTheme.typography.detail2.copy(color = PokitTheme.colors.textTertiary), - textAlign = TextAlign.End - ) - } - - Spacer(modifier = Modifier.height(12.dp)) - - HorizontalDivider( - thickness = 1.dp, - color = PokitTheme.colors.borderTertiary - ) - - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 24.dp) - ) { - LinkUrlCard( - thumbnailPainter = thumbnailPainter, - url = url, - title = title, - openWebBrowserByClick = openWebBrowserByClick - ) - - Spacer(modifier = Modifier.height(16.dp)) - - Text( - text = memo, - modifier = Modifier - .fillMaxWidth() - .background( - color = Orange50, - shape = RoundedCornerShape(8.dp) - ) - .padding(16.dp), - style = PokitTheme.typography.body3Regular.copy(color = PokitTheme.colors.textPrimary), - maxLines = 4, - minLines = 4 - ) - } - - HorizontalDivider( - thickness = 1.dp, - color = PokitTheme.colors.borderTertiary + LinkDetailBottomSheetContent( + title = title, + memo = memo, + bookmark = bookmark, + pokitName = pokitName, + dateString = dateString, + onClickBookmark = onClickBookmark, + onClickRemoveLink = onClickRemoveLink, + onClickModifyLink = onClickModifyLink, + onClickShareLink = onClickShareLink ) - - Row( - modifier = Modifier - .fillMaxWidth() - .padding(top = 10.dp, start = 10.dp, end = 10.dp), - verticalAlignment = Alignment.CenterVertically - ) { - Image( - modifier = Modifier - .size(36.dp) - .padding(6.dp) - .clickable( - indication = null, - interactionSource = remember { MutableInteractionSource() }, - onClick = { - onClickBookmark?.invoke() - } - ), - painter = painterResource(id = R.drawable.icon_24_star), - contentDescription = "bookmark", - colorFilter = ColorFilter.tint( - color = if (bookmark) PokitTheme.colors.brand else PokitTheme.colors.iconTertiary - ) - ) - - Spacer(modifier = Modifier.weight(1f)) - - onClickShareLink?.let { - Image( - modifier = Modifier - .size(36.dp) - .padding(6.dp) - .clickable( - indication = null, - interactionSource = remember { MutableInteractionSource() }, - onClick = onClickShareLink - ), - painter = painterResource(id = R.drawable.icon_24_share), - contentDescription = "share", - colorFilter = ColorFilter.tint( - color = PokitTheme.colors.iconSecondary - ) - ) - } - - onClickModifyLink?.let { - Image( - modifier = Modifier - .size(36.dp) - .padding(6.dp) - .clickable( - indication = null, - interactionSource = remember { MutableInteractionSource() }, - onClick = onClickModifyLink - ), - painter = painterResource(id = R.drawable.icon_24_edit), - contentDescription = "edit", - colorFilter = ColorFilter.tint( - color = PokitTheme.colors.iconSecondary - ) - ) - } - - onClickRemoveLink?.let { - Image( - modifier = Modifier - .size(36.dp) - .padding(6.dp) - .clickable( - indication = null, - interactionSource = remember { MutableInteractionSource() }, - onClick = onClickRemoveLink - ), - painter = painterResource(id = R.drawable.icon_24_trash), - contentDescription = "remove", - colorFilter = ColorFilter.tint( - color = PokitTheme.colors.iconSecondary - ) - ) - } - } } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheetContent.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheetContent.kt new file mode 100644 index 00000000..89832abd --- /dev/null +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/LinkDetailBottomSheetContent.kt @@ -0,0 +1,190 @@ +package pokitmons.pokit.core.ui.components.template.linkdetailbottomsheet + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import pokitmons.pokit.core.ui.R +import pokitmons.pokit.core.ui.components.block.texticonbutton.TextIconButton +import pokitmons.pokit.core.ui.theme.PokitTheme +import pokitmons.pokit.core.ui.theme.color.Orange50 + +@Composable +fun LinkDetailBottomSheetContent( + title: String, + memo: String, + bookmark: Boolean, + pokitName: String, + dateString: String, + onClickBookmark: (() -> Unit)? = null, + onClickRemoveLink: (() -> Unit)? = null, + onClickModifyLink: (() -> Unit)? = null, + onClickShareLink: (() -> Unit)? = null, +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 12.dp) + ) { + Text( + text = title, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + style = PokitTheme.typography.title3.copy(color = PokitTheme.colors.textPrimary) + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = pokitName, + modifier = Modifier + .background( + color = PokitTheme.colors.backgroundPrimary, + shape = RoundedCornerShape(4.dp) + ) + .padding(horizontal = 8.dp, vertical = 4.dp), + style = PokitTheme.typography.label4.copy(color = PokitTheme.colors.textTertiary) + ) + + Row { + Text( + modifier = Modifier.fillMaxWidth(), + text = dateString, + style = PokitTheme.typography.detail2.copy(color = PokitTheme.colors.textTertiary), + textAlign = TextAlign.End + ) + } + } + + } + + Spacer(modifier = Modifier.height(12.dp)) + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(top = 16.dp, bottom = 24.dp, start = 24.dp, end = 24.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = stringResource(id = R.string.memo), + style = PokitTheme.typography.body1Medium.copy(color = PokitTheme.colors.textPrimary) + ) + + Icon( + modifier = Modifier.size(24.dp), + painter = painterResource(id = R.drawable.icon_24_file), + contentDescription = null, + tint = PokitTheme.colors.iconPrimary + ) + } + + Spacer(modifier = Modifier.height(12.dp)) + + // textField? + Text( + text = memo, + modifier = Modifier + .fillMaxWidth() + .background( + color = Orange50, + shape = RoundedCornerShape(8.dp) + ) + .padding(16.dp), + style = PokitTheme.typography.body3Regular.copy(color = PokitTheme.colors.textPrimary), + maxLines = 4, + minLines = 4 + ) + } + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + + + onClickBookmark?.let { + TextIconButton( + onClick = onClickBookmark, + title = stringResource(id = R.string.bookmark), + painter = painterResource( + id = if (bookmark) R.drawable.icon_24_star else R.drawable.icon_24_star_1 + ), + tintColor = if (bookmark) PokitTheme.colors.brand else PokitTheme.colors.iconPrimary + ) + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + } + + onClickShareLink?.let { + TextIconButton( + onClick = onClickShareLink, + title = stringResource(id = R.string.share), + painter = painterResource(id = R.drawable.icon_24_share) + ) + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + } + + onClickModifyLink?.let { + TextIconButton( + onClick = onClickModifyLink, + title = stringResource(id = R.string.modify), + painter = painterResource(id = R.drawable.icon_24_edit) + ) + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + } + + onClickRemoveLink?.let { + TextIconButton( + onClick = onClickRemoveLink, + title = stringResource(id = R.string.remove), + painter = painterResource(id = R.drawable.icon_24_trash) + ) + + HorizontalDivider( + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary + ) + } + + Spacer(modifier = Modifier.height(20.dp)) +} diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/Preview.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/Preview.kt index 3d162637..2c4fc79e 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/Preview.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/linkdetailbottomsheet/Preview.kt @@ -4,9 +4,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview -import pokitmons.pokit.core.ui.R import pokitmons.pokit.core.ui.theme.PokitTheme @Preview(showBackground = true) @@ -17,10 +15,7 @@ private fun LinkDetailBottomSheetPreview() { LinkDetailBottomSheet( title = "title", memo = "some memo", - url = "https://naver.com", - thumbnailPainter = painterResource(id = R.drawable.icon_24_google), bookmark = true, - openWebBrowserByClick = false, show = true, pokitName = "TEXT", dateString = "2024.08.27", @@ -28,7 +23,6 @@ private fun LinkDetailBottomSheetPreview() { onClickBookmark = { }, onClickModifyLink = { }, onClickRemoveLink = { }, - onClickShareLink = { } ) } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/ModifyBottomSheetContent.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/ModifyBottomSheetContent.kt index 4ea40913..8a5236df 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/ModifyBottomSheetContent.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/template/modifybottomsheet/ModifyBottomSheetContent.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import pokitmons.pokit.core.ui.R -import pokitmons.pokit.core.ui.components.template.modifybottomsheet.subcomponents.ModifyBottomSheetItem +import pokitmons.pokit.core.ui.components.block.texticonbutton.TextIconButton @Composable fun ModifyBottomSheetContent( @@ -19,7 +19,7 @@ fun ModifyBottomSheetContent( modifier = Modifier.fillMaxWidth() ) { onClickShare?.let { onClickShare -> - ModifyBottomSheetItem( + TextIconButton( onClick = onClickShare, title = stringResource(id = R.string.share), painter = painterResource(id = R.drawable.icon_24_share) @@ -27,7 +27,7 @@ fun ModifyBottomSheetContent( } onClickModify?.let { onClickModify -> - ModifyBottomSheetItem( + TextIconButton( onClick = onClickModify, title = stringResource(id = R.string.modify), painter = painterResource(id = R.drawable.icon_24_edit) @@ -35,7 +35,7 @@ fun ModifyBottomSheetContent( } onClickRemove?.let { onClickRemove -> - ModifyBottomSheetItem( + TextIconButton( onClick = onClickRemove, title = stringResource(id = R.string.remove), painter = painterResource(id = R.drawable.icon_24_trash) diff --git a/core/ui/src/main/res/drawable/icon_24_file.xml b/core/ui/src/main/res/drawable/icon_24_file.xml new file mode 100644 index 00000000..b90ce52a --- /dev/null +++ b/core/ui/src/main/res/drawable/icon_24_file.xml @@ -0,0 +1,19 @@ + + + + diff --git a/core/ui/src/main/res/values/string.xml b/core/ui/src/main/res/values/string.xml index cd43f1d7..83e13e4f 100644 --- a/core/ui/src/main/res/values/string.xml +++ b/core/ui/src/main/res/values/string.xml @@ -9,6 +9,7 @@ 공유하기 수정하기 삭제하기 + 즐겨찾기 확인 @@ -34,4 +35,7 @@ 아직 알람이 없어요 리마인드 알림을 설정하세요 + + 메모 + 메모를 입력해주세요 \ No newline at end of file diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt index 35ceb7b1..0d43e365 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/UnclassifiedScreen.kt @@ -42,10 +42,7 @@ fun UnclassifiedScreen( LinkDetailBottomSheet( title = link.title, memo = link.memo, - url = link.url, - thumbnailPainter = rememberAsyncImagePainter(model = link.imageUrl), bookmark = link.bookmark, - openWebBrowserByClick = true, pokitName = link.pokitName, dateString = link.dateString, onHideBottomSheet = viewModel::hideDetailLinkBottomSheet, diff --git a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt index 3c9f74fd..3e7a415c 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/remind/RemindScreen.kt @@ -115,10 +115,7 @@ fun RemindScreen( LinkDetailBottomSheet( title = link.title, memo = link.memo, - url = link.url, - thumbnailPainter = rememberAsyncImagePainter(model = link.imageUrl), bookmark = link.bookmark, - openWebBrowserByClick = true, pokitName = link.pokitName, dateString = link.dateString, onHideBottomSheet = viewModel::hideDetailLinkBottomSheet, diff --git a/feature/linklist/src/main/java/pokitmons/pokit/linklist/LinkListScreen.kt b/feature/linklist/src/main/java/pokitmons/pokit/linklist/LinkListScreen.kt index 7ed4df86..9313aa25 100644 --- a/feature/linklist/src/main/java/pokitmons/pokit/linklist/LinkListScreen.kt +++ b/feature/linklist/src/main/java/pokitmons/pokit/linklist/LinkListScreen.kt @@ -218,10 +218,7 @@ fun LinkListScreen( LinkDetailBottomSheet( title = link.title, memo = link.memo, - url = link.url, - thumbnailPainter = rememberAsyncImagePainter(link.imageUrl), bookmark = link.bookmark, - openWebBrowserByClick = true, pokitName = link.pokitName, dateString = link.dateString, onHideBottomSheet = hideLinkDetailBottomSheet, diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt index 22920ee9..e5849426 100644 --- a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt +++ b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailScreen.kt @@ -267,10 +267,7 @@ fun PokitDetailScreen( LinkDetailBottomSheet( title = state.currentLink.title, memo = state.currentLink.memo, - url = state.currentLink.url, - thumbnailPainter = rememberAsyncImagePainter(state.currentLink.imageUrl), bookmark = state.currentLink.bookmark, - openWebBrowserByClick = true, pokitName = state.currentLink.pokitName, dateString = state.currentLink.dateString, onHideBottomSheet = hideLinkDetailBottomSheet, diff --git a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt index 44aaf940..be2fb3c0 100644 --- a/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt +++ b/feature/search/src/main/java/pokitmons/pokit/search/SearchScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import coil.compose.rememberAsyncImagePainter import pokitmons.pokit.core.feature.model.paging.PagingState import pokitmons.pokit.core.feature.utils.ShareUrlLink import pokitmons.pokit.core.ui.components.atom.loading.LoadingProgress @@ -58,10 +57,7 @@ fun SearchScreenContainer( LinkDetailBottomSheet( title = link.title, memo = link.memo, - url = link.url, - thumbnailPainter = rememberAsyncImagePainter(link.imageUrl), bookmark = link.bookmark, - openWebBrowserByClick = true, pokitName = link.pokitName, dateString = link.dateString, onHideBottomSheet = viewModel::hideLinkDetailBottomSheet,