diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-06 12:22:11 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-06 12:22:11 +0200 |
| commit | 80a4088f36c528626914dc2938e8d8bca4359831 (patch) | |
| tree | a9c3a997bee9272a3b2fb568bbff4f3bb05866b1 /android/app/src | |
| parent | f8aca6df5ed0eb871ad0fc6acd158f689fd7ba38 (diff) | |
| parent | 5aa7a533e79a052b762ba63bca49ef95d0d31653 (diff) | |
| download | mullvadvpn-80a4088f36c528626914dc2938e8d8bca4359831.tar.xz mullvadvpn-80a4088f36c528626914dc2938e8d8bca4359831.zip | |
Merge branch 'incorrect-font-color-in-the-account-view-droid-372'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt index 39e3382a09..18a88fdf79 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt @@ -1,6 +1,7 @@ package net.mullvad.mullvadvpn.compose.component import androidx.compose.material3.LocalTextStyle +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -79,6 +80,7 @@ fun AutoResizeText( text = text, maxLines = maxLines, style = style, + color = MaterialTheme.colorScheme.onBackground, fontSize = adjustedFontSize.sp, onTextLayout = { if (it.didOverflowHeight && isReadyToDraw.not()) { |