From 4fa45784c9cf0ef3ae91377b98ecaa6f77cc09fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Fri, 22 Dec 2023 10:49:19 +0100 Subject: [PATCH] Fix background color on welcome screen --- .../mullvadvpn/compose/screen/WelcomeScreen.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt index cc8cf4977c70..d21ccdfef7b1 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.compose.screen -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -193,7 +192,7 @@ fun WelcomeScreen( .copy(alpha = AlphaTopBar), onSettingsClicked = onSettingsClick, onAccountClicked = onAccountClick, - snackbarHostState = snackbarHostState + snackbarHostState = snackbarHostState, ) { Column( modifier = @@ -204,7 +203,6 @@ fun WelcomeScreen( state = scrollState, color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaScrollbar) ) - .background(color = MaterialTheme.colorScheme.primary) ) { // Welcome info area WelcomeInfo(snackbarHostState, uiState, navigateToDeviceInfoDialog) @@ -352,12 +350,7 @@ private fun PaymentPanel( onPurchaseBillingProductClick: (productId: ProductId) -> Unit, onPaymentInfoClick: () -> Unit ) { - Column( - modifier = - Modifier.fillMaxWidth() - .padding(top = Dimens.mediumPadding) - .background(color = MaterialTheme.colorScheme.background) - ) { + Column(modifier = Modifier.fillMaxWidth().padding(top = Dimens.mediumPadding)) { Spacer(modifier = Modifier.padding(top = Dimens.screenVerticalMargin)) billingPaymentState?.let { PlayPayment(