summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-10-27 12:09:36 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-10-30 14:59:48 +0100
commitfa89406944f12e948ff66930c0c327b91574c961 (patch)
tree6272fe0085f78b54e751ad11784a283c778fa60e /android
parent4b4166cc232910fea18b9fb35aca88b2d3dcfc43 (diff)
downloadmullvadvpn-fa89406944f12e948ff66930c0c327b91574c961.tar.xz
mullvadvpn-fa89406944f12e948ff66930c0c327b91574c961.zip
Set correct tint on device name and time left
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt7
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)