Fix transparent background for Link FullScreen state

paymentsheet/src/main/java/com/stripe/android/link/ui/LinkContent.kt

@@ -12,6 +12,7 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -61,65 +62,67 @@ internal fun LinkContent(
 ) {
     val coroutineScope = rememberCoroutineScope()
     DefaultLinkTheme {
-        ModalBottomSheetLayout(
-            sheetContent = bottomSheetContent ?: {
-                // Must have some content at startup or bottom sheet crashes when
-                // calculating its initial size
-                Box(Modifier.defaultMinSize(minHeight = 1.dp)) {}
-            },
-            modifier = Modifier.fillMaxHeight(),
-            sheetState = sheetState,
-            sheetShape = MaterialTheme.linkShapes.large.copy(
-                bottomStart = CornerSize(0.dp),
-                bottomEnd = CornerSize(0.dp)
-            ),
-            scrimColor = MaterialTheme.linkColors.sheetScrim
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
+        Surface {
+            ModalBottomSheetLayout(
+                sheetContent = bottomSheetContent ?: {
+                    // Must have some content at startup or bottom sheet crashes when
+                    // calculating its initial size
+                    Box(Modifier.defaultMinSize(minHeight = 1.dp)) {}
+                },
+                modifier = Modifier.fillMaxHeight(),
+                sheetState = sheetState,
+                sheetShape = MaterialTheme.linkShapes.large.copy(
+                    bottomStart = CornerSize(0.dp),
+                    bottomEnd = CornerSize(0.dp)
+                ),
+                scrimColor = MaterialTheme.linkColors.sheetScrim
             ) {
-                BackHandler {
-                    handleViewAction(LinkAction.BackPressed)
-                }
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                ) {
+                    BackHandler {
+                        handleViewAction(LinkAction.BackPressed)
+                    }
 
-                LinkAppBar(
-                    state = appBarState,
-                    onBackPressed = onBackPressed,
-                    showBottomSheetContent = {
-                        if (it == null) {
-                            coroutineScope.launch {
-                                sheetState.hide()
-                                onUpdateSheetContent(null)
+                    LinkAppBar(
+                        state = appBarState,
+                        onBackPressed = onBackPressed,
+                        showBottomSheetContent = {
+                            if (it == null) {
+                                coroutineScope.launch {
+                                    sheetState.hide()
+                                    onUpdateSheetContent(null)
+                                }
+                            } else {
+                                onUpdateSheetContent(it)
                             }
-                        } else {
-                            onUpdateSheetContent(it)
+                        },
+                        onLogoutClicked = {
+                            handleViewAction(LinkAction.LogoutClicked)
                         }
-                    },
-                    onLogoutClicked = {
-                        handleViewAction(LinkAction.LogoutClicked)
-                    }
-                )
+                    )
 
-                Screens(
-                    navController = navController,
-                    goBack = goBack,
-                    moveToWeb = moveToWeb,
-                    navigate = { screen ->
-                        navigate(screen, false)
-                    },
-                    navigateAndClearStack = { screen ->
-                        navigate(screen, true)
-                    },
-                    dismissWithResult = { result ->
-                        dismissWithResult?.invoke(result)
-                    },
-                    getLinkAccount = getLinkAccount,
-                    showBottomSheetContent = onUpdateSheetContent,
-                    hideBottomSheetContent = {
-                        onUpdateSheetContent(null)
-                    }
-                )
+                    Screens(
+                        navController = navController,
+                        goBack = goBack,
+                        moveToWeb = moveToWeb,
+                        navigate = { screen ->
+                            navigate(screen, false)
+                        },
+                        navigateAndClearStack = { screen ->
+                            navigate(screen, true)
+                        },
+                        dismissWithResult = { result ->
+                            dismissWithResult?.invoke(result)
+                        },
+                        getLinkAccount = getLinkAccount,
+                        showBottomSheetContent = onUpdateSheetContent,
+                        hideBottomSheetContent = {
+                            onUpdateSheetContent(null)
+                        }
+                    )
+                }
             }
         }
     }

paymentsheet/src/test/java/com/stripe/android/link/ui/LinkContentScreenshotTest.kt

@@ -0,0 +1,77 @@
+package com.stripe.android.link.ui
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.Text
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import androidx.navigation.compose.rememberNavController
+import com.stripe.android.paymentsheet.R
+import com.stripe.android.screenshottesting.FontSize
+import com.stripe.android.screenshottesting.PaparazziRule
+import com.stripe.android.screenshottesting.SystemAppearance
+import org.junit.Rule
+import org.junit.Test
+
+internal class LinkContentScreenshotTest {
+    @get:Rule
+    val paparazziRule = PaparazziRule(
+        SystemAppearance.entries,
+        FontSize.entries,
+        boxModifier = Modifier
+            .padding(0.dp)
+            .fillMaxWidth(),
+    )
+
+    @OptIn(ExperimentalMaterialApi::class)
+    @Test
+    fun testLinkContentScreenHasOpaqueBackground() {
+        paparazziRule.snapshot {
+            val viewModelStoreOwner = object : ViewModelStoreOwner {
+                override val viewModelStore = ViewModelStore()
+            }
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                val navController = rememberNavController()
+                Box {
+                    Text(
+                        modifier = Modifier
+                            .align(Alignment.TopStart),
+                        text = "Hello!"
+                    )
+                    LinkContent(
+                        navController = navController,
+                        appBarState = LinkAppBarState(
+                            navigationIcon = R.drawable.stripe_link_close,
+                            showHeader = false,
+                            showOverflowMenu = false,
+                            email = null
+                        ),
+                        sheetState = ModalBottomSheetState(
+                            initialValue = ModalBottomSheetValue.Hidden,
+                            density = Density(1f)
+                        ),
+                        onUpdateSheetContent = {},
+                        bottomSheetContent = null,
+                        handleViewAction = {},
+                        navigate = { _, _ -> },
+                        dismissWithResult = null,
+                        getLinkAccount = { null },
+                        onBackPressed = {},
+                        moveToWeb = {},
+                        goBack = {}
+                    )
+                }
+            }
+        }
+    }
+}