From 770a89507aac393341bf25716edd1e4fe6fcfd3b Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Fri, 22 Sep 2023 11:58:43 -0500
Subject: [PATCH] Fix background color on internal search fragment.

---
 .../internal/search/InternalSearchFragment.kt | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt
index a92a59dbe7..a168664dc9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/search/InternalSearchFragment.kt
@@ -8,17 +8,20 @@
 package org.thoughtcrime.securesms.components.settings.app.internal.search
 
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
+import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -52,15 +55,21 @@ class InternalSearchFragment : ComposeFragment() {
 
 @Composable
 fun InternalSearchFragmentScreen(query: String, results: ImmutableList<InternalSearchResult>, onSearchUpdated: (String) -> Unit, modifier: Modifier = Modifier) {
-  LazyColumn(
-    modifier = modifier.fillMaxWidth()
-  ) {
-    item(key = -1) {
-      SearchBar(query, onSearchUpdated)
-    }
-    results.forEach { recipient ->
-      item(key = recipient.id) {
-        ResultItem(recipient)
+  val backgroundColor = MaterialTheme.colorScheme.surface
+
+  CompositionLocalProvider(LocalContentColor provides contentColorFor(backgroundColor = backgroundColor)) {
+    LazyColumn(
+      modifier = modifier
+        .fillMaxWidth()
+        .background(backgroundColor)
+    ) {
+      item(key = -1) {
+        SearchBar(query, onSearchUpdated)
+      }
+      results.forEach { recipient ->
+        item(key = recipient.id) {
+          ResultItem(recipient)
+        }
       }
     }
   }
@@ -85,7 +94,9 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
       .fillMaxWidth()
       .clickable {
         if (activity != null) {
-          RecipientBottomSheetDialogFragment.create(result.id, result.groupId).show(activity.supportFragmentManager, "TAG")
+          RecipientBottomSheetDialogFragment
+            .create(result.id, result.groupId)
+            .show(activity.supportFragmentManager, "TAG")
         }
       }
       .padding(8.dp)
@@ -101,9 +112,7 @@ fun ResultItem(result: InternalSearchResult, modifier: Modifier = Modifier) {
 @Composable
 fun InternalSearchScreenPreviewLightTheme() {
   SignalTheme(isDarkMode = false) {
-    Surface {
-      InternalSearchScreenPreview()
-    }
+    InternalSearchScreenPreview()
   }
 }
 
@@ -111,9 +120,7 @@ fun InternalSearchScreenPreviewLightTheme() {
 @Composable
 fun InternalSearchScreenPreviewDarkTheme() {
   SignalTheme(isDarkMode = true) {
-    Surface {
-      InternalSearchScreenPreview()
-    }
+    InternalSearchScreenPreview()
   }
 }