Merge pull request #235 from DroidKaigi/takahirom/fix-theme/2024-08-06

Fix theme
DroidKaigi · Aug 6, 2024 · 9d99241 · 9d99241
2 parents e1d15e5 + d689f08
commit 9d99241
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import androidx.core.view.WindowCompat
 import androidx.window.layout.DisplayFeature
 import androidx.window.layout.WindowInfoTracker
 import dagger.hilt.android.AndroidEntryPoint
@@ -61,6 +62,8 @@ class MainActivity : ComponentActivity() {
             }
         }
 
+        WindowCompat.getInsetsController(window, window.decorView)
+            .isAppearanceLightStatusBars = false
         setContent {
             val windowSize = calculateWindowSizeClass()
             val displayFeatures = calculateDisplayFeatures(this)

diff --git a/app-android/src/main/res/values/themes.xml b/app-android/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.KaigiApp" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="Theme.KaigiApp" parent="android:Theme.Material.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
-</resources>
+</resources>
diff --git a/...gnsystem/src/commonMain/kotlin/io/github/droidkaigi/confsched/designsystem/theme/Theme.kt b/...gnsystem/src/commonMain/kotlin/io/github/droidkaigi/confsched/designsystem/theme/Theme.kt
@@ -241,14 +241,6 @@ fun KaigiTheme(
     @Composable () -> Unit,
 ) {
     val colorScheme = darkScheme
-//  val view = LocalView.current
-//  if (!view.isInEditMode) {
-//    SideEffect {
-//      val window = (view.context as Activity).window
-//      window.statusBarColor = colorScheme.primary.toArgb()
-//      WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-//    }
-//  }
 
     MaterialTheme(
         colorScheme = colorScheme,