msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 22:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: redesign bottom navigation bar

Browse source
This commit is contained in:
Harsh Shandilya 2024-08-28 15:16:42 +05:30
parent 4f3bafc051
commit 1de4916c9c
14 changed files with 211 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentsPage.kt
View file

@ -7,6 +7,7 @@
package dev.msfjarvis.claw.common.comments
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@ -34,6 +35,7 @@ fun CommentsPage(
htmlConverter: HTMLConverter,
getSeenComments: suspend (String) -> PostComments,
markSeenComments: (String, List<Comment>) -> Unit,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
openUserProfile: (String) -> Unit,
) {
@ -59,6 +61,7 @@ fun CommentsPage(
commentState = commentState,
markSeenComments = markSeenComments,
openUserProfile = openUserProfile,
contentPadding = contentPadding,
modifier = modifier.fillMaxSize(),
)
}

3
common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentsPageImpl.kt
View file

@ -52,6 +52,7 @@ internal fun CommentsPageInternal(
commentState: PostComments,
markSeenComments: (String, List<Comment>) -> Unit,
openUserProfile: (String) -> Unit,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
) {
val context = LocalContext.current
@ -68,7 +69,7 @@ internal fun CommentsPageInternal(
}
Surface(color = MaterialTheme.colorScheme.surfaceVariant) {
LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = 24.dp)) {
LazyColumn(modifier = modifier, contentPadding = contentPadding) {
item {
CommentsHeader(
post = details,

94
common/src/main/kotlin/dev/msfjarvis/claw/common/ui/FloatingNavigationBar.kt Normal file
View file

@ -0,0 +1,94 @@
/*
* Copyright © 2024 Harsh Shandilya.
* Use of this source code is governed by an MIT-style
* license that can be found in the LICENSE file or at
* https://opensource.org/licenses/MIT.
*/
package dev.msfjarvis.claw.common.ui
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BarChart
import androidx.compose.material.icons.filled.BrokenImage
import androidx.compose.material.icons.filled.HeartBroken
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBarDefaults
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Surface
import androidx.compose.material3.contentColorFor
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
// Taken from Chris Banes' amazing app Tivi
// https://github.com/chrisbanes/tivi/blob/836d596d74959f4235ca2395b5bbfdd6fd9c9a9e/ui/root/src/commonMain/kotlin/app/tivi/home/Home.kt#L173
@Composable
fun FloatingNavigationBar(
modifier: Modifier = Modifier,
shape: Shape = MaterialTheme.shapes.extraLarge,
containerColor: Color = NavigationBarDefaults.containerColor,
contentColor: Color = MaterialTheme.colorScheme.contentColorFor(containerColor),
tonalElevation: Dp = NavigationBarDefaults.Elevation,
content: @Composable RowScope.() -> Unit,
) {
Surface(
color = containerColor,
contentColor = contentColor,
tonalElevation = tonalElevation,
shape = shape,
border =
BorderStroke(
width = 0.5.dp,
brush =
Brush.verticalGradient(
colors =
listOf(
MaterialTheme.colorScheme.surfaceVariant,
MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
)
),
),
modifier = modifier,
) {
Row(
modifier = Modifier.padding(horizontal = 8.dp).fillMaxWidth().height(80.dp).selectableGroup(),
horizontalArrangement = Arrangement.spacedBy(8.dp),
content = content,
)
}
}
@Preview
@Composable
private fun FloatingNavigationBarPreview() {
FloatingNavigationBar {
NavigationBarItem(
selected = true,
onClick = {},
icon = { Icon(imageVector = Icons.Filled.HeartBroken, contentDescription = "Home") },
)
NavigationBarItem(
selected = true,
onClick = {},
icon = { Icon(imageVector = Icons.Filled.BarChart, contentDescription = "Home") },
)
NavigationBarItem(
selected = true,
onClick = {},
icon = { Icon(imageVector = Icons.Filled.BrokenImage, contentDescription = "Home") },
)
}
}

4
common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt
View file

@ -9,6 +9,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.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
@ -45,6 +46,7 @@ fun UserProfile(
username: String,
getProfile: suspend (username: String) -> User,
openUserProfile: (String) -> Unit,
contentPadding: PaddingValues,
modifier: Modifier = Modifier,
) {
val user by
@ -67,7 +69,7 @@ fun UserProfile(
}
is Error -> {
val error = user as Error
Box(modifier = Modifier.fillMaxSize()) {
Box(modifier = Modifier.padding(contentPadding).fillMaxSize()) {
NetworkError(
label = error.description,
error = error.error,