refactor

Author: kiftio

samples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/CheckoutSdkApp.kt

@@ -64,7 +64,7 @@ import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.SnackbarCon
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.navigation.BottomAppBarWithNavigation
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.navigation.CheckoutSdkNavHost
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.navigation.Screen
-import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.CheckoutEventHandler
+import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.NativeSheetsOrchestrator
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.theme.CheckoutSdkSampleTheme
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.logs.LogsViewModel
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.settings.SettingsUiState
@@ -182,7 +182,7 @@ fun CheckoutSdkAppRoot(
                 }
             }
 
-            CheckoutEventHandler()
+            NativeSheetsOrchestrator()
         }
     }
 }

samples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/common/MobileBuyEventProcessor.kt

@@ -37,7 +37,8 @@ import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.analytics.A
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.analytics.toAnalyticsEvent
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.logs.Logger
 import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.navigation.Screen
-import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.AddressPickerState
+import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.NativeSheet
+import com.shopify.checkout_sdk_mobile_buy_integration_sample.common.ui.NativeSheetState
 import com.shopify.checkoutsheetkit.CartDelivery
 import com.shopify.checkoutsheetkit.CartDeliveryAddressInput
 import com.shopify.checkoutsheetkit.CartSelectableAddressInput
@@ -96,7 +97,7 @@ class MobileBuyEventProcessor(
 
     override fun onAddressChangeRequested(event: CheckoutAddressChangeRequestedEvent) {
         logger.log("Address change requested")
-        AddressPickerState.showPicker(event)
+        NativeSheetState.show(NativeSheet.Address(event))
     }
 
     override fun onShowFileChooser(

…sample/common/ui/CheckoutEventHandler.kt …le/common/ui/NativeSheetsOrchestrator.ktsamples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/common/ui/CheckoutEventHandler.kt renamed to samples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/common/ui/NativeSheetsOrchestrator.kt samples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/common/ui/CheckoutEventHandler.kt renamed to samples/MobileBuyIntegration/app/src/main/java/com/shopify/checkout_sdk_mobile_buy_integration_sample/common/ui/NativeSheetsOrchestrator.kt

@@ -33,48 +33,71 @@ import com.shopify.checkoutsheetkit.CheckoutAddressChangeRequestedEvent
 import com.shopify.checkoutsheetkit.DeliveryAddressChangePayload
 
 /**
- * Handles checkout-related UI events (address picker, payment methods, etc.)
- * Centralizes all checkout event responses in one place.
+ * Represents the different types of native sheets that can be displayed during checkout.
+ */
+sealed class NativeSheet {
+    data class Address(val event: CheckoutAddressChangeRequestedEvent) : NativeSheet()
+    // Future: data class Payment(val event: CheckoutPaymentMethodChangeRequestedEvent) : NativeSheet()
+}
+
+/**
+ * Orchestrates native sheets displayed during checkout (address picker, payment methods, etc.)
+ * Watches for checkout events and launches the appropriate native sheet components.
+ * Ensures only one sheet is displayed at a time.
+ */
+@Composable
+fun NativeSheetsOrchestrator() {
+    when (val sheet = NativeSheetState.currentSheet) {
+        is NativeSheet.Address -> AddressSheet(
+            event = sheet.event,
+            onDismiss = { NativeSheetState.dismiss() }
+        )
+        null -> { /* No sheet showing */ }
+    }
+}
+
+/**
+ * Native sheet for address selection.
+ * Presents a bottom sheet with address options and responds to the checkout with the selected address.
  */
 @Composable
-fun CheckoutEventHandler() {
-    val addressEvent = AddressPickerState.currentEvent
-    addressEvent?.let { event ->
-        AddressSelectionBottomSheet(
-            onAddressSelected = { selectedAddress ->
-                event.respondWith(
-                    DeliveryAddressChangePayload(
-                        delivery = CartDelivery(
-                            addresses = listOf(
-                                CartSelectableAddressInput(
-                                    address = selectedAddress
-                                )
+fun AddressSheet(
+    event: CheckoutAddressChangeRequestedEvent,
+    onDismiss: () -> Unit
+) {
+    AddressSelectionBottomSheet(
+        onAddressSelected = { selectedAddress ->
+            event.respondWith(
+                DeliveryAddressChangePayload(
+                    delivery = CartDelivery(
+                        addresses = listOf(
+                            CartSelectableAddressInput(
+                                address = selectedAddress
                             )
                         )
                     )
                 )
-                AddressPickerState.dismissPicker()
-            },
-            onDismiss = {
-                AddressPickerState.dismissPicker()
-            }
-        )
-    }
+            )
+            onDismiss()
+        },
+        onDismiss = onDismiss
+    )
 }
 
 /**
- * Shared state holder for address change events.
+ * Shared state holder for native sheets.
+ * Ensures only one sheet is displayed at a time.
  * Used to bridge between the event callback and Compose UI.
  */
-object AddressPickerState {
-    var currentEvent by mutableStateOf<CheckoutAddressChangeRequestedEvent?>(null)
+object NativeSheetState {
+    var currentSheet by mutableStateOf<NativeSheet?>(null)
         private set
 
-    fun showPicker(event: CheckoutAddressChangeRequestedEvent) {
-        currentEvent = event
+    fun show(sheet: NativeSheet) {
+        currentSheet = sheet
     }
 
-    fun dismissPicker() {
-        currentEvent = null
+    fun dismiss() {
+        currentSheet = null
     }
-}
+}