diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-30 15:00:10 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-30 15:00:10 +0100 |
| commit | a182908fc283312d8244ad982ffcc3da6fe87f15 (patch) | |
| tree | 6272fe0085f78b54e751ad11784a283c778fa60e | |
| parent | 4b4166cc232910fea18b9fb35aca88b2d3dcfc43 (diff) | |
| parent | fa89406944f12e948ff66930c0c327b91574c961 (diff) | |
| download | mullvadvpn-a182908fc283312d8244ad982ffcc3da6fe87f15.tar.xz mullvadvpn-a182908fc283312d8244ad982ffcc3da6fe87f15.zip | |
Merge branch 'review-top-bar-droid-451'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt index 64ef36bea6..8130e71963 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt @@ -42,6 +42,7 @@ import androidx.compose.ui.unit.dp import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar @Preview @Composable @@ -303,7 +304,8 @@ fun MullvadTopBarWithDeviceName( ?: "", maxLines = 1, overflow = TextOverflow.Ellipsis, - style = MaterialTheme.typography.bodySmall + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaTopBar) ) if (daysLeftUntilExpiry != null) { Text( @@ -316,7 +318,8 @@ fun MullvadTopBarWithDeviceName( daysLeftUntilExpiry ) ), - style = MaterialTheme.typography.bodySmall + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaTopBar) ) } else { Spacer(Modifier) |