Skip to content
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.

Sign up for GitHub

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

Post Body Size Toggling #109

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Post Body Size Toggling #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions android/app/src/main/java/com/emergetools/hackernews/features/comments/CommentsDomain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sealed interface CommentsState {
val author: String,
val points: Int,
val timeLabel: String,
val body: String?,
val body: BodyState,
val loggedIn: Boolean,
val upvoted: Boolean,
val upvoteUrl: String,
Expand Down Expand Up @@ -86,14 +86,14 @@ enum class HiddenStatus {
Displayed;

fun toggle(): HiddenStatus {
return when(this) {
return when (this) {
Hidden, HiddenByParent -> Displayed
else -> Hidden
}
}

fun toggleChild(): HiddenStatus {
return when(this) {
return when (this) {
Hidden, HiddenByParent -> Displayed
else -> HiddenByParent
}
Expand Down Expand Up @@ -123,6 +123,11 @@ sealed interface CommentState {
) : CommentState
}

data class BodyState(
val text: String?,
val collapsed: Boolean = true
)

sealed interface HeaderState {
data object Loading : HeaderState
data class Content(
Expand All @@ -131,7 +136,7 @@ sealed interface HeaderState {
val author: String,
val points: Int,
val timeLabel: String,
val body: String?,
val body: BodyState,
val upvoted: Boolean,
val upvoteUrl: String,
) : HeaderState
Expand Down Expand Up @@ -159,6 +164,7 @@ sealed interface CommentsAction {
) : CommentsAction

data class ToggleHideComment(val id: Long) : CommentsAction
data class ToggleBody(val collapse: Boolean) : CommentsAction
}

sealed interface CommentsNavigation {
Expand Down Expand Up @@ -213,7 +219,7 @@ class CommentsViewModel(
.parse(searchResponse.item.createdAt)
.toEpochSecond()
),
body = searchResponse.item.text,
body = BodyState(text = searchResponse.item.text),
loggedIn = loggedIn,
upvoted = postPage.postInfo.upvoted,
upvoteUrl = postPage.postInfo.upvoteUrl,
Expand Down Expand Up @@ -332,6 +338,16 @@ class CommentsViewModel(
internalState.compareAndSet(currentState, updatedState)
}
}

is CommentsAction.ToggleBody -> {
val currentState = internalState.value
if (currentState is CommentsState.Content) {
val updatedState = currentState.copy(
body = currentState.body.copy(collapsed = action.collapse)
)
internalState.compareAndSet(currentState, updatedState)
}
}
}
}

Expand Down
61 changes: 39 additions & 22 deletions android/app/src/main/java/com/emergetools/hackernews/features/comments/CommentsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
Expand Down Expand Up @@ -53,6 +52,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
Expand Down Expand Up @@ -97,7 +97,8 @@ fun CommentsScreen(
} else {
navigation(CommentsNavigation.GoToLogin)
}
}
},
onToggleBody = { actions(CommentsAction.ToggleBody(it)) }
)
}
item {
Expand Down Expand Up @@ -188,7 +189,7 @@ private fun CommentsScreenPreview() {
author = "rikinm",
points = 69,
timeLabel = "2h ago",
body = "Hello There",
body = BodyState("Hello There"),
loggedIn = false,
upvoted = false,
upvoteUrl = "",
Expand Down Expand Up @@ -458,6 +459,7 @@ fun ItemHeader(
state: HeaderState,
modifier: Modifier = Modifier,
onLikeTapped: (HeaderState.Content) -> Unit,
onToggleBody: (Boolean) -> Unit
) {
Column(
modifier = modifier.background(color = MaterialTheme.colorScheme.background),
Expand Down Expand Up @@ -515,22 +517,35 @@ fun ItemHeader(
}
}
}
if (state.body != null) {
Box(
Modifier
.fillMaxWidth()
.heightIn(min = 40.dp)
.clip(RoundedCornerShape(8.dp))
.background(color = MaterialTheme.colorScheme.surface)
.padding(8.dp),
contentAlignment = Alignment.CenterStart
) {
Text(
text = state.body.parseAsHtml(),
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.labelSmall,
)
}
if (state.body.text != null) {
Column(
Modifier
.fillMaxWidth()
.wrapContentHeight()
.clip(RoundedCornerShape(8.dp))
.clickable { onToggleBody(!state.body.collapsed) }
.background(color = MaterialTheme.colorScheme.surface)
.padding(8.dp),
verticalArrangement = Arrangement.spacedBy(4.dp)
) {
Icon(
modifier = Modifier
.graphicsLayer {
rotationZ = if (state.body.collapsed) 180f else 0f
}
.size(12.dp),
painter = painterResource(R.drawable.ic_collapse),
tint = MaterialTheme.colorScheme.onSurface,
contentDescription = "Expand or Collapse"
)
Text(
text = state.body.text.parseAsHtml(),
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.labelSmall,
overflow = TextOverflow.Ellipsis,
maxLines = if (state.body.collapsed) 4 else Int.MAX_VALUE
)
}
}
}

Expand Down Expand Up @@ -631,14 +646,15 @@ private fun ItemHeaderPreview() {
author = "rikinm",
points = 69,
timeLabel = "2h ago",
body = "Wassup HN. I just built a sick new Hacker News Android client",
body = BodyState("Wassup HN. I just built a sick new Hacker News Android client. Lalalalalala hahahah"),
upvoted = false,
upvoteUrl = "",
),
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight(),
onLikeTapped = {}
onLikeTapped = {},
onToggleBody = {}
)
}
}
Expand All @@ -658,7 +674,8 @@ private fun ItemHeaderLoadingPreview() {
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight(),
onLikeTapped = {}
onLikeTapped = {},
onToggleBody = {}
)
}
}
Expand Down
Loading