ui:material3: add modifier parameter to AdaptiveOpenSourceDependenciesScreen and OpenSourceDependenciesNavHost
--- a/ui/material3/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material3/AdaptiveOpenSourceDependenciesScreen.kt Tue May 06 12:50:21 2025 -0400
+++ b/ui/material3/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material3/AdaptiveOpenSourceDependenciesScreen.kt Tue May 06 12:51:17 2025 -0400
@@ -96,7 +96,8 @@
@Composable
fun AdaptiveOpenSourceDependenciesScreen(
openSourceLicensesViewModel: OpenSourceLicensesViewModel,
- navigateUp: () -> Unit
+ navigateUp: () -> Unit,
+ modifier: Modifier = Modifier
) {
val dependencies by openSourceLicensesViewModel.dependenciesList.collectAsStateWithLifecycle(emptyList())
val browserLauncher = rememberBrowserLauncher()
@@ -109,7 +110,7 @@
}
AdaptiveOpenSourceDependenciesScreen(
- modifier = Modifier.background(MaterialTheme.colorScheme.surface),
+ modifier = modifier.background(MaterialTheme.colorScheme.surface),
dependenciesListPane = {
AdaptiveOpenSourceDependenciesListPane(
isSinglePane = isSinglePane,
--- a/ui/material3/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material3/OpenSourceDependenciesNavHost.kt Tue May 06 12:50:21 2025 -0400
+++ b/ui/material3/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material3/OpenSourceDependenciesNavHost.kt Tue May 06 12:51:17 2025 -0400
@@ -22,6 +22,7 @@
package com.geekorum.aboutoss.ui.material3
import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
@@ -29,8 +30,12 @@
import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel
import kotlinx.serialization.Serializable
+// should be private but we have a weird IllegalAccessException on Desktop
+// IllegalAccessException: class kotlinx.serialization.internal.PlatformKt
+// cannot access a member of class com.geekorum.aboutoss.ui.material.DependenciesList
+// with modifiers "public static final"
@Serializable
-private object DependenciesList
+internal object DependenciesList
@Serializable
private data class DependencyLicense(
@@ -43,10 +48,11 @@
@Composable
fun OpenSourceDependenciesNavHost(
openSourceLicensesViewModel: OpenSourceLicensesViewModel,
- navigateUp: () -> Unit
+ navigateUp: () -> Unit,
+ modifier: Modifier = Modifier
) {
val navController = rememberNavController()
- NavHost(navController, startDestination = DependenciesList) {
+ NavHost(navController, startDestination = DependenciesList, modifier = modifier) {
composable<DependenciesList> {
OpenSourceDependenciesListScreen(
viewModel = openSourceLicensesViewModel,