Skip to content

Commit ed92a70

Browse files
committed
chore: return walletNavController to inner composable
1 parent b61dfed commit ed92a70

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

app/src/main/java/to/bitkit/ui/ContentView.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ fun ContentView(
197197
backupsViewModel: BackupsViewModel,
198198
) {
199199
val navController = rememberNavController()
200-
val walletNavController = rememberNavController()
201200
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
202201
val context = LocalContext.current
203202
val lifecycle = LocalLifecycleOwner.current.lifecycle
@@ -450,7 +449,6 @@ fun ContentView(
450449
) {
451450
RootNavHost(
452451
navController = navController,
453-
walletNavHostController = walletNavController,
454452
drawerState = drawerState,
455453
walletViewModel = walletViewModel,
456454
appViewModel = appViewModel,
@@ -499,7 +497,6 @@ fun ContentView(
499497
@Composable
500498
private fun RootNavHost(
501499
navController: NavHostController,
502-
walletNavHostController: NavHostController,
503500
drawerState: DrawerState,
504501
walletViewModel: WalletViewModel,
505502
appViewModel: AppViewModel,
@@ -517,7 +514,6 @@ private fun RootNavHost(
517514
activityListViewModel = activityListViewModel,
518515
settingsViewModel = settingsViewModel,
519516
navController = navController,
520-
walletNavController = walletNavHostController,
521517
drawerState = drawerState
522518
)
523519
allActivity(
@@ -777,7 +773,6 @@ private fun NavGraphBuilder.home(
777773
activityListViewModel: ActivityListViewModel,
778774
settingsViewModel: SettingsViewModel,
779775
navController: NavHostController,
780-
walletNavController: NavHostController,
781776
drawerState: DrawerState,
782777
) {
783778
composable<Routes.Home> {
@@ -787,7 +782,6 @@ private fun NavGraphBuilder.home(
787782
activityListViewModel = activityListViewModel,
788783
settingsViewModel = settingsViewModel,
789784
rootNavController = navController,
790-
walletNavController = walletNavController,
791785
drawerState = drawerState,
792786
)
793787
}

app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.navigation.NavController
1111
import androidx.navigation.NavHostController
1212
import androidx.navigation.compose.NavHost
1313
import androidx.navigation.compose.composable
14+
import androidx.navigation.compose.rememberNavController
1415
import dev.chrisbanes.haze.hazeSource
1516
import dev.chrisbanes.haze.rememberHazeState
1617
import kotlinx.serialization.Serializable
@@ -36,7 +37,6 @@ fun HomeNav(
3637
activityListViewModel: ActivityListViewModel,
3738
settingsViewModel: SettingsViewModel,
3839
rootNavController: NavController,
39-
walletNavController: NavHostController,
4040
drawerState: DrawerState,
4141
) {
4242
val uiState: MainUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
@@ -47,6 +47,9 @@ fun HomeNav(
4747
settingsViewModel.setNotificationPreference(granted)
4848
}
4949
)
50+
51+
val walletNavController = rememberNavController()
52+
5053
Box(
5154
modifier = Modifier
5255
.fillMaxSize()

0 commit comments

Comments
 (0)