Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 12:15:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix content color in search field.

Browse Source
This commit is contained in:
Alex Hart
2025-04-01 12:15:02 -03:00
parent 681d38611d
commit 62305c6910
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
View File

@@ -30,12 +30,14 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -203,43 +205,46 @@ private fun SearchToolbar(
) {
val focusRequester = remember { FocusRequester() }
TextFields.TextField(
value = state.searchQuery,
onValueChange = callback::onSearchQueryUpdated,
leadingIcon = {
IconButtons.IconButton(
onClick = callback::onCloseSearchClick
) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.symbol_arrow_left_24),
contentDescription = null
)
}
},
contentPadding = PaddingValues(0.dp),
colors = TextFieldDefaults.colors(
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
errorContainerColor = MaterialTheme.colorScheme.surfaceVariant
),
textStyle = MaterialTheme.typography.bodyLarge,
shape = RoundedCornerShape(50),
singleLine = true,
placeholder = {
Text(text = stringResource(state.searchHint))
},
modifier = modifier
.background(color = state.toolbarColor ?: MaterialTheme.colorScheme.surface)
.height(dimensionResource(R.dimen.signal_m3_toolbar_height))
.padding(horizontal = 16.dp, vertical = 10.dp)
.fillMaxWidth()
.focusRequester(focusRequester)
)
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) {
TextFields.TextField(
value = state.searchQuery,
onValueChange = callback::onSearchQueryUpdated,
leadingIcon = {
IconButtons.IconButton(
onClick = callback::onCloseSearchClick
) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.symbol_arrow_left_24),
contentDescription = null
)
}
},
contentPadding = PaddingValues(0.dp),
colors = TextFieldDefaults.colors(
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,
errorIndicatorColor = Color.Transparent,
unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
errorContainerColor = MaterialTheme.colorScheme.surfaceVariant
),
textStyle = MaterialTheme.typography.bodyLarge,
shape = RoundedCornerShape(50),
singleLine = true,
placeholder = {
Text(text = stringResource(state.searchHint))
},
modifier = modifier
.background(color = state.toolbarColor ?: MaterialTheme.colorScheme.surface)
.height(dimensionResource(R.dimen.signal_m3_toolbar_height))
.padding(horizontal = 16.dp, vertical = 10.dp)
.fillMaxWidth()
.focusRequester(focusRequester)
)
}
LaunchedEffect(state.mode) {
if (state.mode == MainToolbarMode.SEARCH) {