Skip to content

Commit 3263ca3

Browse files
committed
kotlin 2.1.20
1 parent e77d389 commit 3263ca3

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
extra["kotlin_version"] = "2.1.10"
2+
extra["kotlin_version"] = "2.1.20"
33
extra["android_min_sdk_version"] = 21
44
extra["android_compile_sdk_version"] = 35
55
extra["jdk_version"] = 17

sample/src/androidMain/kotlin/com/softartdev/sample/MainActivity.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
66
import androidx.activity.enableEdgeToEdge
7-
import androidx.compose.foundation.layout.safeDrawingPadding
8-
import androidx.compose.ui.Modifier
97
import com.softartdev.shared.App
108

119
class MainActivity : ComponentActivity() {
1210

1311
override fun onCreate(savedInstanceState: Bundle?) {
14-
enableEdgeToEdge()
1512
super.onCreate(savedInstanceState)
13+
enableEdgeToEdge()
1614
setContent {
17-
App(modifier = Modifier.safeDrawingPadding())
15+
App()
1816
}
1917
}
2018
}

sample/src/commonMain/kotlin/com/softartdev/shared/material/MaterialApp.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.softartdev.shared.material
22

3+
import androidx.compose.foundation.layout.safeDrawingPadding
34
import androidx.compose.runtime.Composable
45
import androidx.compose.ui.Modifier
56
import androidx.navigation.NavHostController
@@ -22,7 +23,7 @@ fun MaterialApp(
2223
navController: NavHostController = rememberNavController()
2324
) = PreferableMaterialTheme { // provides composition locals
2425
NavHost(
25-
modifier = modifier,
26+
modifier = modifier.safeDrawingPadding(),
2627
navController = navController,
2728
startDestination = navController.currentDestination?.route ?: AppNavGraph.Settings.name,
2829
route = "MaterialApp"

0 commit comments

Comments
 (0)