gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4740 from nextcloud/bugfix/noid/improveContactsActivityDesign

Browse Source 
Bugfix/noid/improve contacts activity design
This commit is contained in:
Sowjanya Kota 2025-02-18 17:39:20 +01:00 committed by GitHub
commit e648b8846a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
View File

@ -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
)
}

14
app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt
View File

@ -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 = {

2
app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
View File

@ -210,6 +210,8 @@ fun ConversationCreationScreen(
Column(
modifier = Modifier
.padding(paddingValues)
.background(colorResource(id = R.color.bg_default))
.fillMaxSize()
.verticalScroll(rememberScrollState())
) {
DefaultUserAvatar(selectedImageUri)