edgeToEdge for material 2/3 & dark/light

Author: softartdev

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=io.github.softartdev
-VERSION=0.9.3
+VERSION=0.9.4
 
 org.gradle.jvmargs=-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx16g" -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 org.gradle.parallel=true

sample/src/androidMain/kotlin/com/softartdev/shared/EdgeToEdge.android.kt

@@ -0,0 +1,27 @@
+package com.softartdev.shared
+
+import android.app.Activity
+import android.graphics.Color
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.LocalActivity
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.runtime.Composable
+import androidx.core.view.WindowCompat
+
+@Composable
+actual fun EnableEdgeToEdge(material3: Boolean, inDark: Boolean) {
+    val activity: Activity = LocalActivity.current ?: return
+    if (material3) {
+        val componentActivity = activity as? ComponentActivity ?: return
+        val scrimLight: Int = Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
+        val scrimDark: Int = Color.argb(0x80, 0x1b, 0x1b, 0x1b)
+        val sbStyle: SystemBarStyle = when {
+            inDark -> SystemBarStyle.dark(scrim = scrimDark)
+            else -> SystemBarStyle.light(scrim = scrimLight, darkScrim = scrimDark)
+        }
+        componentActivity.enableEdgeToEdge(statusBarStyle = sbStyle, navigationBarStyle = sbStyle)
+    } else {
+        WindowCompat.setDecorFitsSystemWindows(activity.window, false)
+    }
+}

sample/src/commonMain/kotlin/com/softartdev/shared/EdgeToEdge.kt

@@ -0,0 +1,19 @@
+package com.softartdev.shared
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import com.softartdev.theme.pref.ThemeEnum
+import com.softartdev.theme.pref.ThemePrefs
+
+@Composable
+expect fun EnableEdgeToEdge(material3: Boolean, inDark: Boolean)
+
+val ThemePrefs.inDark: Boolean
+    @Composable
+    @ReadOnlyComposable
+    get() = when (darkThemeState.value) {
+        ThemeEnum.Light -> false
+        ThemeEnum.Dark -> true
+        ThemeEnum.SystemDefault -> isSystemInDarkTheme()
+    }

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

@@ -9,6 +9,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.dialog
 import androidx.navigation.compose.rememberNavController
 import com.softartdev.shared.AppNavGraph
+import com.softartdev.shared.EnableEdgeToEdge
+import com.softartdev.shared.inDark
 import com.softartdev.theme.material.PreferableMaterialTheme
 import com.softartdev.theme.material.ThemeDialog
 import com.softartdev.theme.pref.PreferenceHelper
@@ -22,6 +24,7 @@ fun MaterialApp(
     modifier: Modifier = Modifier,
     navController: NavHostController = rememberNavController()
 ) = PreferableMaterialTheme { // provides composition locals
+    EnableEdgeToEdge(material3 = false, inDark = themePrefs.inDark)
     NavHost(
         modifier = modifier.safeDrawingPadding(),
         navController = navController,

sample/src/commonMain/kotlin/com/softartdev/shared/material3/Material3App.kt

@@ -8,6 +8,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.dialog
 import androidx.navigation.compose.rememberNavController
 import com.softartdev.shared.AppNavGraph
+import com.softartdev.shared.EnableEdgeToEdge
+import com.softartdev.shared.inDark
 import com.softartdev.theme.material3.PreferableMaterialTheme
 import com.softartdev.theme.material3.ThemeDialog
 import com.softartdev.theme.pref.PreferenceHelper
@@ -21,6 +23,7 @@ fun Material3App(
     modifier: Modifier = Modifier,
     navController: NavHostController = rememberNavController()
 ) = PreferableMaterialTheme { // provides composition locals
+    EnableEdgeToEdge(material3 = true, inDark = themePrefs.inDark)
     NavHost(
         modifier = modifier,
         navController = navController,

sample/src/desktopMain/kotlin/com/softartdev/shared/EdgeToEdge.desktop.kt

@@ -0,0 +1,7 @@
+package com.softartdev.shared
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun EnableEdgeToEdge(material3: Boolean, inDark: Boolean) {
+}

sample/src/iosMain/kotlin/com/softartdev/shared/EdgeToEdge.ios.kt

@@ -0,0 +1,7 @@
+package com.softartdev.shared
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun EnableEdgeToEdge(material3: Boolean, inDark: Boolean) {
+}

theme/theme-prefs/src/androidMain/kotlin/com/softartdev/theme/pref/AndroidPreferenceHelper.kt

@@ -11,7 +11,7 @@ internal class AndroidPreferenceHelper(context: Context) : PreferenceHelper {
         context.getSharedPreferences(context.packageName + "_ThemePref", Context.MODE_PRIVATE)
 
     override var themeEnum: ThemeEnum
-        get() = preferences.getInt(THEME_KEY, ThemeEnum.SystemDefault.ordinal).let(ThemeEnum.values()::get)
+        get() = preferences.getInt(THEME_KEY, ThemeEnum.SystemDefault.ordinal).let(ThemeEnum.entries::get)
         set(value) = preferences.edit().putInt(THEME_KEY, value.ordinal).apply()
 
     override fun clear() = preferences.edit().clear().apply()