Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/noid/improve contacts activity design #4740

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Bugfix/noid/improve contacts activity design #4740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f766345
fix background color for contacts activity
mahibi Feb 18, 2025
83c0d0b
fix colors for header
mahibi Feb 18, 2025
903bed8
improve colors for searchbar
mahibi Feb 18, 2025
c5517c8
fix background color for conversation creation
mahibi Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
)
}
Expand Down
14 changes: 11 additions & 3 deletions app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ fun ConversationCreationScreen(
Column(
modifier = Modifier
.padding(paddingValues)
.background(colorResource(id = R.color.bg_default))
.fillMaxSize()
.verticalScroll(rememberScrollState())
) {
DefaultUserAvatar(selectedImageUri)
Expand Down
Loading