File tree Expand file tree Collapse file tree
kotlin/com/softartdev/sample
commonMain/kotlin/com/softartdev/shared Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -11,8 +11,8 @@ buildscript {
1111 dependencies {
1212 classpath(" org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra[" kotlin_version" ]} " )
1313 classpath(" org.jetbrains.kotlin:compose-compiler-gradle-plugin:${rootProject.extra[" kotlin_version" ]} " )
14- classpath(" com.android.tools.build:gradle:8.8.1 " )
15- classpath(" org.jetbrains.compose:compose-gradle-plugin:1.7.1 " )
14+ classpath(" com.android.tools.build:gradle:8.9.0 " )
15+ classpath(" org.jetbrains.compose:compose-gradle-plugin:1.7.3 " )
1616 }
1717}
1818allprojects {
Original file line number Diff line number Diff line change 11GROUP =io.github.softartdev
2- VERSION =0.9.2
2+ VERSION =0.9.3
33
44org.gradle.jvmargs =-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding =UTF-8 -Dkotlin.daemon.jvm.options\=" -Xmx16g" -XX:+UseParallelGC -XX:MaxMetaspaceSize =1g
55org.gradle.parallel =true
Original file line number Diff line number Diff line change 1- # Mon Jan 27 23:56:23 GET 2025
1+ # Thu Mar 06 01:26:53 GET 2025
22distributionBase =GRADLE_USER_HOME
33distributionPath =wrapper/dists
4- distributionUrl =https\://services.gradle.org/distributions/gradle-8.12.1 -all.zip
4+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.13 -all.zip
55networkTimeout =10000
66validateDistributionUrl =true
77zipStoreBase =GRADLE_USER_HOME
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ kotlin {
2828
2929 androidMain.dependencies {
3030 implementation(compose.preview)
31- implementation(" androidx.activity:activity-compose:1.10.0 " )
31+ implementation(" androidx.activity:activity-compose:1.10.1 " )
3232 }
3333 commonMain.dependencies {
3434 api(project(" :theme:theme-material" ))
Original file line number Diff line number Diff line change 22<manifest xmlns : android =" http://schemas.android.com/apk/res/android" >
33 <application
44 android : supportsRtl =" true"
5- android : theme =" @android:style/Theme.Material.Light. NoActionBar"
5+ android : theme =" @android:style/Theme.Material.NoActionBar"
66 android : icon =" @android:mipmap/sym_def_app_icon" >
77 <activity android : name =" .MainActivity"
88 android : exported =" true"
Original file line number Diff line number Diff line change @@ -3,14 +3,18 @@ package com.softartdev.sample
33import android.os.Bundle
44import androidx.activity.ComponentActivity
55import androidx.activity.compose.setContent
6+ import androidx.activity.enableEdgeToEdge
7+ import androidx.compose.foundation.layout.safeDrawingPadding
8+ import androidx.compose.ui.Modifier
69import com.softartdev.shared.App
710
811class MainActivity : ComponentActivity () {
912
1013 override fun onCreate (savedInstanceState : Bundle ? ) {
14+ enableEdgeToEdge()
1115 super .onCreate(savedInstanceState)
1216 setContent {
13- App ()
17+ App (modifier = Modifier .safeDrawingPadding() )
1418 }
1519 }
1620}
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package com.softartdev.shared
33import androidx.compose.runtime.Composable
44import androidx.compose.runtime.getValue
55import androidx.compose.runtime.remember
6+ import androidx.compose.ui.Modifier
67import androidx.navigation.NavHostController
78import androidx.navigation.compose.rememberNavController
89import com.softartdev.shared.material.MaterialApp
@@ -13,11 +14,11 @@ import kotlin.native.HiddenFromObjC
1314@OptIn(ExperimentalObjCRefinement ::class )
1415@HiddenFromObjC
1516@Composable
16- fun App () {
17+ fun App (modifier : Modifier = Modifier ) {
1718 val navController: NavHostController = rememberNavController()
1819 val showMaterial3: Boolean by remember(AppState ::showMaterial3)
1920 when (showMaterial3) {
20- true -> Material3App (navController)
21- else -> MaterialApp (navController)
21+ true -> Material3App (modifier, navController)
22+ else -> MaterialApp (modifier, navController)
2223 }
2324}
Original file line number Diff line number Diff line change 11package com.softartdev.shared.material
22
33import androidx.compose.runtime.Composable
4+ import androidx.compose.ui.Modifier
45import androidx.navigation.NavHostController
56import androidx.navigation.compose.NavHost
67import androidx.navigation.compose.composable
@@ -17,9 +18,11 @@ import kotlin.native.HiddenFromObjC
1718@HiddenFromObjC
1819@Composable
1920fun MaterialApp (
21+ modifier : Modifier = Modifier ,
2022 navController : NavHostController = rememberNavController()
2123) = PreferableMaterialTheme { // provides composition locals
2224 NavHost (
25+ modifier = modifier,
2326 navController = navController,
2427 startDestination = navController.currentDestination?.route ? : AppNavGraph .Settings .name,
2528 route = " MaterialApp"
Original file line number Diff line number Diff line change 11package com.softartdev.shared.material3
22
33import androidx.compose.runtime.Composable
4+ import androidx.compose.ui.Modifier
45import androidx.navigation.NavHostController
56import androidx.navigation.compose.NavHost
67import androidx.navigation.compose.composable
@@ -17,9 +18,11 @@ import kotlin.native.HiddenFromObjC
1718@HiddenFromObjC
1819@Composable
1920fun Material3App (
21+ modifier : Modifier = Modifier ,
2022 navController : NavHostController = rememberNavController()
2123) = PreferableMaterialTheme { // provides composition locals
2224 NavHost (
25+ modifier = modifier,
2326 navController = navController,
2427 startDestination = navController.currentDestination?.route ? : AppNavGraph .Settings .name,
2528 route = " Material3App"
You can’t perform that action at this time.
0 commit comments