Skip to content

feat(ui): navigation drawer holding every destination #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiteRelEnby merged 2 commits into from
Jul 27, 2026
Merged

feat(ui): navigation drawer holding every destination #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a7f04
feat(ui): navigation drawer holding every destination
SiteRelEnby Jul 27, 2026
fdf6516
Merge branch 'main' into feat/nav-drawer
SiteRelEnby Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 68 additions & 13 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/SheafApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ import systems.lupine.sheaf.ui.components.LocalDisplayTimeZone
import systems.lupine.sheaf.ui.components.LocalFileCdnBase
import systems.lupine.sheaf.ui.debug.DebugScreen
import systems.lupine.sheaf.ui.groups.GroupDetailScreen
import systems.lupine.sheaf.ui.groups.GroupsScreen
import systems.lupine.sheaf.ui.analytics.AnalyticsScreen
import systems.lupine.sheaf.ui.history.HistoryScreen
import systems.lupine.sheaf.ui.journals.JournalDetailScreen
import systems.lupine.sheaf.ui.journals.JournalsScreen
import systems.lupine.sheaf.ui.home.HomeScreen
import systems.lupine.sheaf.ui.navigation.AppDrawerContent
import systems.lupine.sheaf.ui.navigation.drawerRoutes
import systems.lupine.sheaf.ui.members.MemberDetailScreen
import systems.lupine.sheaf.ui.members.MemberProfileScreen
import systems.lupine.sheaf.ui.members.MembersScreen
Expand Down Expand Up @@ -66,6 +67,7 @@ import systems.lupine.sheaf.ui.admin.AdminPanelScreen
import systems.lupine.sheaf.ui.settings.SettingsScreen
import systems.lupine.sheaf.ui.settings.SystemEditScreen
import systems.lupine.sheaf.ui.settings.SystemSafetyScreen
import kotlinx.coroutines.launch

// ── Route constants ───────────────────────────────────────────────────────────

Expand Down Expand Up @@ -159,14 +161,24 @@ private val MAX_CONTENT_WIDTH = 840.dp
// it gets (so capping it would just cost columns).
private val FULL_BLEED_ROUTES = setOf(Routes.RELATIONSHIP_GRAPH, Routes.HOME)

// The fast path, not the whole app: Home plus three destinations, with a
// "More" entry alongside them that opens the drawer. Everything else (Polls,
// Analytics, Reminders, Relationships, Files, ...) lives in the drawer, which
// is the complete list.
val topLevelDestinations = listOf(
TopLevelDest(Routes.HOME, "Home", Icons.Filled.Home, Icons.Outlined.Home),
TopLevelDest(Routes.PEOPLE, "Members", Icons.Filled.People, Icons.Outlined.People),
TopLevelDest(Routes.HISTORY, "History", Icons.Filled.History, Icons.Outlined.History),
TopLevelDest(Routes.JOURNALS, "Journals", Icons.AutoMirrored.Filled.MenuBook, Icons.AutoMirrored.Outlined.MenuBook),
TopLevelDest(Routes.POLLS, "Polls", Icons.Filled.HowToVote, Icons.Outlined.HowToVote),
)

// Destinations that keep the bar/rail on screen: the bar's own four, plus
// everything reachable from the drawer. Without the drawer routes here,
// stepping to a drawer destination would drop the app chrome and strand the
// user on a screen with no way back but the system back gesture.
private val chromeRoutes: Set<String> =
topLevelDestinations.mapTo(mutableSetOf()) { it.route } + drawerRoutes

// ── Root composable ───────────────────────────────────────────────────────────

@Composable
Expand Down Expand Up @@ -216,7 +228,7 @@ fun SheafApp(
// Decide whether to show the bottom bar based on current destination
val navBackStack by navController.currentBackStackEntryAsState()
val currentRoute = navBackStack?.destination?.route
val showBottomBar = currentRoute in topLevelDestinations.map { it.route }
val showBottomBar = currentRoute in chromeRoutes

// Provide the file CDN base (image hosted/external classification) and the
// resolved display timezone (timestamp rendering) app-wide.
Expand All @@ -235,22 +247,44 @@ fun SheafApp(
wide -> NavigationSuiteType.NavigationRail
else -> NavigationSuiteType.NavigationBar
}

val drawerState = rememberDrawerState(DrawerValue.Closed)
val scope = rememberCoroutineScope()
// Switching top-level destination is a "start over here" move, not a step
// deeper, so drawer and bar navigation share the same options: reset to the
// graph start, keep each destination's own scroll/selection state.
val goTo: (String) -> Unit = { route ->
navController.navigate(route) {
popUpTo(navController.graph.findStartDestination().id) { saveState = true }
launchSingleTop = true
restoreState = true
}
}
// Edge-swipe opens the drawer only where the bar/rail is showing. On detail
// screens, editors and the pan/zoom graph, a horizontal drag belongs to the
// content; a swipe that is already dragging the drawer open can always
// close it again.
ModalNavigationDrawer(
drawerState = drawerState,
gesturesEnabled = drawerState.isOpen || showBottomBar,
drawerContent = {
AppDrawerContent(
currentRoute = currentRoute,
onNavigate = { route ->
scope.launch { drawerState.close() }
goTo(route)
},
)
},
) {
NavigationSuiteScaffold(
layoutType = navSuiteType,
navigationSuiteItems = {
topLevelDestinations.forEach { dest ->
val selected = currentDest?.hierarchy?.any { it.route == dest.route } == true
item(
selected = selected,
onClick = {
navController.navigate(dest.route) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
onClick = { goTo(dest.route) },
icon = {
Icon(
if (selected) dest.selectedIcon else dest.unselectedIcon,
Expand All @@ -260,6 +294,18 @@ fun SheafApp(
label = { Text(dest.label) },
)
}
// Overflow entry. Reads as selected whenever the current screen is
// a drawer destination that has no slot of its own, so the chrome
// still shows where you are.
val onDrawerDest = currentRoute != null &&
currentRoute in drawerRoutes &&
topLevelDestinations.none { it.route == currentRoute }
item(
selected = onDrawerDest,
onClick = { scope.launch { drawerState.open() } },
icon = { Icon(Icons.Filled.Menu, contentDescription = "More") },
label = { Text("More") },
)
},
) {
// Cap content width on wide windows so forms and lists don't stretch
Expand Down Expand Up @@ -344,12 +390,20 @@ fun SheafApp(
val memberId = backStack.arguments?.getString("memberId") ?: return@composable
MemberDetailScreen(memberId = memberId, onNavigateUp = { navController.navigateUp() })
}
// Same screen as PEOPLE, opened on its Groups tab. Groups is a tab
// rather than a screen of its own, but it still earns a drawer
// destination, and landing on Members after tapping Groups would be
// its own small betrayal.
composable(Routes.GROUPS) {
GroupsScreen(
PeopleScreen(
onMemberClick = { id ->
navController.navigate(if (id == "new") "members/new" else "members/$id")
},
onGroupClick = { id ->
navController.navigate(if (id == "new") "groups/new" else "groups/$id")
},
onNavigateToSettings = { navController.navigate(Routes.SETTINGS) },
startOnGroups = true,
)
}
composable(Routes.GROUP_DETAIL) { backStack ->
Expand Down Expand Up @@ -713,4 +767,5 @@ fun SheafApp(
}
}
}
}
}
94 changes: 9 additions & 85 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/groups/GroupsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,92 +26,16 @@ import systems.lupine.sheaf.ui.components.*
import systems.lupine.sheaf.ui.relationships.REL_SCOPE_GROUP
import systems.lupine.sheaf.ui.relationships.RelationshipsEditor

// ── Groups list ───────────────────────────────────────────────────────────────
// ── Group list card ───────────────────────────────────────────────────────────

@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun GroupsScreen(
onGroupClick: (String) -> Unit,
onNavigateToSettings: () -> Unit,
viewModel: GroupsViewModel = hiltViewModel(),
) {
val state by viewModel.state.collectAsState()
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()

val lifecycleOwner = LocalLifecycleOwner.current
DisposableEffect(lifecycleOwner) {
val observer = LifecycleEventObserver { _, event ->
if (event == Lifecycle.Event.ON_RESUME) viewModel.load()
}
lifecycleOwner.lifecycle.addObserver(observer)
onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
}

Scaffold(
contentWindowInsets = WindowInsets(0),
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
SheafLargeFlexibleTopAppBar(
title = { Text("Groups") },
scrollBehavior = scrollBehavior,
actions = {
IconButton(onClick = onNavigateToSettings) {
Icon(Icons.Default.Settings, contentDescription = "Settings")
}
},
)
},
floatingActionButton = {
FloatingActionButton(onClick = { onGroupClick("new") }) {
Icon(Icons.Default.Add, contentDescription = "Add group")
}
},
) { padding ->
when {
state.isLoading -> Box(Modifier.fillMaxSize().padding(padding), contentAlignment = Alignment.Center) {
CircularProgressIndicator()
}
state.error != null -> Column(
Modifier.fillMaxSize().padding(padding).padding(16.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
) {
ErrorBanner(state.error!!)
Button(onClick = { viewModel.load() }) { Text("Retry") }
}
state.groups.isEmpty() -> EmptyState(
icon = Icons.Default.FolderOpen,
title = "No groups yet",
subtitle = "Tap + to create your first group.",
modifier = Modifier.fillMaxSize().padding(padding),
)
else -> LazyColumn(
contentPadding = PaddingValues(
start = 16.dp, end = 16.dp,
top = padding.calculateTopPadding() + 8.dp,
bottom = padding.calculateBottomPadding() + 80.dp,
),
verticalArrangement = Arrangement.spacedBy(10.dp),
) {
val ordered = orderGroupsHierarchically(state.groups)
items(ordered, key = { it.first.id }) { (group, depth) ->
GroupCard(
group = group,
depth = depth,
expanded = group.id in state.expanded,
members = state.groupMembers[group.id],
loading = group.id in state.loadingMembers,
error = state.memberLoadErrors[group.id],
onToggleExpand = { viewModel.toggleExpand(group.id) },
onEdit = { onGroupClick(group.id) },
)
}
}
}
}
}

@Composable
private fun GroupCard(
/**
* A group row: indented by nesting depth, tap to expand its members inline,
* with an edit affordance. Lives here next to the group detail screen but is
* rendered by the Groups tab of the People screen, which is the only place
* groups are listed.
*/
internal fun GroupCard(
group: systems.lupine.sheaf.data.model.GroupRead,
depth: Int,
expanded: Boolean,
Expand Down Expand Up @@ -523,7 +447,7 @@ private fun collectDescendants(
* with no parent (or a parent that isn't in the set); orphans fall back to
* roots so nothing is dropped.
*/
private fun orderGroupsHierarchically(
internal fun orderGroupsHierarchically(
groups: List<systems.lupine.sheaf.data.model.GroupRead>,
): List<Pair<systems.lupine.sheaf.data.model.GroupRead, Int>> {
val byId = groups.associateBy { it.id }
Expand Down
Loading
Loading