Merge branch 'trunk' into woomob-1573-woo-poslocal-catalog-getfrommemoryincache-uses-store

Author: samiuelson

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 23.7
 -----
+- [Internal][Woo POS] Survey for potential and current users of the POS delivered via local push notification. [https://github.com/woocommerce/woocommerce-android/pull/14751]
 - [Internal] Handle BLUETOOTH_PEER_REMOVED_PAIRING_INFORMATION disconnect reason from Stripe SDK [https://github.com/woocommerce/woocommerce-android/pull/14886]
 
 23.6

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/LocalNotificationType.kt

@@ -3,8 +3,8 @@ package com.woocommerce.android.notifications.local
 enum class LocalNotificationType(val value: String) {
     BLAZE_NO_CAMPAIGN_REMINDER("blaze_no_campaign_reminder"),
     BLAZE_ABANDONED_CAMPAIGN_REMINDER("blaze_abandoned_campaign_reminder"),
-    WOO_POS_SURVEY_POTENTIAL_USER_REMINDER("woo_pos_survey_potential_user_reminder"),
-    WOO_POS_SURVEY_CURRENT_USER_REMINDER("woo_pos_survey_current_user_reminder");
+    WOO_POS_SURVEY_POTENTIAL_USER_REMINDER("woo_pos_survey_potential_user_survey"),
+    WOO_POS_SURVEY_CURRENT_USER_REMINDER("woo_pos_survey_current_user_survey");
     override fun toString() = value
 
     companion object {

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

@@ -33,6 +33,7 @@ import com.woocommerce.android.ui.bookings.filter.type.BookingTypeFilterRoute
 import com.woocommerce.android.ui.compose.Render
 import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.WCColoredButton
+import com.woocommerce.android.ui.compose.component.getText
 import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
@@ -43,7 +44,7 @@ fun BookingFilterListScreen(state: BookingFilterListUiState) {
         topBar = {
             Column {
                 Toolbar(
-                    title = stringResource(state.currentPage.titleRes),
+                    title = state.title.getText(),
                     onNavigationButtonClick = state.onClose,
                     navigationIcon = ImageVector.vectorResource(id = state.navigationIcon)
                 )

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

@@ -45,6 +45,23 @@ data class BookingFilterListUiState(
             initialBookingFilters?.bookingType
         ) ?: BookingsFilterOption.BookingType(BookingsFilterOption.BookingType.Type.ANY)
 
+    val updatedBookingFilters: BookingFilters
+        get() {
+            val initial = initialBookingFilters ?: BookingFilters()
+            return BookingFilters(
+                dateRange = newBookingFilters.getOrDefault(initial.dateRange),
+                customer = newBookingFilters.getOrDefault(initial.customer),
+                teamMember = newBookingFilters.getOrDefault(initial.teamMember),
+                attendanceStatus = newBookingFilters.getOrDefault(initial.attendanceStatus),
+                paymentStatus = newBookingFilters.getOrDefault(initial.paymentStatus),
+                bookingType = newBookingFilters.getOrDefault(initial.bookingType),
+                location = newBookingFilters.getOrDefault(initial.location),
+                serviceEvent = newBookingFilters.getOrDefault(initial.serviceEvent),
+            )
+        }
+
+    val updatedBookingFiltersCount = updatedBookingFilters.enabledFiltersCount
+
     @DrawableRes
     val navigationIcon: Int = when (currentPage) {
         BookingFilterPage.List -> R.drawable.ic_gridicons_cross_24dp
@@ -73,6 +90,18 @@ data class BookingFilterListUiState(
             BookingFilterPage.TeamMember,
             BookingFilterPage.List -> null
         }
+
+    val title: UiString
+        get() = if (currentPage != BookingFilterPage.List) {
+            UiString.UiStringRes(currentPage.titleRes)
+        } else if (updatedBookingFiltersCount > 0) {
+            UiString.UiStringRes(
+                stringRes = R.string.bookings_filters_title_with_count,
+                params = listOf(UiString.UiStringText(updatedBookingFiltersCount.toString()))
+            )
+        } else {
+            UiString.UiStringRes(R.string.bookings_filters_default_title)
+        }
 }
 
 val BookingFilterPage.titleRes: Int

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

@@ -114,22 +114,3 @@ class BookingFilterListViewModel @Inject constructor(
         return updated != initial
     }
 }
-
-private val BookingFilterListUiState.updatedBookingFilters: BookingFilters
-    get() {
-        val initial = initialBookingFilters ?: BookingFilters()
-        val updates = this@updatedBookingFilters.newBookingFilters
-
-        return BookingFilters(
-            dateRange = updates.getOrDefault(initial.dateRange),
-            customer = updates.getOrDefault(initial.customer),
-            teamMember = updates.getOrDefault(
-                initial.teamMember
-            ),
-            attendanceStatus = updates.getOrDefault(initial.attendanceStatus),
-            paymentStatus = updates.getOrDefault(initial.paymentStatus),
-            bookingType = updates.getOrDefault(initial.bookingType),
-            location = updates.getOrDefault(initial.location),
-            serviceEvent = updates.getOrDefault(initial.serviceEvent),
-        )
-    }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt

@@ -7,6 +7,7 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -56,6 +57,7 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
     private var progressDialog: CustomProgressDialog? = null
     private var surveyCompleted: Boolean = false
     private val surveyWebViewClient = SurveyWebViewClient()
+    private var backPressedCallback: OnBackPressedCallback? = null
     private val arguments: FeedbackSurveyFragmentArgs by navArgs()
     private val feedbackContext by lazy {
         when (arguments.surveyType) {
@@ -77,6 +79,7 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
         _binding = FragmentFeedbackSurveyBinding.bind(view)
 
         setupToolbar(binding.toolbar)
+        setupBackPressHandling()
 
         configureWebView()
         savedInstanceState?.let {
@@ -95,6 +98,21 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
         activity?.invalidateOptionsMenu()
     }
 
+    private fun setupBackPressHandling() {
+        backPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (binding.webView.canGoBack()) {
+                    binding.webView.goBack()
+                } else {
+                    isEnabled = false
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+            }
+        }.also {
+            requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, it)
+        }
+    }
+
     private fun getSurveyUrlFromArguments(): String = arguments.customUrl ?: arguments.surveyType.url
 
     private fun addCrowdSignalTagsTo(url: String): String {
@@ -112,6 +130,8 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        backPressedCallback?.remove()
+        backPressedCallback = null
         _binding = null
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/util/WooPosSurveysNotificationScheduler.kt

@@ -5,7 +5,6 @@ import com.woocommerce.android.notifications.local.LocalNotification
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.woopos.util.datastore.WooPosPreferencesRepository
-import com.woocommerce.android.util.FeatureFlag
 import kotlinx.coroutines.flow.first
 import org.wordpress.android.fluxc.store.WooCommerceStore
 import java.util.concurrent.TimeUnit
@@ -26,7 +25,7 @@ class WooPosSurveysNotificationScheduler @Inject constructor(
     suspend fun schedulePotentialUserSurveyNotification() {
         if (!appPrefs.isWooPosSurveyNotificationPotentialUserShown &&
             !wooPosPreferencesRepository.wasOpenedOnce.first() &&
-            areNotificationsAllowed()
+            isAllowedCountry()
         ) {
             localNotificationScheduler.scheduleNotification(
                 LocalNotification.WooPosSurveyPotentialUserNotification(
@@ -39,7 +38,7 @@ class WooPosSurveysNotificationScheduler @Inject constructor(
     suspend fun scheduleCurrentUserSurveyNotification() {
         if (!appPrefs.isWooPosSurveyNotificationCurrentUserShown &&
             wooPosPreferencesRepository.wasOpenedOnce.first() &&
-            areNotificationsAllowed()
+            isAllowedCountry()
         ) {
             localNotificationScheduler.scheduleNotification(
                 LocalNotification.WooPosSurveyCurrentUserNotification(
@@ -50,9 +49,6 @@ class WooPosSurveysNotificationScheduler @Inject constructor(
         }
     }
 
-    private suspend fun areNotificationsAllowed(): Boolean =
-        isAllowedCountry() && FeatureFlag.WOO_POS_SURVEYS.isEnabled()
-
     private suspend fun isAllowedCountry(): Boolean {
         val countryCode = wooCommerceStore.getSiteSettingsAsync(selectedSite.get())?.countryCode
         return countryCode?.lowercase() in ALLOWED_COUNTRIES

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

@@ -10,7 +10,6 @@ enum class FeatureFlag {
     WC_SHIPPING_BANNER,
     BETTER_CUSTOMER_SEARCH_M2,
     ORDER_CREATION_AUTO_TAX_RATE,
-    WOO_POS_SURVEYS,
     WOO_POS_LOCAL_CATALOG_M1,
     BOOKINGS_MVP;
 
@@ -21,7 +20,6 @@ enum class FeatureFlag {
             }
 
             WC_SHIPPING_BANNER,
-            WOO_POS_SURVEYS,
             BETTER_CUSTOMER_SEARCH_M2,
             ORDER_CREATION_AUTO_TAX_RATE,
             WOO_POS_LOCAL_CATALOG_M1,

WooCommerce/src/main/res/values/strings.xml

@@ -4236,7 +4236,7 @@
     <string name="bookings_empty_state_clear_filters_button">Clear filters</string>
     <string name="bookings_filters_default_title">Filters</string>
     <string name="bookings_filters_enabled_title">Filters • %d</string>
-    <string name="bookings_filters_count_title">Filters (%d)</string>
+    <string name="bookings_filters_title_with_count">Filters (%s)</string>
     <string name="bookings_filters_show_bookings">Show bookings</string>
     <string name="bookings_filter_title_team_member">Assigned team member</string>
     <string name="bookings_filter_title_attendance_status">Attendance status</string>