msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 16:27:06 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 3

common: refactor comments page to accept modifiers

Browse source
This commit is contained in:
Harsh Shandilya 2021-11-15 23:14:15 +05:30
parent 520430592c
commit dd621d90a5
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
View file

@ -120,7 +120,7 @@ fun LobstersApp(
modifier = Modifier.navigationBarsPadding(),
)
},
) { paddingValues ->
) {
NavHost(navController, startDestination = Destinations.Hottest) {
composable(Destinations.Hottest) {
setWebUri("https://lobste.rs/")
@ -139,7 +139,7 @@ fun LobstersApp(
CommentsPage(
postId = postId,
getDetails = viewModel::getPostComments,
paddingValues = paddingValues,
modifier = Modifier.navigationBarsPadding(),
)
}
}

24
common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt
View file

@ -1,11 +1,9 @@
package dev.msfjarvis.claw.common.comments
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.CircularProgressIndicator
@ -20,7 +18,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import dev.msfjarvis.claw.model.LobstersPostDetails
import dev.msfjarvis.lobsters.ui.comments.NetworkState
@ -28,9 +25,9 @@ import dev.msfjarvis.lobsters.ui.comments.NetworkState
@Composable
private fun CommentsPageInternal(
details: LobstersPostDetails,
bottomPadding: Dp,
modifier: Modifier = Modifier,
) {
LazyColumn(Modifier.padding(bottom = bottomPadding)) {
LazyColumn(modifier) {
item { CommentsHeader(postDetails = details) }
item { Spacer(modifier = Modifier.height(8.dp)) }
@ -46,7 +43,7 @@ private fun CommentsPageInternal(
fun CommentsPage(
postId: String,
getDetails: suspend (String) -> LobstersPostDetails,
paddingValues: PaddingValues,
modifier: Modifier = Modifier,
) {
var postDetails: NetworkState by remember { mutableStateOf(NetworkState.Loading) }
@ -56,18 +53,19 @@ fun CommentsPage(
is NetworkState.Success<*> -> {
CommentsPageInternal(
(postDetails as NetworkState.Success<LobstersPostDetails>).data,
paddingValues.calculateBottomPadding(),
modifier,
)
}
is NetworkState.Error -> TODO("Handle no network scenario")
NetworkState.Loading -> ProgressBar(paddingValues.calculateBottomPadding())
NetworkState.Loading -> ProgressBar(modifier)
}
}
@Composable
private fun ProgressBar(bottomPadding: Dp) {
Box(
modifier = Modifier.padding(bottom = bottomPadding).fillMaxSize(),
contentAlignment = Alignment.Center
) { CircularProgressIndicator(color = MaterialTheme.colors.secondary) }
private fun ProgressBar(
modifier: Modifier,
) {
Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
CircularProgressIndicator(color = MaterialTheme.colors.secondary)
}
}