msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-15 02:57:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: add adaptive hints to Nav3Screen

Browse source
This commit is contained in:
Harsh Shandilya 2025-05-25 20:47:35 +05:30
parent a3f15a911e
commit f7c8f968e5
1 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

59
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/Nav3Screen.kt
View file

@ -20,6 +20,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
@ -65,7 +68,7 @@ import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentMapOf import kotlinx.collections.immutable.persistentMapOf
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
@Composable @Composable
fun Nav3Screen( fun Nav3Screen(
urlLauncher: UrlLauncher, urlLauncher: UrlLauncher,
@ -148,14 +151,16 @@ fun Nav3Screen(
NavDisplay( NavDisplay(
backStack = clawBackStack.backStack, backStack = clawBackStack.backStack,
modifier = modifier.hazeSource(hazeState), modifier = modifier.hazeSource(hazeState),
onBack = { clawBackStack.removeLastOrNull() }, onBack = { keysToRemove -> repeat(keysToRemove) { clawBackStack.removeLastOrNull() } },
predictivePopTransitionSpec = { predictivePopTransitionSpec = {
slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) togetherWith slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) togetherWith
slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200)) slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
}, },
entryProvider = entryProvider =
entryProvider { entryProvider {
entry<Hottest> { entry<Hottest>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri("https://lobste.rs/") setWebUri("https://lobste.rs/")
NetworkPosts( NetworkPosts(
lazyPagingItems = hottestPosts, lazyPagingItems = hottestPosts,
@ -164,7 +169,9 @@ fun Nav3Screen(
contentPadding = contentPadding, contentPadding = contentPadding,
) )
} }
entry<Newest> { entry<Newest>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri("https://lobste.rs/") setWebUri("https://lobste.rs/")
NetworkPosts( NetworkPosts(
lazyPagingItems = newestPosts, lazyPagingItems = newestPosts,
@ -173,7 +180,9 @@ fun Nav3Screen(
contentPadding = contentPadding, contentPadding = contentPadding,
) )
} }
entry<Saved> { entry<Saved>(
metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
) {
setWebUri(null) setWebUri(null)
DatabasePosts( DatabasePosts(
items = savedPosts, items = savedPosts,
@ -182,20 +191,7 @@ fun Nav3Screen(
contentPadding = contentPadding, contentPadding = contentPadding,
) )
} }
entry<Settings> { entry<Comments>(metadata = ListDetailSceneStrategy.detailPane()) { dest ->
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<Comments> { dest ->
CommentsPage( CommentsPage(
postId = dest.postId, postId = dest.postId,
postActions = postActions, postActions = postActions,
@ -217,7 +213,8 @@ fun Nav3Screen(
// Slide old content down, revealing the new content in place underneath // Slide old content down, revealing the new content in place underneath
EnterTransition.None togetherWith EnterTransition.None togetherWith
slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200)) slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
} } +
ListDetailSceneStrategy.extraPane()
) { dest -> ) { dest ->
UserProfile( UserProfile(
username = dest.username, username = dest.username,
@ -226,7 +223,20 @@ fun Nav3Screen(
openUserProfile = { clawBackStack.add(User(it)) }, openUserProfile = { clawBackStack.add(User(it)) },
) )
} }
entry<Search> { 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") setWebUri("https://lobste.rs/search")
SearchScreen( SearchScreen(
viewModel = viewModel, viewModel = viewModel,
@ -234,10 +244,15 @@ fun Nav3Screen(
contentPadding = contentPadding, contentPadding = contentPadding,
) )
} }
entry<AboutLibraries> { entry<AboutLibraries>(metadata = ListDetailSceneStrategy.extraPane()) {
LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize()) LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
} }
}, },
) )
} }
} }
@Composable
private fun Placeholder(modifier: Modifier = Modifier) {
Text(text = "Placeholder", modifier = modifier)
}