@@ -6,6 +6,7 @@ import androidx.activity.compose.setContent
66import androidx.activity.enableEdgeToEdge
77import androidx.activity.result.contract.ActivityResultContracts
88import androidx.compose.foundation.layout.fillMaxSize
9+ import androidx.compose.foundation.layout.padding
910import androidx.compose.material3.Scaffold
1011import androidx.compose.ui.Modifier
1112import androidx.lifecycle.lifecycleScope
@@ -23,8 +24,6 @@ import com.looker.droidify.compose.repoEdit.navigation.navigateToRepoEdit
2324import com.looker.droidify.compose.repoEdit.navigation.repoEdit
2425import com.looker.droidify.compose.repoList.navigation.navigateToRepoList
2526import com.looker.droidify.compose.repoList.navigation.repoList
26- import com.looker.droidify.compose.settings.navigation.navigateToSettings
27- import com.looker.droidify.compose.settings.navigation.settings
2827import com.looker.droidify.compose.theme.DroidifyTheme
2928import com.looker.droidify.data.RepoRepository
3029import com.looker.droidify.model.Repository
@@ -57,24 +56,23 @@ class MainComposeActivity : ComponentActivity() {
5756 setContent {
5857 DroidifyTheme {
5958 val navController = rememberNavController()
60-
6159 Scaffold (modifier = Modifier .fillMaxSize()) { innerPadding ->
62- innerPadding
6360 NavHost (
61+ modifier = Modifier .padding(innerPadding),
6462 navController = navController,
6563 startDestination = AppList ,
6664 ) {
6765 home(
6866 onNavigateToApps = { navController.navigateToAppList() },
6967 onNavigateToRepos = { navController.navigateToRepoList() },
70- onNavigateToSettings = { navController.navigateToSettings() },
68+ onNavigateToSettings = {},
7169 )
7270 appList(
7371 onAppClick = { packageName ->
7472 navController.navigateToAppDetail(packageName)
7573 },
7674 onNavigateToRepos = { navController.navigateToRepoList() },
77- onNavigateToSettings = { navController.navigateToSettings() },
75+ onNavigateToSettings = {},
7876 )
7977
8078 repoList(
@@ -94,10 +92,6 @@ class MainComposeActivity : ComponentActivity() {
9492 )
9593
9694 repoEdit(onBackClick = { navController.popBackStack() })
97-
98- settings(
99- onBackClick = { navController.popBackStack() },
100- )
10195 }
10296 }
10397 }
0 commit comments