diff -r 764faee147cc -r b14d574cc2b1 ui/material2/src/androidMain/kotlin/OpenSourceLicensesActivity.kt --- a/ui/material2/src/androidMain/kotlin/OpenSourceLicensesActivity.kt Tue Apr 22 17:56:14 2025 -0400 +++ b/ui/material2/src/androidMain/kotlin/OpenSourceLicensesActivity.kt Tue Apr 22 18:44:52 2025 -0400 @@ -21,15 +21,11 @@ */ package com.geekorum.aboutoss.ui.material -import android.net.Uri import android.os.Bundle import androidx.activity.compose.setContent import androidx.activity.viewModels import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable -import androidx.navigation.compose.NavHost -import androidx.navigation.compose.composable -import androidx.navigation.compose.rememberNavController import com.geekorum.aboutoss.core.gms.GmsLicenseInfoRepository import com.geekorum.aboutoss.ui.common.BaseOpensourceLicenseActivity import com.geekorum.aboutoss.ui.common.Factory @@ -60,7 +56,7 @@ super.onCreate(savedInstanceState) setContent { themeProvider { - DependencyNavHost( + OpenSourceDependenciesNavHost( openSourceLicensesViewModel = viewModel, navigateUp = { if (!onNavigateUp()) { @@ -83,33 +79,3 @@ } } - -@Composable -fun DependencyNavHost( - openSourceLicensesViewModel: OpenSourceLicensesViewModel, - navigateUp: () -> Unit -) { - val navController = rememberNavController() - NavHost(navController, startDestination = "dependencies") { - composable("dependencies") { - OpenSourceDependenciesListScreen( - viewModel = openSourceLicensesViewModel, - onDependencyClick = { - navController.navigate("dependency_license/${Uri.encode(it)}") - }, - onUpClick = navigateUp - ) - } - composable("dependency_license/{dependency}") { - val dependency = requireNotNull(it.arguments?.getString("dependency")) - OpenSourceLicenseScreen( - viewModel = openSourceLicensesViewModel, - dependency = dependency, - onUpClick = { - navController.popBackStack() - }, - ) - } - } -} -