Merge branch 'trunk' into issue/WOOMOB-1548-filters-chip-dark-mode-color

Author: irfano

RELEASE-NOTES.txt

@@ -3,6 +3,8 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 23.6
 -----
+- [Internal] Improve WebView experience by using Authenticated WebView for more scenarios [https://github.com/woocommerce/woocommerce-android/pull/14826]
+- [Internal] Update In-Person Payments setup flow to use Authenticated WebView [https://github.com/woocommerce/woocommerce-android/pull/14827]
 - [*] Improved the Filters button colors on the Orders and Products screens [https://github.com/woocommerce/woocommerce-android/pull/14832]
 
 23.5

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

@@ -1,7 +1,10 @@
 package com.woocommerce.android.ui.bookings
 
 import com.woocommerce.android.WooException
+import com.woocommerce.android.di.AppCoroutineScope
 import com.woocommerce.android.tools.SelectedSite
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingUpdatePayload
@@ -14,7 +17,8 @@ import javax.inject.Inject
 
 class BookingsRepository @Inject constructor(
     private val selectedSite: SelectedSite,
-    private val bookingsStore: BookingsStore
+    private val bookingsStore: BookingsStore,
+    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
 ) {
     suspend fun fetchBookings(
         page: Int,
@@ -112,50 +116,66 @@ class BookingsRepository @Inject constructor(
     suspend fun updateAttendanceStatus(
         bookingId: Long,
         attendanceStatus: BookingEntity.AttendanceStatus,
-    ): Result<Unit> {
+    ): Result<Unit> = appCoroutineScope.async {
         val result = bookingsStore.updateBooking(
             site = selectedSite.get(),
             bookingId = bookingId,
             bookingUpdatePayload = BookingUpdatePayload(attendanceStatus = attendanceStatus)
         )
-        return if (result.isError) {
+        if (result.isError) {
             Result.failure(WooException(result.error))
         } else {
             Result.success(Unit)
         }
-    }
+    }.await()
 
     suspend fun updateNote(
         bookingId: Long,
         note: String,
-    ): Result<Unit> {
+    ): Result<Unit> = appCoroutineScope.async {
         val result = bookingsStore.updateBooking(
             site = selectedSite.get(),
             bookingId = bookingId,
             bookingUpdatePayload = BookingUpdatePayload(note = note)
         )
-        return if (result.isError) {
+        if (result.isError) {
             Result.failure(WooException(result.error))
         } else {
             Result.success(Unit)
         }
-    }
+    }.await()
 
     suspend fun cancelBooking(
         bookingId: Long,
-    ): Result<Unit> {
+    ): Result<Unit> = appCoroutineScope.async {
         val result = bookingsStore.updateBooking(
             site = selectedSite.get(),
             bookingId = bookingId,
             bookingUpdatePayload = BookingUpdatePayload(status = BookingEntity.Status.Cancelled),
             refreshOrder = true,
         )
-        return if (result.isError) {
+        if (result.isError) {
             Result.failure(WooException(result.error))
         } else {
             Result.success(Unit)
         }
-    }
+    }.await()
+
+    suspend fun markAsPaid(
+        bookingId: Long,
+    ): Result<Unit> = appCoroutineScope.async {
+        val result = bookingsStore.updateBooking(
+            site = selectedSite.get(),
+            bookingId = bookingId,
+            bookingUpdatePayload = BookingUpdatePayload(status = BookingEntity.Status.Paid),
+            refreshOrder = true,
+        )
+        if (result.isError) {
+            Result.failure(WooException(result.error))
+        } else {
+            Result.success(Unit)
+        }
+    }.await()
 
     data class FetchResult(
         val bookings: List<Booking>,

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

@@ -30,9 +30,9 @@ fun BookingPaymentSection(
     model: BookingPaymentDetailsModel,
     status: BookingStatus,
     onMarkAsPaid: () -> Unit,
-    onMarkAsRefunded: () -> Unit,
     onViewOrder: () -> Unit,
     modifier: Modifier = Modifier,
+    markAsPaidInProgress: Boolean = false,
 ) {
     Column(modifier = modifier) {
         BookingSectionHeader(R.string.booking_payment_header)
@@ -59,28 +59,18 @@ fun BookingPaymentSection(
                 modifier = Modifier.padding(start = 16.dp)
             )
             Spacer(modifier = Modifier.height(16.dp))
-            // TODO Change the logic and use Order info when available
-            if (status == BookingStatus.Paid) {
-                WCOutlinedButton(
-                    onClick = onMarkAsRefunded,
-                    colors = ButtonDefaults.outlinedButtonColors(
-                        contentColor = MaterialTheme.colorScheme.onSurface
-                    ),
-                    text = stringResource(id = R.string.orderdetail_issue_refund_button),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
-                )
-            } else {
+            if (status == BookingStatus.Unpaid) {
                 WCColoredButton(
                     onClick = onMarkAsPaid,
                     text = stringResource(id = R.string.booking_payment_mark_as_paid),
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
+                        .padding(horizontal = 16.dp),
+                    loading = markAsPaidInProgress,
+                    enabled = !markAsPaidInProgress,
                 )
+                Spacer(modifier = Modifier.height(8.dp))
             }
-            Spacer(modifier = Modifier.height(8.dp))
             WCOutlinedButton(
                 onClick = onViewOrder,
                 colors = ButtonDefaults.outlinedButtonColors(
@@ -145,18 +135,17 @@ private fun BookingPaymentSectionPreview() {
                 discount = "-",
                 total = "$59.50"
             ),
-            status = BookingStatus.Complete,
+            status = BookingStatus.Unpaid,
             onMarkAsPaid = {},
             onViewOrder = {},
-            onMarkAsRefunded = {},
             modifier = Modifier.fillMaxWidth()
         )
     }
 }
 
 @LightDarkThemePreviews
 @Composable
-private fun BookingPaymentSectionWithRefundOptionPreview() {
+private fun BookingPaymentSectionWithPaidBookingPreview() {
     WooThemeWithBackground {
         BookingPaymentSection(
             model = BookingPaymentDetailsModel(
@@ -168,7 +157,6 @@ private fun BookingPaymentSectionWithRefundOptionPreview() {
             status = BookingStatus.Paid,
             onMarkAsPaid = {},
             onViewOrder = {},
-            onMarkAsRefunded = {},
             modifier = Modifier.fillMaxWidth()
         )
     }

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

@@ -108,6 +108,8 @@ fun BookingDetailsScreen(
                             onViewOrder = onViewOrder,
                             onAttendanceStatusClicked = { showAttendanceSheet.value = true },
                             onViewNotes = onViewNotes,
+                            onMarkAsPaid = viewState.onMarkAsPaid,
+                            markAsPaidInProgress = viewState.paymentUpdateStatus == PaymentUpdateStatus.InProgress,
                         )
                     }
                 }
@@ -132,6 +134,8 @@ private fun BookingDetailsContent(
     onViewOrder: (Long) -> Unit,
     onAttendanceStatusClicked: () -> Unit,
     onViewNotes: () -> Unit,
+    onMarkAsPaid: () -> Unit,
+    markAsPaidInProgress: Boolean,
 ) {
     BookingSummary(
         model = booking.bookingSummary,
@@ -158,10 +162,10 @@ private fun BookingDetailsContent(
         BookingPaymentSection(
             model = it,
             status = booking.bookingSummary.status,
-            onMarkAsPaid = { onViewOrder(booking.orderId) },
+            onMarkAsPaid = onMarkAsPaid,
             onViewOrder = { onViewOrder(booking.orderId) },
-            onMarkAsRefunded = { onViewOrder(booking.orderId) },
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
+            markAsPaidInProgress = markAsPaidInProgress,
         )
     }
     BookingNoteSection(

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

@@ -60,6 +60,8 @@ class BookingDetailsViewModel @Inject constructor(
     private val cancelStatusState = MutableStateFlow<CancelStatus>(CancelStatus.Idle)
     private val showCancelBookingDialog = MutableStateFlow(false)
 
+    private val paymentUpdateStatus = MutableStateFlow<PaymentUpdateStatus>(PaymentUpdateStatus.Idle)
+
     private val cancelBookingDialogState = combine(
         booking,
         showCancelBookingDialog,
@@ -102,7 +104,8 @@ class BookingDetailsViewModel @Inject constructor(
         bookingUiStateFlow,
         loadingState,
         cancelBookingDialogState,
-    ) { booking, bookingUiState, loadingState, cancelBookingDialog ->
+        paymentUpdateStatus,
+    ) { booking, bookingUiState, loadingState, cancelBookingDialog, paymentUpdateStatus ->
         with(bookingMapper) {
             BookingDetailsViewState(
                 toolbarTitle = booking?.id?.value?.let { id ->
@@ -115,6 +118,8 @@ class BookingDetailsViewModel @Inject constructor(
                         onAttendanceStatusSelected(attendanceStatus)
                     }
                 },
+                onMarkAsPaid = ::onMarkAsPaid,
+                paymentUpdateStatus = paymentUpdateStatus,
                 dialogState = cancelBookingDialog,
                 loadingState = loadingState,
                 onRefresh = ::fetchBooking,
@@ -197,6 +202,19 @@ class BookingDetailsViewModel @Inject constructor(
         cancelStatusState.value = CancelStatus.Idle
     }
 
+    private fun onMarkAsPaid() = launch {
+        if (!networkStatus.isConnected()) {
+            triggerEvent(MultiLiveEvent.Event.ShowSnackbar(R.string.offline_error))
+            return@launch
+        }
+        paymentUpdateStatus.value = PaymentUpdateStatus.InProgress
+        bookingsRepository.markAsPaid(navArgs.bookingId)
+            .onFailure {
+                triggerEvent(MultiLiveEvent.Event.ShowSnackbar(R.string.booking_mark_as_paid_error))
+            }
+        paymentUpdateStatus.value = PaymentUpdateStatus.Idle
+    }
+
     private suspend fun BookingMapper.buildBookingUiState(
         booking: Booking,
         attendanceUpdateStatus: AttendanceUpdateStatus,

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

@@ -13,6 +13,8 @@ data class BookingDetailsViewState(
     val loadingState: BookingDetailsLoadingState = BookingDetailsLoadingState.Idle,
     val onCancelBooking: () -> Unit = {},
     val onAttendanceStatusSelected: (BookingAttendanceStatus) -> Unit = { _ -> },
+    val onMarkAsPaid: () -> Unit = {},
+    val paymentUpdateStatus: PaymentUpdateStatus = PaymentUpdateStatus.Idle,
     val dialogState: DialogState? = null,
     val onRefresh: () -> Unit = {},
 ) {
@@ -44,3 +46,8 @@ sealed interface AttendanceUpdateStatus {
     data object Idle : AttendanceUpdateStatus
     data object InProgress : AttendanceUpdateStatus
 }
+
+sealed interface PaymentUpdateStatus {
+    data object Idle : PaymentUpdateStatus
+    data object InProgress : PaymentUpdateStatus
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/common/webview/AuthenticatedWebViewLauncher.kt

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.common.webview
 
 import android.content.Context
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
@@ -32,6 +33,10 @@ class AuthenticatedWebViewLauncher @Inject constructor(
             navController.navigate(action)
         } else {
             ChromeCustomTabUtils.launchUrl(context, event.url)
+            if (fragment is DialogFragment) {
+                // To align with the regular fragment behavior, we dismiss the dialog after launching the CCT.
+                fragment.dismiss()
+            }
         }
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/web/WCWebChromeClient.kt

@@ -1,11 +1,14 @@
 package com.woocommerce.android.ui.compose.component.web
 
 import android.net.Uri
+import android.os.Message
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import android.widget.FrameLayout
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.isVisible
 import com.woocommerce.android.extensions.findActivity
 
 open class WCWebChromeClient : WebChromeClient() {
@@ -48,4 +51,42 @@ open class WCWebChromeClient : WebChromeClient() {
     override fun onProgressChanged(view: WebView?, newProgress: Int) {
         onProgressChanged(newProgress)
     }
+
+    override fun onCreateWindow(
+        view: WebView,
+        isDialog: Boolean,
+        isUserGesture: Boolean,
+        resultMsg: Message
+    ): Boolean {
+        require(view.parent is FrameLayout) {
+            "Ensure the WebView is added to a FrameLayout to support popups. Check WCWebView implementation."
+        }
+
+        val popupContainer = view.parent as FrameLayout
+
+        val popupWebView = WebView(view.context).apply {
+            settings.useWideViewPort = view.settings.useWideViewPort
+            settings.loadWithOverviewMode = view.settings.loadWithOverviewMode
+            settings.javaScriptEnabled = view.settings.javaScriptEnabled
+            settings.domStorageEnabled = view.settings.domStorageEnabled
+            settings.setSupportMultipleWindows(true)
+        }
+
+        popupWebView.webViewClient = view.webViewClient
+        popupWebView.webChromeClient = object : WebChromeClient() {
+            override fun onCloseWindow(window: WebView) {
+                popupContainer.removeView(popupWebView)
+                view.isVisible = true
+            }
+        }
+
+        popupContainer.layoutParams = view.layoutParams
+        popupContainer.addView(popupWebView)
+        view.isVisible = false
+
+        (resultMsg.obj as WebView.WebViewTransport).webView = popupWebView
+        resultMsg.sendToTarget()
+
+        return true
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/web/WCWebView.kt

@@ -3,6 +3,7 @@ package com.woocommerce.android.ui.compose.component.web
 import android.annotation.SuppressLint
 import android.view.ViewGroup
 import android.webkit.WebView
+import android.widget.FrameLayout
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -104,6 +105,7 @@ fun WCWebView(
             webView.settings.loadWithOverviewMode = settings.loadWithOverviewMode
             webView.settings.javaScriptEnabled = settings.isJavaScriptEnabled
             webView.settings.domStorageEnabled = settings.isDomStorageEnabled
+            webView.settings.setSupportMultipleWindows(true)
         }
     }
 
@@ -127,7 +129,7 @@ fun WCWebView(
 
         AndroidView(
             factory = { context ->
-                WebView(context).apply {
+                val webView = WebView(context).apply {
                     layoutParams = ViewGroup.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         ViewGroup.LayoutParams.MATCH_PARENT
@@ -140,6 +142,10 @@ fun WCWebView(
 
                     this.settings.userAgentString = userAgent.webViewUserAgent
                 }.also { webView = it }
+
+                FrameLayout(context).apply {
+                    addView(webView)
+                }
             },
             modifier = Modifier
                 .alpha(webViewAlpha)