Merge branch 'trunk' into bug/run-DB-query-on-IO-dispatcher

Author: samiuelson

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 23.7
 -----
-
+- [Internal] Handle BLUETOOTH_PEER_REMOVED_PAIRING_INFORMATION disconnect reason from Stripe SDK [https://github.com/woocommerce/woocommerce-android/pull/14886]
 
 23.6
 -----

WooCommerce/build.gradle

@@ -221,6 +221,7 @@ dependencies {
     implementation(libs.androidx.constraintlayout.main)
     implementation(libs.androidx.recyclerview.main)
     implementation(libs.androidx.recyclerview.selection)
+    implementation(libs.androidx.swiperefreshlayout)
     implementation(libs.androidx.appcompat)
     implementation(libs.google.material)
     implementation(libs.google.compose.material3)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingsCommunicationViewModel.kt

@@ -0,0 +1,21 @@
+package com.woocommerce.android.ui.bookings
+
+import androidx.lifecycle.SavedStateHandle
+import com.woocommerce.android.viewmodel.MultiLiveEvent
+import com.woocommerce.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+
+/**
+ * Activity-scoped ViewModel used to communicate between Booking list and details in split-pane mode.
+ */
+class BookingsCommunicationViewModel @Inject constructor(
+    savedState: SavedStateHandle
+) : ScopedViewModel(savedState) {
+    fun pushEvent(event: CommunicationEvent) {
+        triggerEvent(event)
+    }
+
+    sealed class CommunicationEvent : MultiLiveEvent.Event() {
+        data class BookingSelected(val bookingId: Long) : CommunicationEvent()
+    }
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingPaymentSection.kt

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.bookings.compose
 
 import androidx.annotation.StringRes
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -59,7 +60,7 @@ fun BookingPaymentSection(
                 modifier = Modifier.padding(start = 16.dp)
             )
             Spacer(modifier = Modifier.height(16.dp))
-            if (status == BookingStatus.Unpaid) {
+            AnimatedVisibility(status == BookingStatus.Unpaid) {
                 WCColoredButton(
                     onClick = onMarkAsPaid,
                     text = stringResource(id = R.string.booking_payment_mark_as_paid),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsFragment.kt

@@ -1,18 +1,26 @@
 package com.woocommerce.android.ui.bookings.details
 
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import com.woocommerce.android.NavGraphMainDirections
+import com.woocommerce.android.R
+import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.base.UIMessageResolver
+import com.woocommerce.android.ui.bookings.BookingsCommunicationViewModel
 import com.woocommerce.android.ui.compose.composeView
 import com.woocommerce.android.ui.main.AppBarStatus
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -23,6 +31,7 @@ class BookingDetailsFragment : BaseFragment() {
 
     private val viewModel: BookingDetailsViewModel by viewModels()
     private val args: BookingDetailsFragmentArgs by navArgs()
+    private val bookingsCommunicationViewModel: BookingsCommunicationViewModel by activityViewModels()
 
     override val activityAppBarStatus: AppBarStatus
         get() = AppBarStatus.Hidden
@@ -32,25 +41,14 @@ class BookingDetailsFragment : BaseFragment() {
             BookingDetailsScreen(
                 viewModel = viewModel,
                 onBack = { findNavController().popBackStack() },
-                onViewOrder = { orderId ->
-                    findNavController().navigate(
-                        BookingDetailsFragmentDirections
-                            .actionBookingDetailsFragmentToOrderDetailFragment(orderId)
-                    )
-                },
-                onViewNotes = {
-                    findNavController().navigate(
-                        BookingDetailsFragmentDirections
-                            .actionBookingDetailsFragmentToBookingNoteFragment(args.bookingId)
-                    )
-                }
             )
         }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         handleEvents()
+        handleOnePaneToTwoPaneConversion()
     }
 
     private fun handleEvents() {
@@ -59,7 +57,50 @@ class BookingDetailsFragment : BaseFragment() {
                 is MultiLiveEvent.Event.ShowSnackbar -> {
                     uiMessageResolver.showSnack(event.message)
                 }
+                is BookingDetailsViewModel.NavigateToBookingNote -> {
+                    findNavController().navigate(
+                        BookingDetailsFragmentDirections
+                            .actionBookingDetailsFragmentToBookingNoteFragment(event.bookingId)
+                    )
+                }
+                is BookingDetailsViewModel.NavigateToOrder -> {
+                    requireActivity().findNavController(R.id.nav_host_fragment_main).navigate(
+                        NavGraphMainDirections.actionGlobalOrderDetailFragment(
+                            orderId = event.orderId,
+                            ignoreTwoPaneLayoutLogic = true
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    private fun handleOnePaneToTwoPaneConversion() {
+        val isScreenLargerThanCompact = requireContext().isTwoPanesShouldBeUsed
+        val isBookingListFragmentUpInBackStack =
+            findNavController().previousBackStackEntry?.destination?.id == R.id.bookingListFragment
+        if (isScreenLargerThanCompact && isBookingListFragmentUpInBackStack) {
+            when (val mode = args.mode) {
+                is Mode.ShowBooking -> {
+                    findNavController().popBackStack()
+                    bookingsCommunicationViewModel.pushEvent(
+                        BookingsCommunicationViewModel.CommunicationEvent.BookingSelected(mode.bookingId)
+                    )
+                }
+
+                is Mode.Empty -> {
+                    findNavController().popBackStack()
+                }
             }
         }
     }
+
+    @Parcelize
+    sealed class Mode : Parcelable {
+        @Parcelize
+        data object Empty : Mode()
+
+        @Parcelize
+        data class ShowBooking(val bookingId: Long) : Mode()
+    }
 }