Improved component bottom sheet behavior on Android.

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 1.0.2
 
 * Improved card component for large font and display sizes.
+* Improved component bottom sheet behavior on Android.
 * Migrated Android example to use Flutter Gradle plugins through the Plugin DSL.
 * Updated iOS SDK to v5.10.0.
 

android/src/main/kotlin/com/adyen/checkout/flutter/components/view/ComponentLoadingBottomSheet.kt

@@ -11,20 +11,23 @@ import com.adyen.checkout.ui.core.AdyenComponentView
 import com.adyen.checkout.ui.core.internal.ui.ViewableComponent
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
-class ComponentLoadingBottomSheet<T>(private val component: T) :
-    BottomSheetDialogFragment() where T : ViewableComponent, T : Component {
+internal class ComponentLoadingBottomSheet<T> : BottomSheetDialogFragment() where T : ViewableComponent, T : Component {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? = inflater.inflate(R.layout.component_bottom_sheet_content, container, false)
 
+    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?
     ) {
-        view.findViewById<AdyenComponentView>(R.id.adyen_component_view)?.attach(component, viewLifecycleOwner)
-        isCancelable = false
+        // We need to cast the component because it has two types T (ViewableComponent and Component)
+        (component as? T)?.let {
+            view.findViewById<AdyenComponentView>(R.id.adyen_component_view)?.attach(it, viewLifecycleOwner)
+            isCancelable = false
+        }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?) =
@@ -36,15 +39,18 @@ class ComponentLoadingBottomSheet<T>(private val component: T) :
 
     companion object {
         private const val TAG = "AdyenComponentLoadingBottomSheet"
+        private var component: Any? = null
 
         fun <T> show(
             fragmentManager: FragmentManager,
             component: T
         ) where T : ViewableComponent, T : Component {
-            ComponentLoadingBottomSheet(component).show(fragmentManager, TAG)
+            this.component = component
+            ComponentLoadingBottomSheet<T>().show(fragmentManager, TAG)
         }
 
         fun hide(fragmentManager: FragmentManager) {
+            component = null
             fragmentManager.findFragmentByTag(TAG)?.let {
                 (it as? BottomSheetDialogFragment)?.dismiss()
             }