highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-11 00:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly tints the search button

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-18 19:33:22 -04:00
parent 5da9e430b0
commit 614e9ff661
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt
View File

@@ -59,7 +59,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@@ -285,7 +284,7 @@ private fun SearchEditTextForJoin(
searchBarViewModel.updateSearchValue(it) searchBarViewModel.updateSearchValue(it)
scope.launch(Dispatchers.IO) { searchTextChanges.trySend(it) } scope.launch(Dispatchers.IO) { searchTextChanges.trySend(it) }
}, },
leadingIcon = { SearchIcon(modifier = Size20Modifier, Color.Unspecified) }, leadingIcon = { SearchIcon(modifier = Size20Modifier, MaterialTheme.colorScheme.placeholderText) },
modifier = modifier =
Modifier Modifier
.weight(1f, true) .weight(1f, true)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
View File

@@ -61,7 +61,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@@ -569,7 +568,7 @@ private fun SearchButton(onClick: () -> Unit) {
IconButton( IconButton(
onClick = onClick, onClick = onClick,
) { ) {
SearchIcon(modifier = Size22Modifier, Color.Unspecified) SearchIcon(modifier = Size22Modifier, MaterialTheme.colorScheme.placeholderText)
} }
} }

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
View File

@@ -330,7 +330,7 @@ private fun SearchTextField(
KeyboardOptions.Default.copy( KeyboardOptions.Default.copy(
capitalization = KeyboardCapitalization.Sentences, capitalization = KeyboardCapitalization.Sentences,
), ),
leadingIcon = { SearchIcon(modifier = Size20Modifier, Color.Unspecified) }, leadingIcon = { SearchIcon(modifier = Size20Modifier, MaterialTheme.colorScheme.placeholderText) },
modifier = modifier =
Modifier Modifier
.weight(1f, true) .weight(1f, true)