-
Notifications
You must be signed in to change notification settings - Fork 0
feat: 스포일러 글일 경우 이미지 보이지 않도록 구현 #764
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package com.into.websoso.core.common.extensions | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.interaction.MutableInteractionSource | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.semantics.Role | ||
|
|
||
| @Composable | ||
| fun Modifier.clickableWithoutRipple( | ||
| enabled: Boolean = true, | ||
| onClickLabel: String? = null, | ||
| role: Role? = null, | ||
| onClick: () -> Unit, | ||
| ) = clickable( | ||
| enabled = enabled, | ||
| onClickLabel = onClickLabel, | ||
| role = role, | ||
| indication = null, | ||
| interactionSource = remember { MutableInteractionSource() }, | ||
| onClick = onClick, | ||
| ) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ package com.into.websoso.feature.library.component | |
|
|
||
| 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.Box | ||
| import androidx.compose.foundation.layout.Column | ||
|
|
@@ -28,6 +27,7 @@ import androidx.compose.ui.res.vectorResource | |
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.unit.Dp | ||
| import androidx.compose.ui.unit.dp | ||
| import com.into.websoso.core.common.extensions.clickableWithoutRipple | ||
| import com.into.websoso.core.designsystem.component.NetworkImage | ||
| import com.into.websoso.core.designsystem.theme.Black | ||
| import com.into.websoso.core.designsystem.theme.Gray200 | ||
|
|
@@ -59,7 +59,7 @@ internal fun NovelGridListItem( | |
| modifier = modifier | ||
| .width(itemSize.width) | ||
| .wrapContentHeight() | ||
| .clickable { onItemClick() }, | ||
| .clickableWithoutRipple { onItemClick() }, | ||
| verticalArrangement = Arrangement.spacedBy(6.dp), | ||
| ) { | ||
| NovelGridThumbnail( | ||
|
|
@@ -139,7 +139,8 @@ private fun ReadStatusBadge( | |
| .background( | ||
| color = readStatusUiModel.backgroundColor, | ||
| shape = RoundedCornerShape(4.dp), | ||
| ).padding(vertical = 4.dp), | ||
| ) | ||
| .padding(vertical = 4.dp), | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [ktlint] standard:chain-method-continuation reported by reviewdog 🐶 |
||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Text( | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ package com.into.websoso.feature.library.component | |
|
|
||
| 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.Box | ||
| import androidx.compose.foundation.layout.Column | ||
|
|
@@ -34,6 +33,7 @@ import androidx.compose.ui.text.style.TextOverflow | |
| import androidx.compose.ui.unit.Dp | ||
| import androidx.compose.ui.unit.dp | ||
| import coil.compose.AsyncImage | ||
| import com.into.websoso.core.common.extensions.clickableWithoutRipple | ||
| import com.into.websoso.core.designsystem.theme.Black | ||
| import com.into.websoso.core.designsystem.theme.Gray200 | ||
| import com.into.websoso.core.designsystem.theme.Gray300 | ||
|
|
@@ -72,7 +72,7 @@ internal fun LibraryListItem( | |
| Column( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .clickable { onClick() }, | ||
| .clickableWithoutRipple { onClick() }, | ||
| verticalArrangement = Arrangement.spacedBy(8.dp), | ||
| ) { | ||
| Row( | ||
|
|
@@ -162,7 +162,8 @@ private fun ReadStatusBadge( | |
| .background( | ||
| color = it.backgroundColor, | ||
| shape = RoundedCornerShape(8.dp), | ||
| ).padding(vertical = 4.dp), | ||
| ) | ||
| .padding(vertical = 4.dp), | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [ktlint] standard:chain-method-continuation reported by reviewdog 🐶 |
||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Text( | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ package com.into.websoso.feature.library.filter.component | |
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
|
|
@@ -16,6 +15,7 @@ import androidx.compose.ui.Alignment | |
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.into.websoso.core.common.extensions.clickableWithoutRipple | ||
| import com.into.websoso.core.designsystem.theme.Gray300 | ||
| import com.into.websoso.core.designsystem.theme.Gray50 | ||
| import com.into.websoso.core.designsystem.theme.Primary100 | ||
|
|
@@ -47,7 +47,7 @@ internal fun LibraryFilterBottomSheetNovelRatingGrid( | |
| title = "3.5 이상", | ||
| modifier = Modifier | ||
| .weight(weight = 1f) | ||
| .clickable { | ||
| .clickableWithoutRipple { | ||
| onRatingClick(THREE_POINT_FIVE) | ||
| }, | ||
| isSelected = selectedRating.isCloseTo(THREE_POINT_FIVE), | ||
|
|
@@ -56,7 +56,7 @@ internal fun LibraryFilterBottomSheetNovelRatingGrid( | |
| title = "4.0 이상", | ||
| modifier = Modifier | ||
| .weight(weight = 1f) | ||
| .clickable { | ||
| .clickableWithoutRipple { | ||
| onRatingClick(FOUR) | ||
| }, | ||
| isSelected = selectedRating.isCloseTo(FOUR), | ||
|
|
@@ -71,7 +71,7 @@ internal fun LibraryFilterBottomSheetNovelRatingGrid( | |
| title = "4.5 이상", | ||
| modifier = Modifier | ||
| .weight(weight = 1f) | ||
| .clickable { | ||
| .clickableWithoutRipple { | ||
| onRatingClick(FOUR_POINT_FIVE) | ||
| }, | ||
| isSelected = selectedRating.isCloseTo(FOUR_POINT_FIVE), | ||
|
|
@@ -80,7 +80,7 @@ internal fun LibraryFilterBottomSheetNovelRatingGrid( | |
| title = "4.8 이상", | ||
| modifier = Modifier | ||
| .weight(weight = 1f) | ||
| .clickable { | ||
| .clickableWithoutRipple { | ||
| onRatingClick(FOUR_POINT_EIGHT) | ||
| }, | ||
| isSelected = selectedRating.isCloseTo(FOUR_POINT_EIGHT), | ||
|
|
@@ -102,7 +102,8 @@ private fun NovelRatingItem( | |
| .background( | ||
| color = backgroundColor, | ||
| shape = RoundedCornerShape(size = 8.dp), | ||
| ).then( | ||
| ) | ||
| .then( | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [ktlint] standard:chain-method-continuation reported by reviewdog 🐶 |
||
| if (isSelected) { | ||
| Modifier.border( | ||
| width = 1.dp, | ||
|
|
@@ -112,7 +113,8 @@ private fun NovelRatingItem( | |
| } else { | ||
| Modifier | ||
| }, | ||
| ).padding(vertical = 14.dp, horizontal = 24.dp), | ||
| ) | ||
| .padding(vertical = 14.dp, horizontal = 24.dp), | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [ktlint] standard:chain-method-continuation reported by reviewdog 🐶 |
||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Text( | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [ktlint] standard:indent reported by reviewdog 🐶
Unexpected indentation (11) (should be 12)