From ab4f17d55f7df520e999fd658eeea34612b7f082 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 4 Jan 2024 15:54:14 -0400
Subject: [PATCH] Fix contentColor in dark mode on bottom sheets.

---
 .../securesms/compose/ComposeBottomSheetDialogFragment.kt  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt
index 1539d5e1ff..9a892d6900 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/compose/ComposeBottomSheetDialogFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
@@ -26,7 +27,11 @@ abstract class ComposeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetD
         SignalTheme(
           isDarkMode = forceDarkTheme || DynamicTheme.isDarkTheme(LocalContext.current)
         ) {
-          Surface(shape = RoundedCornerShape(18.dp, 18.dp), color = SignalTheme.colors.colorSurface1) {
+          Surface(
+            shape = RoundedCornerShape(18.dp, 18.dp),
+            color = SignalTheme.colors.colorSurface1,
+            contentColor = MaterialTheme.colorScheme.onSurface
+          ) {
             SheetContent()
           }
         }