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

fix: restore navigation rail

Browse source 
Fixes #834
This commit is contained in:
Harsh Shandilya 2025-05-30 00:06:22 +05:30
parent bebbe4f82c
commit 30d035baa2
1 changed files with 113 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

213
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt
View file

@ -14,6 +14,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -48,6 +49,7 @@ import dev.msfjarvis.claw.android.MainActivity
import dev.msfjarvis.claw.android.ui.PostActions import dev.msfjarvis.claw.android.ui.PostActions
import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
import dev.msfjarvis.claw.android.ui.decorations.NavigationItem import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
import dev.msfjarvis.claw.android.ui.lists.DatabasePosts import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
import dev.msfjarvis.claw.android.ui.lists.NetworkPosts import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
@ -151,107 +153,118 @@ fun LobstersPostsScreen(
snackbarHost = { SnackbarHost(snackbarHostState) }, snackbarHost = { SnackbarHost(snackbarHostState) },
modifier = Modifier.semantics { testTagsAsResourceId = true }, modifier = Modifier.semantics { testTagsAsResourceId = true },
) { contentPadding -> ) { contentPadding ->
NavDisplay( Row {
backStack = clawBackStack.backStack, AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
modifier = modifier.hazeSource(hazeState), val currentDestination = clawBackStack.firstOrNull()
sceneStrategy = listDetailStrategy, ClawNavigationRail(
onBack = { keysToRemove -> repeat(keysToRemove) { clawBackStack.removeLastOrNull() } }, items = navItems,
predictivePopTransitionSpec = { currentNavKey = currentDestination,
slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) togetherWith navigateTo = { clawBackStack.add(it) },
slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200)) isVisible = clawBackStack.isOnTopLevelDestination(),
}, )
entryProvider = }
entryProvider { NavDisplay(
entry<Hottest>( backStack = clawBackStack.backStack,
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() }) modifier = modifier.hazeSource(hazeState),
) { sceneStrategy = listDetailStrategy,
setWebUri("https://lobste.rs/") onBack = { keysToRemove -> repeat(keysToRemove) { clawBackStack.removeLastOrNull() } },
NetworkPosts( predictivePopTransitionSpec = {
lazyPagingItems = hottestPosts, slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) togetherWith
listState = hottestListState, slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Newest>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri("https://lobste.rs/")
NetworkPosts(
lazyPagingItems = newestPosts,
listState = newestListState,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Saved>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri(null)
DatabasePosts(
items = savedPosts,
listState = savedListState,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Comments>(metadata = ListDetailSceneStrategy.detailPane()) { dest ->
CommentsPage(
postId = dest.postId,
postActions = postActions,
getSeenComments = viewModel::getSeenComments,
markSeenComments = viewModel::markSeenComments,
contentPadding = contentPadding,
openUserProfile = { clawBackStack.add(User(it)) },
)
}
entry<User>(
metadata =
NavDisplay.transitionSpec {
slideInHorizontally(
initialOffsetX = { it },
animationSpec = tween(200),
) togetherWith ExitTransition.KeepUntilTransitionsFinished
} +
NavDisplay.popTransitionSpec {
// Slide old content down, revealing the new content in place underneath
EnterTransition.None togetherWith
slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
} +
ListDetailSceneStrategy.extraPane()
) { dest ->
UserProfile(
username = dest.username,
contentPadding = contentPadding,
openUserProfile = { clawBackStack.add(User(it)) },
)
}
entry<Settings>(metadata = ListDetailSceneStrategy.extraPane()) {
SettingsScreen(
openInputStream = context.contentResolver::openInputStream,
openOutputStream = context.contentResolver::openOutputStream,
openLibrariesScreen = { clawBackStack.add(AboutLibraries) },
importPosts = viewModel::importPosts,
exportPostsAsJson = viewModel::exportPostsAsJson,
exportPostsAsHtml = viewModel::exportPostsAsHtml,
snackbarHostState = snackbarHostState,
contentPadding = contentPadding,
modifier = Modifier.fillMaxSize(),
)
}
entry<Search>(metadata = ListDetailSceneStrategy.extraPane()) {
setWebUri("https://lobste.rs/search")
SearchScreen(
viewModel = viewModel,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<AboutLibraries>(metadata = ListDetailSceneStrategy.extraPane()) {
LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
}
}, },
) entryProvider =
entryProvider {
entry<Hottest>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri("https://lobste.rs/")
NetworkPosts(
lazyPagingItems = hottestPosts,
listState = hottestListState,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Newest>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri("https://lobste.rs/")
NetworkPosts(
lazyPagingItems = newestPosts,
listState = newestListState,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Saved>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri(null)
DatabasePosts(
items = savedPosts,
listState = savedListState,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<Comments>(metadata = ListDetailSceneStrategy.detailPane()) { dest ->
CommentsPage(
postId = dest.postId,
postActions = postActions,
getSeenComments = viewModel::getSeenComments,
markSeenComments = viewModel::markSeenComments,
contentPadding = contentPadding,
openUserProfile = { clawBackStack.add(User(it)) },
)
}
entry<User>(
metadata =
NavDisplay.transitionSpec {
slideInHorizontally(
initialOffsetX = { it },
animationSpec = tween(200),
) togetherWith ExitTransition.KeepUntilTransitionsFinished
} +
NavDisplay.popTransitionSpec {
// Slide old content down, revealing the new content in place underneath
EnterTransition.None togetherWith
slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
} +
ListDetailSceneStrategy.extraPane()
) { dest ->
UserProfile(
username = dest.username,
contentPadding = contentPadding,
openUserProfile = { clawBackStack.add(User(it)) },
)
}
entry<Settings>(metadata = ListDetailSceneStrategy.extraPane()) {
SettingsScreen(
openInputStream = context.contentResolver::openInputStream,
openOutputStream = context.contentResolver::openOutputStream,
openLibrariesScreen = { clawBackStack.add(AboutLibraries) },
importPosts = viewModel::importPosts,
exportPostsAsJson = viewModel::exportPostsAsJson,
exportPostsAsHtml = viewModel::exportPostsAsHtml,
snackbarHostState = snackbarHostState,
contentPadding = contentPadding,
modifier = Modifier.fillMaxSize(),
)
}
entry<Search>(metadata = ListDetailSceneStrategy.extraPane()) {
setWebUri("https://lobste.rs/search")
SearchScreen(
viewModel = viewModel,
postActions = postActions,
contentPadding = contentPadding,
)
}
entry<AboutLibraries>(metadata = ListDetailSceneStrategy.extraPane()) {
LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
}
},
)
}
} }
} }