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

Merge #74

Browse source 
74: BottomNavigation tweaks r=msfjarvis a=msfjarvis

Extracts the code into its own composable and slightly tweaks the UI to hide labels for inactive destinations. Blocked on #66

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2020-11-11 14:54:49 +00:00 • committed by GitHub
commit d2bc068f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

53
app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt
View file

@ -3,6 +3,7 @@ package dev.msfjarvis.lobsters.ui.main
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
@ -11,9 +12,11 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.setContent
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.viewinterop.viewModel
import androidx.navigation.NavHostController
import androidx.navigation.compose.KEY_ROUTE
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
@ -57,28 +60,9 @@ fun LobstersApp() {
Scaffold(
bottomBar = {
BottomNavigation {
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = navBackStackEntry?.arguments?.getString(KEY_ROUTE)
destinations.forEach { screen ->
BottomNavigationItem(
icon = { IconResource(resourceId = screen.badgeRes) },
label = { Text(stringResource(id = screen.labelRes)) },
selected = currentRoute == screen.route,
onClick = {
// This if check gives us a "singleTop" behavior where we do not create a
// second instance of the composable if we are already on that destination
if (currentRoute != screen.route) {
// This is the equivalent to popUpTo the start destination
navController.popBackStack(navController.graph.startDestination, false)
navController.navigate(screen.route)
}
}
)
}
}
LobstersBottomNav(navController, destinations)
},
) {
) { innerPadding ->
val hottestPostsListState = rememberLazyListState()
NavHost(navController, startDestination = Destination.Hottest.route) {
composable(Destination.Hottest.route) {
@ -87,14 +71,41 @@ fun LobstersApp() {
listState = hottestPostsListState,
overscrollAction = viewModel::getMorePosts,
saveAction = viewModel::savePost,
modifier = Modifier.padding(bottom = innerPadding.bottom),
)
}
composable(Destination.Saved.route) {
SavedPosts(
posts = savedPosts,
saveAction = viewModel::removeSavedPost,
modifier = Modifier.padding(bottom = innerPadding.bottom),
)
}
}
}
}
@Composable
fun LobstersBottomNav(
navController: NavHostController,
destinations: Array<Destination>,
) {
BottomNavigation {
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = navBackStackEntry?.arguments?.getString(KEY_ROUTE)
destinations.forEach { screen ->
BottomNavigationItem(
icon = { IconResource(resourceId = screen.badgeRes) },
label = { Text(stringResource(id = screen.labelRes)) },
selected = currentRoute == screen.route,
alwaysShowLabels = false,
onClick = {
navController.popBackStack(navController.graph.startDestination, false)
if (currentRoute != screen.route) {
navController.navigate(screen.route)
}
}
)
}
}
}