Merge pull request #13977 from woocommerce/issue/woomob-356-woo-pos-replace-a-product-banner-with-a-menu-item

[WooPos] Replace Product Banner With Menu Item

Author: malinajirka

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 22.3
 -----
-
+- [*] Move info about available product types in the POS to the POS menu [https://github.com/woocommerce/woocommerce-android/pull/13977]
 
 22.2
 -----

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeChildToParentCommunication.kt

@@ -34,7 +34,7 @@ sealed class ChildToParentEvent {
     data object GoBackToCheckoutAfterFailedPayment : ChildToParentEvent()
     data object OrderSuccessfullyPaidByCard : ChildToParentEvent()
     data object ExitPosClicked : ChildToParentEvent()
-    data object ProductsDialogInfoIconClicked : ChildToParentEvent()
+    data object SimpleProductExplanationMenuItemClicked : ChildToParentEvent()
 
     data class ToastMessageDisplayed(val message: String) : ChildToParentEvent()
     sealed class NavigationEvent : ChildToParentEvent() {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeViewModel.kt

@@ -168,7 +168,7 @@ class WooPosHomeViewModel @Inject constructor(
                         )
                     }
 
-                    ChildToParentEvent.ProductsDialogInfoIconClicked -> {
+                    ChildToParentEvent.SimpleProductExplanationMenuItemClicked -> {
                         _state.value = _state.value.copy(
                             productsInfoDialog = ProductsInfoDialog(isVisible = true)
                         )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosBanner.kt

@@ -1,9 +1,6 @@
 package com.woocommerce.android.ui.woopos.home.items
 
 sealed class WooPosItemsUIEvent {
-    data object SimpleProductsBannerClosed : WooPosItemsUIEvent()
-    data object SimpleProductsBannerLearnMoreClicked : WooPosItemsUIEvent()
-    data object SimpleProductsDialogInfoIconClicked : WooPosItemsUIEvent()
     data class OnTabClicked(val tab: WooPosItemsViewState.Tab) : WooPosItemsUIEvent()
     data object BackButtonClicked : WooPosItemsUIEvent()
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsUIEvent.kt

@@ -5,12 +5,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.woopos.featureflags.WooPosIsProductsSearchEnabled
-import com.woocommerce.android.ui.woopos.home.ChildToParentEvent
-import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsViewState.Tab
 import com.woocommerce.android.ui.woopos.home.items.navigation.WooPosItemsNavigator
 import com.woocommerce.android.ui.woopos.home.items.navigation.WooPosItemsNavigator.WooPosItemsScreenNavigationEvent
-import com.woocommerce.android.ui.woopos.util.datastore.WooPosPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -22,8 +19,6 @@ import javax.inject.Inject
 
 @HiltViewModel
 class WooPosItemsViewModel @Inject constructor(
-    private val fromChildToParentEventSender: WooPosChildrenToParentEventSender,
-    private val preferencesRepository: WooPosPreferencesRepository,
     private val navigator: WooPosItemsNavigator,
     private val searchHelper: WooPosItemsSearchHelper,
     private val isProductsSearchEnabled: WooPosIsProductsSearchEnabled,
@@ -52,18 +47,6 @@ class WooPosItemsViewModel @Inject constructor(
 
     fun onUIEvent(event: WooPosItemsUIEvent) {
         when (event) {
-            WooPosItemsUIEvent.SimpleProductsBannerClosed -> {
-                onSimpleProductsOnlyBannerClosed()
-            }
-
-            WooPosItemsUIEvent.SimpleProductsBannerLearnMoreClicked -> {
-                onSimpleProductsOnlyBannerLearnMoreClicked()
-            }
-
-            WooPosItemsUIEvent.SimpleProductsDialogInfoIconClicked -> {
-                onSimpleProductsDialogInfoClicked()
-            }
-
             WooPosItemsUIEvent.BackButtonClicked -> {
                 navigateBackToItemListScreen()
             }
@@ -89,24 +72,6 @@ class WooPosItemsViewModel @Inject constructor(
         }
     }
 
-    private fun onSimpleProductsOnlyBannerLearnMoreClicked() {
-        onSimpleProductsDialogInfoClicked()
-    }
-
-    private fun onSimpleProductsDialogInfoClicked() {
-        viewModelScope.launch {
-            fromChildToParentEventSender.sendToParent(ChildToParentEvent.ProductsDialogInfoIconClicked)
-        }
-    }
-
-    private fun onSimpleProductsOnlyBannerClosed() {
-        viewModelScope.launch {
-            val currentState = _viewState.value as WooPosItemsViewState.ProductList
-            preferencesRepository.setSimpleProductsOnlyBannerWasHiddenByUser(true)
-            _viewState.value = currentState.copy(banner = WooPosItemsViewState.BannerState.Hidden)
-        }
-    }
-
     private fun selectTab(selectedTab: Tab) {
         if (_viewState.value.tabs.size == 1) return
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsViewModel.kt

@@ -322,46 +322,6 @@ fun WooPosProductsScreenErrorPreview() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-@WooPosPreview
-fun WooPosHomeScreenItemsWithSimpleProductsOnlyBannerPreview() {
-    val productState = MutableStateFlow(
-        WooPosProductsViewState.Content(
-            items = listOf(
-                Product.Simple(
-                    1,
-                    name = "Product 1, Product 1, Product 1, " +
-                        "Product 1, Product 1, Product 1, Product 1, Product 1" +
-                        "Product 1, Product 1, Product 1, Product 1, Product 1",
-                    price = "10.0$",
-                    imageUrl = null,
-                ),
-                Product.Simple(
-                    2,
-                    name = "Product 2",
-                    price = "2000.00$",
-                    imageUrl = null,
-                ),
-                Product.Simple(
-                    3,
-                    name = "Product 3",
-                    price = "1.0$",
-                    imageUrl = null,
-                ),
-            ),
-            pullToRefreshState = WooPosPullToRefreshState.Refreshing,
-        )
-    )
-    WooPosTheme {
-        WooPosProductsScreen(
-            itemsStateFlow = productState,
-            listState = rememberLazyListState(),
-            onUIEvent = {},
-        )
-    }
-}
-
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 @WooPosPreview

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/products/WooPosProductsScreen.kt

@@ -17,6 +17,7 @@ import com.woocommerce.android.ui.woopos.home.toolbar.WooPosToolbarUIEvent.OnOut
 import com.woocommerce.android.ui.woopos.home.toolbar.WooPosToolbarUIEvent.OnToolbarMenuClicked
 import com.woocommerce.android.ui.woopos.support.WooPosGetSupportFacade
 import com.woocommerce.android.ui.woopos.util.WooPosNetworkStatus
+import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEvent
 import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEvent.Event.ExitTapped
 import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEvent.Event.GetSupportTapped
 import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEvent.Event.ViewDocsTapped
@@ -89,6 +90,12 @@ class WooPosToolbarViewModel @Inject constructor(
         hideMenu()
 
         when (event.menuItem.title) {
+            R.string.woopos_product_limitations_title -> {
+                viewModelScope.launch {
+                    childrenToParentEventSender.sendToParent(ChildToParentEvent.SimpleProductExplanationMenuItemClicked)
+                    analyticsTracker.track(WooPosAnalyticsEvent.Event.SimpleProductExplanationDialogShown)
+                }
+            }
             R.string.woopos_get_support_title -> {
                 getSupportFacade.openSupportForm()
                 viewModelScope.launch {
@@ -145,6 +152,10 @@ class WooPosToolbarViewModel @Inject constructor(
 
     private companion object {
         val toolbarMenuItems = listOf(
+            WooPosToolbarState.Menu.MenuItem(
+                title = R.string.woopos_product_limitations_title,
+                icon = R.drawable.ic_not_found,
+            ),
             WooPosToolbarState.Menu.MenuItem(
                 title = R.string.woopos_documentation_title,
                 icon = R.drawable.woo_pos_info_ic,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosToolbarViewModel.kt

@@ -102,6 +102,9 @@ sealed class WooPosAnalyticsEvent : IAnalyticsEvent {
         data object ViewDocsTapped : Event() {
             override val name: String = "view_docs_tapped"
         }
+        data object SimpleProductExplanationDialogShown : Event() {
+            override val name: String = "simple_products_explanation_dialog_shown"
+        }
     }
 
     sealed class PaymentFlowTrackerEvent : WooPosAnalyticsEvent() {