diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt index fbef477a..c76bb351 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt @@ -75,7 +75,7 @@ fun NetworkPosts( modifier = Modifier.fillMaxWidth() .wrapContentWidth(Alignment.CenterHorizontally) - .padding(top = 16.dp), + .padding(vertical = 16.dp), ) } } diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt index 5d4aacd4..0cc154e4 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt @@ -126,6 +126,10 @@ fun CommentsPage( ) } } - Loading -> ProgressBar() + Loading -> { + Box(modifier = Modifier.fillMaxSize()) { + ProgressBar(modifier = Modifier.align(Alignment.Center)) + } + } } } diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/ProgressBar.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/ProgressBar.kt index c9fa276d..cef8f154 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/ProgressBar.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/ProgressBar.kt @@ -7,7 +7,6 @@ package dev.msfjarvis.claw.common.ui import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -16,7 +15,7 @@ import androidx.compose.ui.Modifier @Composable fun ProgressBar(modifier: Modifier = Modifier) { - Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Box(modifier = modifier, contentAlignment = Alignment.Center) { LinearProgressIndicator(color = MaterialTheme.colorScheme.secondary) } } diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt index e94b253f..2c736ed7 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt @@ -7,6 +7,7 @@ package dev.msfjarvis.claw.common.user import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -60,9 +61,19 @@ fun UserProfile( } is Error -> { val error = user as Error - NetworkError(label = error.description, error = error.error) + Box(modifier = Modifier.fillMaxSize()) { + NetworkError( + label = error.description, + error = error.error, + modifier = Modifier.align(Alignment.Center), + ) + } + } + Loading -> { + Box(modifier = Modifier.fillMaxSize()) { + ProgressBar(modifier = Modifier.align(Alignment.Center)) + } } - Loading -> ProgressBar() } }