Set the legacy MaterialTheme in order for the book bottom sheet to su…

…pport the dark mode.
PaulWoitaschek · Jul 10, 2022 · 4931ded · 4931ded
1 parent b2c0c85
commit 4931ded
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
@@ -9,6 +9,7 @@ import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SmallTopAppBar
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -78,16 +79,18 @@ fun BookOverviewScreen(
   ModalBottomSheetLayout(
     sheetState = bottomSheetState,
     sheetContent = {
-      BottomSheetContent { item ->
-        scope.launch {
-          delay(300)
-          bottomSheetState.hide()
-          when (item) {
-            BottomSheetItem.Title -> {
-              editingBook?.let(editBookTitleViewModel::onEditBookTitleClick)
+      Surface {
+        BottomSheetContent { item ->
+          scope.launch {
+            delay(300)
+            bottomSheetState.hide()
+            when (item) {
+              BottomSheetItem.Title -> {
+                editingBook?.let(editBookTitleViewModel::onEditBookTitleClick)
+              }
+              BottomSheetItem.InternetCover -> editingBook?.let(onCoverFromInternetClick)
+              BottomSheetItem.FileCover -> editingBook?.let(onFileCoverClick)
             }
-            BottomSheetItem.InternetCover -> editingBook?.let(onCoverFromInternetClick)
-            BottomSheetItem.FileCover -> editingBook?.let(onFileCoverClick)
           }
         }
       }

diff --git a/common/src/main/kotlin/voice/common/compose/VoiceTheme.kt b/common/src/main/kotlin/voice/common/compose/VoiceTheme.kt
@@ -2,6 +2,9 @@ package voice.common.compose
 
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
@@ -33,9 +36,16 @@ fun VoiceTheme(
         lightColorScheme()
       }
     }
-
   ) {
-    content()
+    MaterialTheme(
+      colors = if (isDarkTheme()) {
+        darkColors()
+      } else {
+        lightColors()
+      }
+    ) {
+      content()
+    }
   }
 }