Update Compose and set sheetGesturesEnabled to false

build.gradle

@@ -48,8 +48,8 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "30.0.3"
-    compileSdkVersion = 33
+    buildToolsVersion = "34.0.0"
+    compileSdkVersion = 34
 
     group_name = GROUP
     version_name = VERSION_NAME

dependencies.gradle

@@ -1,17 +1,17 @@
 ext.versions = [
         accompanist                 : '0.30.1',
         alipay                      : '15.8.12',
-        androidGradlePlugin         : '8.0.2',
+        androidGradlePlugin         : '8.1.0',
         androidTest                 : '1.5.0',
         androidTestJunit            : '1.1.5',
         androidTestOrchestrator     : '1.4.2',
         androidTestRunner           : '1.5.2',
-        androidxActivity            : '1.7.2',
+        androidxActivity            : '1.8.0-alpha06',
         androidxAnnotation          : '1.6.0',
         androidxAppcompat           : '1.6.1',
         androidxArchCore            : '2.2.0',
         androidxBrowser             : '1.5.0',
-        androidxCompose             : '1.4.3',
+        androidxCompose             : '1.5.0',
         androidxComposeCompiler     : '1.4.1',
         androidxComposeRuntime      : '1.4.3',
         androidxComposeUi           : '1.4.3',
@@ -25,7 +25,6 @@ ext.versions = [
         androidxRecyclerview        : '1.2.1',
         androidxSecurity            : '1.1.0-alpha05',
         binaryCompatibilityValidator: '0.13.1',
-        buildTools                  : "30.0.3",
         cameraX                     : '1.2.3',
         dagger                      : '2.48',
         detekt                      : "1.22.0",

payments-core/res/values/themes.xml

@@ -36,9 +36,7 @@
 
     <style name="StripePaymentSheetDefaultTheme" parent="StripePaymentSheetBaseTheme" />
 
-    <style name="StripeGooglePayDefaultTheme" parent="StripePaymentSheetBaseTheme">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
+    <style name="StripeGooglePayDefaultTheme" parent="StripePaymentSheetBaseTheme" />
 
     <style name="StripePayLauncherDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
@@ -50,7 +48,5 @@
         <item name="android:windowAnimationStyle">@null</item>
         <item name="colorSurface">@color/stripe_paymentsheet_background</item>
         <item name="actionMenuTextColor">@color/stripe_paymentsheet_toolbar_items_color</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 </resources>

payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayLauncherActivity.kt

@@ -3,6 +3,7 @@ package com.stripe.android.googlepaylauncher
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
@@ -41,6 +42,7 @@ internal class GooglePayLauncherActivity : AppCompatActivity() {
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setFadeAnimations()

payments-core/src/main/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherActivity.kt

@@ -2,6 +2,7 @@ package com.stripe.android.googlepaylauncher
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
@@ -36,6 +37,7 @@ internal class GooglePayPaymentMethodLauncherActivity : AppCompatActivity() {
     private lateinit var args: GooglePayPaymentMethodLauncherContractV2.Args
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setFadeAnimations()

payments-core/src/main/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.addCallback
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
@@ -32,6 +33,7 @@ internal class PaymentLauncherConfirmationActivity : AppCompatActivity() {
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setFadeAnimations()

paymentsheet/res/values/themes.xml

@@ -26,10 +26,7 @@
         <item name="actionMenuTextColor">@color/stripe_paymentsheet_toolbar_items_color</item>
     </style>
 
-    <style name="StripePaymentSheetDefaultTheme" parent="StripePaymentSheetBaseTheme">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-    </style>
+    <style name="StripePaymentSheetDefaultTheme" parent="StripePaymentSheetBaseTheme" />
 
     <style name="StripePaymentSheetAddPaymentMethodTheme">
         <item name="colorOnSurface">@color/stripe_paymentsheet_form</item>

paymentsheet/src/main/java/com/stripe/android/common/ui/BottomSheet.kt

@@ -172,6 +172,7 @@ internal fun BottomSheet(
             topStart = MaterialTheme.stripeShapes.cornerRadius.dp,
             topEnd = MaterialTheme.stripeShapes.cornerRadius.dp,
         ),
+        sheetGesturesEnabled = false,
         sheetContent = {
             Box(modifier = Modifier.testTag(BottomSheetContentTestTag)) {
                 sheetContent()

paymentsheet/src/main/java/com/stripe/android/customersheet/CustomerSheetActivity.kt

@@ -4,14 +4,14 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.ViewModelProvider
 import com.stripe.android.common.ui.BottomSheet
 import com.stripe.android.common.ui.rememberBottomSheetState
@@ -39,10 +39,9 @@ internal class CustomerSheetActivity : AppCompatActivity() {
 
     @OptIn(ExperimentalMaterialApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         viewModel.registerFromActivity(
             activityResultCaller = this,
             lifecycleOwner = this,
@@ -83,10 +82,7 @@ internal class CustomerSheetActivity : AppCompatActivity() {
     private fun finishWithResult(result: InternalCustomerSheetResult) {
         setResult(RESULT_OK, Intent().putExtras(result.toBundle()))
         finish()
-    }
-
-    override fun finish() {
-        super.finish()
+        @Suppress("DEPRECATION")
         overridePendingTransition(AnimationConstants.FADE_IN, AnimationConstants.FADE_OUT)
     }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AddressElementActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.annotation.VisibleForTesting
 import androidx.compose.animation.ExperimentalAnimationApi
@@ -13,7 +14,6 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Surface
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
@@ -47,9 +47,9 @@ internal class AddressElementActivity : ComponentActivity() {
 
     @OptIn(ExperimentalAnimationApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         starterArgs.config?.appearance?.parseAppearance()
 
         setContent {
@@ -129,6 +129,7 @@ internal class AddressElementActivity : ComponentActivity() {
 
     override fun finish() {
         super.finish()
+        @Suppress("DEPRECATION")
         overridePendingTransition(AnimationConstants.FADE_IN, AnimationConstants.FADE_OUT)
     }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/polling/PollingActivity.kt

@@ -5,13 +5,13 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.ViewModelProvider
 import com.stripe.android.common.ui.BottomSheet
 import com.stripe.android.common.ui.rememberBottomSheetState
@@ -40,10 +40,9 @@ internal class PollingActivity : AppCompatActivity() {
 
     @OptIn(ExperimentalMaterialApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         setContent {
             StripeTheme {
                 val state = rememberBottomSheetState(confirmValueChange = { false })
@@ -81,6 +80,7 @@ internal class PollingActivity : AppCompatActivity() {
             Intent().putExtras(result.toBundle())
         )
         finish()
+        @Suppress("DEPRECATION")
         overridePendingTransition(0, AnimationConstants.FADE_OUT)
     }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/BaseSheetActivity.kt

@@ -4,8 +4,8 @@ import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
 import androidx.activity.addCallback
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
 import com.stripe.android.paymentsheet.LinkHandler
 import com.stripe.android.paymentsheet.viewmodels.BaseSheetViewModel
 import com.stripe.android.utils.AnimationConstants
@@ -21,6 +21,7 @@ internal abstract class BaseSheetActivity<ResultType> : AppCompatActivity() {
     abstract fun setActivityResult(result: ResultType)
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         if (earlyExitDueToIllegalState) {
@@ -33,23 +34,14 @@ internal abstract class BaseSheetActivity<ResultType> : AppCompatActivity() {
             requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         }
 
-        renderEdgeToEdge()
-
         onBackPressedDispatcher.addCallback {
             viewModel.handleBackPressed()
         }
     }
 
     override fun finish() {
         super.finish()
+        @Suppress("DEPRECATION")
         overridePendingTransition(AnimationConstants.FADE_IN, AnimationConstants.FADE_OUT)
     }
-
-    private fun renderEdgeToEdge() {
-        if (Build.VERSION.SDK_INT < 30) {
-            return
-        }
-
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-    }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/PaymentElement.kt

@@ -1,5 +1,6 @@
 package com.stripe.android.paymentsheet.ui
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -86,7 +87,7 @@ internal fun PaymentElement(
             }
         }
 
-        if (showLinkInlineSignup) {
+        AnimatedVisibility(visible = showLinkInlineSignup) {
             LinkInlineSignup(
                 linkConfigurationCoordinator = linkConfigurationCoordinator,
                 enabled = enabled,

stripe-ui-core/src/test/resources/robolectric.properties

@@ -0,0 +1 @@
+sdk=33