Skip to content

Commit

Permalink
Fix background color on welcome screen
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawa authored and albin-mullvad committed Dec 29, 2023
1 parent f197167 commit 4fa4578
Showing 1 changed file with 2 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -193,7 +192,7 @@ fun WelcomeScreen(
.copy(alpha = AlphaTopBar),
onSettingsClicked = onSettingsClick,
onAccountClicked = onAccountClick,
snackbarHostState = snackbarHostState
snackbarHostState = snackbarHostState,
) {
Column(
modifier =
Expand All @@ -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)
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 4fa4578

Please sign in to comment.