bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-07-24 03:36:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: navigation drawer to use state management and auto-close on item selection

Browse Source
This commit is contained in:
Barnabas Balogh
2026-05-13 21:00:22 +02:00
parent beae723372
commit dbcabd0848
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawer.kt
View File

@@ -30,12 +30,14 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.tv.material3.DrawerState
import androidx.tv.material3.DrawerValue import androidx.tv.material3.DrawerValue
import androidx.tv.material3.Icon import androidx.tv.material3.Icon
import androidx.tv.material3.NavigationDrawer import androidx.tv.material3.NavigationDrawer
import androidx.tv.material3.NavigationDrawerItem import androidx.tv.material3.NavigationDrawerItem
import androidx.tv.material3.Text import androidx.tv.material3.Text
import androidx.tv.material3.darkColorScheme import androidx.tv.material3.darkColorScheme
import androidx.tv.material3.rememberDrawerState
import hu.bbara.purefin.core.navigation.Route import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.tv.R import hu.bbara.purefin.tv.R
import androidx.tv.material3.MaterialTheme as TvMaterialTheme import androidx.tv.material3.MaterialTheme as TvMaterialTheme
@@ -52,11 +54,14 @@ fun TvNavigationDrawer(
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
ProvideTvDrawerTheme { ProvideTvDrawerTheme {
val drawerState = rememberDrawerState(DrawerValue.Closed)
NavigationDrawer( NavigationDrawer(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
drawerContent = { drawerValue -> drawerState = drawerState,
drawerContent = {
TvNavigationDrawerRail( TvNavigationDrawerRail(
drawerValue = drawerValue, drawerState = drawerState,
destinations = destinations, destinations = destinations,
selectedDestination = selectedDestination, selectedDestination = selectedDestination,
onDestinationSelected = onDestinationSelected onDestinationSelected = onDestinationSelected
@@ -135,12 +140,12 @@ fun TvDrawerHeader(
@Composable @Composable
private fun androidx.tv.material3.NavigationDrawerScope.TvNavigationDrawerRail( private fun androidx.tv.material3.NavigationDrawerScope.TvNavigationDrawerRail(
drawerValue: DrawerValue, drawerState: DrawerState,
destinations: List<TvDrawerDestinationItem>, destinations: List<TvDrawerDestinationItem>,
selectedDestination: Route, selectedDestination: Route,
onDestinationSelected: (Route) -> Unit, onDestinationSelected: (Route) -> Unit,
) { ) {
val expanded = drawerValue == DrawerValue.Open val expanded = drawerState.currentValue == DrawerValue.Open
val scheme = MaterialTheme.colorScheme val scheme = MaterialTheme.colorScheme
var hasDrawerFocus by remember { mutableStateOf(false) } var hasDrawerFocus by remember { mutableStateOf(false) }
@@ -164,7 +169,12 @@ private fun androidx.tv.material3.NavigationDrawerScope.TvNavigationDrawerRail(
val isSelected = destination.destination == selectedDestination val isSelected = destination.destination == selectedDestination
NavigationDrawerItem( NavigationDrawerItem(
selected = isSelected, selected = isSelected,
onClick = { onDestinationSelected(destination.destination) }, onClick = {
onDestinationSelected(destination.destination)
if (isSelected) {
drawerState.setValue(DrawerValue.Closed)
}
},
modifier = Modifier modifier = Modifier
.testTag("$TvDrawerItemTagPrefix$index") .testTag("$TvDrawerItemTagPrefix$index")
.semantics { selected = isSelected } .semantics { selected = isSelected }