From cb02def41dad379927dfad31f7d9bd6bc2c6c068 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Sun, 5 May 2024 00:07:28 +0930
Subject: [PATCH] Fix bottom sheet color

---
 .../securesms/conversation/start/InviteFriendFragment.kt       | 3 ++-
 .../conversation/start/NewConversationHomeFragment.kt          | 3 ++-
 .../java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/InviteFriendFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/InviteFriendFragment.kt
index 952bc0dba5..7ab0772d23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/InviteFriendFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/InviteFriendFragment.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -56,7 +57,7 @@ class InviteFriendFragment : Fragment() {
 
     @Composable
     private fun InviteFriend() {
-        Column(modifier = Modifier.background(MaterialTheme.colors.surface)) {
+        Column(modifier = Modifier.background(MaterialTheme.colors.primarySurface)) {
             AppBar("Invite a Friend", onBack = { delegate.onDialogBackPressed() }, onClose = { delegate.onDialogClosePressed() })
             Column(
                 modifier = Modifier.padding(horizontal = 24.dp),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationHomeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationHomeFragment.kt
index 02c8de55b0..1073f0aabd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationHomeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationHomeFragment.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
@@ -52,7 +53,7 @@ class NewConversationHomeFragment : Fragment() {
 
     @Composable
     fun NewConversationScreen() {
-        Column(modifier = Modifier.background(MaterialTheme.colors.surface)) {
+        Column(modifier = Modifier.background(MaterialTheme.colors.primarySurface)) {
             AppBar(stringResource(R.string.dialog_new_conversation_title), onClose = { delegate.onDialogClosePressed() })
             ItemButton(textId = R.string.messageNew, icon = R.drawable.ic_message) { delegate.onNewMessageSelected() }
             Divider(modifier = Modifier.padding(start = 80.dp))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
index b21920c560..e725634348 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -121,7 +122,7 @@ private fun NewMessage(
 ) {
     val pagerState = rememberPagerState { TITLES.size }
 
-    Column(modifier = Modifier.background(MaterialTheme.colors.surface)) {
+    Column(modifier = Modifier.background(MaterialTheme.colors.primarySurface)) {
         AppBar(stringResource(R.string.messageNew), onClose = { onClose() }, onBack = { onBack() })
         SessionTabRow(pagerState, TITLES)
         HorizontalPager(pagerState) {