--- a/sample/build.gradle.kts Tue May 06 12:51:17 2025 -0400
+++ b/sample/build.gradle.kts Tue May 06 12:55:03 2025 -0400
@@ -98,7 +98,7 @@
defaultConfig {
applicationId = "com.geekorum.aboutoss.sampleapp"
minSdk = 28
- targetSdk = 33
+ targetSdk = 35
versionCode = 1
versionName = "1.0"
--- a/sample/src/androidMain/AndroidManifest.xml Tue May 06 12:51:17 2025 -0400
+++ b/sample/src/androidMain/AndroidManifest.xml Tue May 06 12:55:03 2025 -0400
@@ -50,7 +50,7 @@
</activity>
<activity android:name=".PrebuiltLicencesMaterial2Activity"
- android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:theme="@style/Theme.AboutOss.Material2"
android:exported="false" />
<activity android:name=".PrebuiltLicencesMaterial3Activity"
--- a/sample/src/androidMain/kotlin/com/geekorum/aboutoss/sampleapp/MainActivity.kt Tue May 06 12:51:17 2025 -0400
+++ b/sample/src/androidMain/kotlin/com/geekorum/aboutoss/sampleapp/MainActivity.kt Tue May 06 12:55:03 2025 -0400
@@ -25,6 +25,7 @@
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
import com.geekorum.aboutoss.sampleapp.ui.theme.AboutOssTheme
import com.geekorum.aboutoss.sampleapp.ui.theme.OpenSourceLicenseTheme
import com.geekorum.aboutoss.ui.material3.OpenSourceLicensesActivity
@@ -33,6 +34,7 @@
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
setContent {
AboutOssTheme {
SampleApp(
--- a/sample/src/commonMain/kotlin/SampleApp.kt Tue May 06 12:51:17 2025 -0400
+++ b/sample/src/commonMain/kotlin/SampleApp.kt Tue May 06 12:55:03 2025 -0400
@@ -30,6 +30,7 @@
import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -43,11 +44,8 @@
onMaterial2Click: () -> Unit,
onMaterial3Click: () -> Unit,
) {
- Surface(
- modifier = Modifier.fillMaxSize(),
- color = MaterialTheme.colorScheme.background
- ) {
- Column(Modifier.fillMaxSize()) {
+ Scaffold {
+ Column(Modifier.fillMaxSize().padding(it)) {
LaunchActivitySection(onMaterial2Click, onMaterial3Click)
CustomViewer(modifier = Modifier.padding(horizontal = 16.dp))
}
--- a/sample/src/iosMain/kotlin/SampleAppIos.kt Tue May 06 12:51:17 2025 -0400
+++ b/sample/src/iosMain/kotlin/SampleAppIos.kt Tue May 06 12:55:03 2025 -0400
@@ -27,9 +27,9 @@
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel
+import com.geekorum.aboutoss.ui.material3.AdaptiveOpenSourceDependenciesScreen
import kotlinx.serialization.Serializable
import com.geekorum.aboutoss.ui.material.OpenSourceDependenciesNavHost as Material2OpenSourceDependenciesNavHost
-import com.geekorum.aboutoss.ui.material3.OpenSourceDependenciesNavHost as Material3OpenSourceDependenciesNavHost
@Serializable
@@ -85,7 +85,7 @@
val viewModel: OpenSourceLicensesViewModel = viewModel(initializer = {
createPrebuildOpenSourceLicensesViewModel()
})
- Material3OpenSourceDependenciesNavHost(
+ AdaptiveOpenSourceDependenciesScreen(
openSourceLicensesViewModel = viewModel,
navigateUp = navigateUp
)