Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-08-01 17:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: reveall spoiler comments by tapping

Browse source
This commit is contained in:
tapframe 2026-07-16 13:50:33 +05:30
parent 6ae6f60926
commit e56fb2e87e
2 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/CommentDetailSheet.kt
View file

@ -27,6 +27,8 @@ import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@ -35,6 +37,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.nuvio.app.core.ui.NuvioModalBottomSheet
import com.nuvio.app.core.ui.nuvio
import com.nuvio.app.features.trakt.TraktCommentReview
import nuvio.composeapp.generated.resources.*
import org.jetbrains.compose.resources.stringResource
@ -53,6 +56,10 @@ fun CommentDetailSheet(
) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
val scrollState = rememberScrollState()
val isSpoilerRevealed = rememberSaveable(comment.id) {
mutableStateOf(!comment.hasSpoilerContent)
}
val isSpoilerHidden = comment.hasSpoilerContent && !isSpoilerRevealed.value
LaunchedEffect(comment.id) {
scrollState.scrollTo(0)
@ -151,17 +158,9 @@ fun CommentDetailSheet(
}
}
if (comment.review || comment.hasSpoilerContent) {
if (comment.review) {
Spacer(modifier = Modifier.height(12.dp))
Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
if (comment.review) {
CommentDetailChip(text = stringResource(Res.string.detail_comments_badge_review))
}
if (comment.hasSpoilerContent) {
CommentDetailChip(text = stringResource(Res.string.detail_comments_badge_spoiler))
}
}
CommentDetailChip(text = stringResource(Res.string.detail_comments_badge_review))
}
Spacer(modifier = Modifier.height(16.dp))
@ -173,13 +172,24 @@ fun CommentDetailSheet(
.verticalScroll(scrollState),
) {
Text(
text = if (comment.hasSpoilerContent) {
text = if (isSpoilerHidden) {
stringResource(Res.string.detail_comments_spoiler_hidden_sheet)
} else {
comment.comment
},
style = MaterialTheme.typography.bodyLarge.copy(lineHeight = 24.sp),
color = MaterialTheme.colorScheme.onSurface,
color = if (isSpoilerHidden) {
MaterialTheme.nuvio.colors.warning
} else {
MaterialTheme.colorScheme.onSurface
},
modifier = Modifier.then(
if (isSpoilerHidden) {
Modifier.clickable { isSpoilerRevealed.value = true }
} else {
Modifier
},
),
)
}

18
composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailCommentsSection.kt
View file

@ -40,6 +40,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.nuvio.app.core.ui.nuvio
import com.nuvio.app.core.ui.nuvioHorizontalScrollBleed
import com.nuvio.app.core.ui.withDuplicateSafeLazyKeys
import com.nuvio.app.features.trakt.TraktCommentReview
@ -214,21 +215,18 @@ private fun CommentCard(
fontWeight = FontWeight.SemiBold,
)
if (review.review || review.hasSpoilerContent) {
Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
if (review.review) {
CommentChip(text = stringResource(Res.string.detail_comments_badge_review))
}
if (review.hasSpoilerContent) {
CommentChip(text = stringResource(Res.string.detail_comments_badge_spoiler))
}
}
if (review.review) {
CommentChip(text = stringResource(Res.string.detail_comments_badge_review))
}
Text(
text = bodyText,
style = MaterialTheme.typography.bodyMedium.copy(lineHeight = 20.sp),
color = MaterialTheme.colorScheme.onSurfaceVariant,
color = if (review.hasSpoilerContent) {
MaterialTheme.nuvio.colors.warning
} else {
MaterialTheme.colorScheme.onSurfaceVariant
},
maxLines = 5,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f, fill = false),