Merge pull request #4740 from nextcloud/bugfix/noid/improveContactsAc…

…tivityDesign Bugfix/noid/improve contacts activity design
nextcloud · Feb 18, 2025 · e648b88 · e648b88
2 parents 8d7ce9f + c5517c8
commit e648b88
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
@@ -61,6 +61,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -132,7 +133,10 @@ class ContactsActivityCompose : BaseActivity() {
                         )
                     },
                     content = {
-                        Column(Modifier.padding(it)) {
+                        Column(
+                            Modifier.padding(it)
+                                .background(colorResource(id = R.color.bg_default))
+                        ) {
                             ConversationCreationOptions(context = context, contactsViewModel = contactsViewModel)
                             ContactsList(
                                 contactsUiState = uiState.value,
@@ -427,9 +431,9 @@ fun Header(header: String) {
         text = header,
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.Transparent)
+            .background(colorResource(id = R.color.bg_default))
             .padding(start = 60.dp),
-        color = Color.Blue,
+        color = MaterialTheme.colorScheme.primary,
         fontWeight = FontWeight.Bold
     )
 }

diff --git a/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt b/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt
@@ -17,12 +17,14 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
@@ -35,9 +37,15 @@ fun DisplaySearch(text: String, onTextChange: (String) -> Unit, contactsViewMode
     val keyboardController = LocalSoftwareKeyboardController.current
     TextField(
         modifier = Modifier
+            .background(MaterialTheme.colorScheme.background)
             .fillMaxWidth()
-            .height(60.dp)
-            .background(color = colorResource(id = R.color.appbar)),
+            .height(60.dp),
+        colors = TextFieldDefaults.colors(
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent,
+            disabledIndicatorColor = Color.Transparent
+        ),
+
         value = text,
         onValueChange = { onTextChange(it) },
         placeholder = {

diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
@@ -210,6 +210,8 @@ fun ConversationCreationScreen(
             Column(
                 modifier = Modifier
                     .padding(paddingValues)
+                    .background(colorResource(id = R.color.bg_default))
+                    .fillMaxSize()
                     .verticalScroll(rememberScrollState())
             ) {
                 DefaultUserAvatar(selectedImageUri)