From f76634511cd2fda474a11248ce6957295f49e22d Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 18 Feb 2025 12:04:33 +0100 Subject: [PATCH 1/4] fix background color for contacts activity Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt index c1b22e6b0c..93639d530e 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -132,7 +132,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, From 83c0d0b15025593ac4aa6540139208ad48eb725f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 18 Feb 2025 12:07:47 +0100 Subject: [PATCH 2/4] fix colors for header Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 index 93639d530e..765ca7c49a 100644 --- 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 @@ -430,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 ) } From 903bed8fb4508cdd89439097bcb323f3d01b88d8 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 18 Feb 2025 13:25:31 +0100 Subject: [PATCH 3/4] improve colors for searchbar Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/contacts/SearchComponent.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt b/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt index 644dc315c5..5b990aeb78 100644 --- 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 = { From c5517c8426dfc272817728b58a5abbd0923bcb70 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 18 Feb 2025 13:29:45 +0100 Subject: [PATCH 4/4] fix background color for conversation creation Signed-off-by: Marcel Hibbe --- .../talk/conversationcreation/ConversationCreationActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt index 47211f165a..38bd0df56f 100644 --- 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)