diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-07-13 10:08:36 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-07-13 10:08:36 +0200 |
| commit | 87c947b8f403da3b5afc863856d84f7cb0010a31 (patch) | |
| tree | b34f3f437106f40905ea083374194c9f79e37aca /android/app | |
| parent | 871df2b8749ba21faee60cdc0c9b74ff7d4915ad (diff) | |
| parent | f2ee22c52a7fe0861079a8f5997f2637abc1d1bc (diff) | |
| download | mullvadvpn-87c947b8f403da3b5afc863856d84f7cb0010a31.tar.xz mullvadvpn-87c947b8f403da3b5afc863856d84f7cb0010a31.zip | |
Merge branch 'migrate-material-3-library-to-111-droid-199'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt | 2 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt (renamed from android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SearchTextField.kt) | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt index 447b8c6768..b66cb555b2 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt @@ -33,12 +33,12 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.cell.RelayLocationCell -import net.mullvad.mullvadvpn.compose.component.SearchTextField import net.mullvad.mullvadvpn.compose.component.textResource import net.mullvad.mullvadvpn.compose.constant.ContentType import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR +import net.mullvad.mullvadvpn.compose.textfield.SearchTextField import net.mullvad.mullvadvpn.compose.theme.AppTheme import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.relaylist.RelayCountry diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SearchTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt index c7e24883a1..8e68e7e2a0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SearchTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.compose.component +package net.mullvad.mullvadvpn.compose.textfield import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -66,7 +66,7 @@ fun SearchTextField( cursorBrush = SolidColor(MaterialTheme.colorScheme.onSecondary), decorationBox = @Composable { innerTextField -> - TextFieldDefaults.TextFieldDecorationBox( + TextFieldDefaults.DecorationBox( value = searchTerm, innerTextField = innerTextField, enabled = enabled, @@ -91,13 +91,16 @@ fun SearchTextField( }, shape = MaterialTheme.shapes.medium, colors = - TextFieldDefaults.textFieldColors( - textColor = MaterialTheme.colorScheme.onSecondary, - containerColor = backgroundColor, + TextFieldDefaults.colors( + focusedTextColor = MaterialTheme.colorScheme.onSecondary, + unfocusedTextColor = MaterialTheme.colorScheme.onSecondary, + focusedContainerColor = backgroundColor, + unfocusedContainerColor = backgroundColor, focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent, cursorColor = MaterialTheme.colorScheme.onSecondary, - placeholderColor = MaterialTheme.colorScheme.onSecondary + focusedPlaceholderColor = MaterialTheme.colorScheme.onSecondary, + unfocusedPlaceholderColor = MaterialTheme.colorScheme.onSecondary ), contentPadding = PaddingValues(), ) |