Merge branch 'trunk' into issue/WOOMOB-727-fix-small-notification-icon-issue

Author: hichamboushaba

RELEASE-NOTES.txt

@@ -7,6 +7,8 @@
 - [*] Enhance the shipping label creation screen by making the selected hazardous box tappable [https://github.com/woocommerce/woocommerce-android/pull/14576]
 - [*] Shipping Labels: Enhance selected package UI in the create shipping label flow [https://github.com/woocommerce/woocommerce-android/pull/14579]
 - [*] Fixed the incorrect size of the notification icon [https://github.com/woocommerce/woocommerce-android/pull/14586]
+- [***] Performance improvements for users logging in with WordPress.com accounts [https://github.com/woocommerce/woocommerce-android/pull/14610]
+- [*] Fix an issue where there is delay before displaying the continue button in Site Picker screen [https://github.com/woocommerce/woocommerce-android/pull/14611]
 
 23.2
 -----

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/MyStoreScreen.kt

@@ -2,10 +2,10 @@ package com.woocommerce.android.wear.ui
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
+import androidx.wear.compose.foundation.pager.rememberPagerState
 import com.google.android.horologist.compose.pager.PagerScreen
 import com.woocommerce.android.wear.ui.orders.list.OrdersListScreen
 import com.woocommerce.android.wear.ui.stats.StoreStatsScreen

WooCommerce/src/main/kotlin/com/woocommerce/android/applicationpasswords/WooApplicationPasswordsConfiguration.kt

@@ -3,16 +3,20 @@ package com.woocommerce.android.applicationpasswords
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.util.DeviceInfo
-import com.woocommerce.android.util.FeatureFlag.APP_PASSWORDS_FOR_JETPACK_SITES
+import com.woocommerce.android.util.IsRemoteFeatureFlagEnabled
+import com.woocommerce.android.util.RemoteFeatureFlag
 import jakarta.inject.Inject
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
 
 class WooApplicationPasswordsConfiguration @Inject constructor(
-    private val appPrefs: AppPrefsWrapper
+    private val appPrefs: AppPrefsWrapper,
+    private val isRemoteFeatureFlagEnabled: IsRemoteFeatureFlagEnabled
 ) : ApplicationPasswordsConfiguration {
     override val applicationName: String =
         "${BuildConfig.APPLICATION_ID}.app-client.${DeviceInfo.name.replace(' ', '-')}"
 
-    override suspend fun isEnabledForJetpackAccess(): Boolean =
-        APP_PASSWORDS_FOR_JETPACK_SITES.isEnabled() && appPrefs.jetpackAppPasswordsEnabled
+    override suspend fun isEnabledForJetpackAccess(): Boolean {
+        return appPrefs.jetpackAppPasswordsEnabled &&
+            isRemoteFeatureFlagEnabled(RemoteFeatureFlag.APP_PASSWORDS_FOR_JETPACK_SITES)
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/BetaFeaturesFragment.kt

@@ -5,6 +5,7 @@ import android.view.View
 import android.widget.CompoundButton
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.woocommerce.android.AppPrefs
@@ -16,8 +17,10 @@ import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.tools.SiteConnectionType
 import com.woocommerce.android.ui.prefs.MainSettingsFragment.AppSettingsListener
 import com.woocommerce.android.util.AnalyticsUtils
-import com.woocommerce.android.util.FeatureFlag
+import com.woocommerce.android.util.IsRemoteFeatureFlagEnabled
+import com.woocommerce.android.util.RemoteFeatureFlag
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -29,6 +32,9 @@ class BetaFeaturesFragment : Fragment(R.layout.fragment_settings_beta) {
     @Inject
     lateinit var selectedSite: SelectedSite
 
+    @Inject
+    lateinit var isRemoteFeatureFlagEnabled: IsRemoteFeatureFlagEnabled
+
     private val settingsListener by lazy {
         activity as? AppSettingsListener
     }
@@ -59,9 +65,11 @@ class BetaFeaturesFragment : Fragment(R.layout.fragment_settings_beta) {
     }
 
     private fun FragmentSettingsBetaBinding.bindJetpackAppPasswordsToggle() {
-        // TODO check the remote feature flag state once available
-        val isJetpackSite = selectedSite.connectionType != SiteConnectionType.ApplicationPasswords
-        jetpackAppPasswordsToggle.isVisible = FeatureFlag.APP_PASSWORDS_FOR_JETPACK_SITES.isEnabled() && isJetpackSite
+        viewLifecycleOwner.lifecycleScope.launch {
+            val isJetpackSite = selectedSite.connectionType != SiteConnectionType.ApplicationPasswords
+            jetpackAppPasswordsToggle.isVisible = isJetpackSite &&
+                isRemoteFeatureFlagEnabled(RemoteFeatureFlag.APP_PASSWORDS_FOR_JETPACK_SITES)
+        }
 
         jetpackAppPasswordsToggle.isChecked = AppPrefs.jetpackAppPasswordsEnabled
         jetpackAppPasswordsToggle.setOnCheckedChangeListener { _, isChecked ->

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt

@@ -153,7 +153,7 @@ class SitePickerViewModel @Inject constructor(
     private suspend fun fetchSitesFromApi(showSkeleton: Boolean) {
         sitePickerViewState = sitePickerViewState.copy(
             isSkeletonViewVisible = showSkeleton,
-            isPrimaryBtnVisible = false
+            isPrimaryBtnVisible = !showSkeleton
         )
 
         val startTime = System.currentTimeMillis()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDataSource.kt

@@ -16,6 +16,11 @@ sealed class LoadOrdersResult {
     data class Error(val message: String) : LoadOrdersResult()
 }
 
+sealed class SearchOrdersResult {
+    data class Success(val orders: List<Order>) : SearchOrdersResult()
+    data class Error(val message: String) : SearchOrdersResult()
+}
+
 class WooPosOrdersDataSource @Inject constructor(
     private val restClient: OrderRestClient,
     private val selectedSite: SelectedSite,
@@ -25,31 +30,48 @@ class WooPosOrdersDataSource @Inject constructor(
     companion object {
         const val POS_ORDERS_PAGE_SIZE = 25
     }
+
     fun loadOrders(): Flow<LoadOrdersResult> = flow {
         val cached = ordersCache.getAll()
         if (cached.isNotEmpty()) {
             emit(LoadOrdersResult.SuccessCache(cached))
         }
 
-        val result = restClient.fetchOrders(
-            site = selectedSite.get(),
-            count = POS_ORDERS_PAGE_SIZE,
-            page = 1,
-            orderBy = OrderBy.DATE,
-            sortOrder = OrderRestClient.SortOrder.DESCENDING,
-            statusFilter = null,
-            createdVia = "pos-rest-api"
-        )
+        val result = fetchOrdersFromRemote(searchQuery = null, page = 1)
 
         if (result.isError) {
-            emit(LoadOrdersResult.Error(result.error.message))
+            emit(LoadOrdersResult.Error(result.error?.message ?: "Unknown error"))
         } else {
             val mapped = result.orders.toAppModels()
             ordersCache.setAll(mapped)
-            emit(LoadOrdersResult.SuccessRemote(result.orders.toAppModels()))
+            emit(LoadOrdersResult.SuccessRemote(mapped))
         }
     }
 
+    suspend fun searchOrders(searchQuery: String): SearchOrdersResult {
+        val result = fetchOrdersFromRemote(searchQuery = searchQuery, page = 1)
+
+        return if (result.isError) {
+            SearchOrdersResult.Error(result.error?.message ?: "Unknown error")
+        } else {
+            SearchOrdersResult.Success(result.orders.toAppModels())
+        }
+    }
+
+    private suspend fun fetchOrdersFromRemote(
+        page: Int,
+        searchQuery: String?
+    ) = restClient.fetchOrders(
+        site = selectedSite.get(),
+        count = POS_ORDERS_PAGE_SIZE,
+        page = page,
+        orderBy = OrderBy.DATE,
+        sortOrder = OrderRestClient.SortOrder.DESCENDING,
+        statusFilter = null,
+        createdVia = "pos-rest-api",
+        searchQuery = searchQuery,
+    )
+
     fun clearCache() = ordersCache.clear()
 
     private suspend fun List<OrderEntity>.toAppModels(): List<Order> = map {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

@@ -12,7 +12,10 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.ExperimentalMaterialApi
@@ -30,9 +33,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.selected
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
+import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearchInput
+import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearchInputState
+import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearchUIEvent
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosToolbar
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
@@ -41,6 +49,8 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTyp
 import com.woocommerce.android.ui.woopos.home.items.WooPosPullToRefreshState
 import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
 
+private val WOO_POS_ORDERS_TOOLBAR_HEIGHT = 56.dp
+
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun WooPosOrdersScreen(
@@ -59,6 +69,7 @@ fun WooPosOrdersScreen(
             onRefresh = viewModel::onRefresh,
             isRefreshing = state.pullToRefreshState == WooPosPullToRefreshState.Refreshing,
             onOrderSelected = viewModel::onOrderSelected,
+            onSearchEvent = viewModel::onSearchEvent,
             modifier = Modifier
                 .weight(0.3f)
                 .fillMaxHeight()
@@ -83,13 +94,48 @@ private fun OrdersList(
     onRefresh: () -> Unit,
     isRefreshing: Boolean,
     onOrderSelected: (Long) -> Unit,
+    onSearchEvent: (WooPosSearchUIEvent) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(modifier = modifier) {
-        WooPosToolbar(
-            titleText = stringResource(R.string.woopos_orders_title),
-            onBackClicked = onBackClicked,
-        )
+        ConstraintLayout(
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(min = WOO_POS_ORDERS_TOOLBAR_HEIGHT),
+        ) {
+            val (toolbar, searchInput) = createRefs()
+
+            if (state.searchInputState is WooPosSearchInputState.Closed) {
+                WooPosToolbar(
+                    titleText = stringResource(R.string.woopos_orders_title),
+                    onBackClicked = onBackClicked,
+                    modifier = Modifier.constrainAs(toolbar) {
+                        start.linkTo(parent.start)
+                        top.linkTo(parent.top)
+                        bottom.linkTo(parent.bottom)
+                    }
+                )
+            }
+            WooPosSearchInput(
+                state = state.searchInputState,
+                onEvent = onSearchEvent,
+                modifier = Modifier
+                    .statusBarsPadding()
+                    .constrainAs(searchInput) {
+                        if (state.searchInputState is WooPosSearchInputState.Open) {
+                            start.linkTo(parent.start)
+                            end.linkTo(parent.end)
+                            width = androidx.constraintlayout.compose.Dimension.fillToConstraints
+                        } else {
+                            end.linkTo(parent.end)
+                        }
+                        top.linkTo(parent.top)
+                        bottom.linkTo(parent.bottom)
+                    }
+            )
+        }
+
+        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))
 
         val pullRefreshState = rememberPullRefreshState(
             refreshing = isRefreshing,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersState.kt

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.woopos.orders
 
 import androidx.compose.runtime.Immutable
+import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearchInputState
 import com.woocommerce.android.ui.woopos.home.items.WooPosPaginationState
 import com.woocommerce.android.ui.woopos.home.items.WooPosPullToRefreshState
 
@@ -16,30 +17,33 @@ data class OrderItemViewState(
 @Immutable
 sealed class WooPosOrdersState {
     abstract val pullToRefreshState: WooPosPullToRefreshState
+    abstract val searchInputState: WooPosSearchInputState
 
     @Immutable
     data class Content(
         val items: List<OrderItemViewState>,
         override val pullToRefreshState: WooPosPullToRefreshState,
+        override val searchInputState: WooPosSearchInputState,
         val paginationState: WooPosPaginationState,
         val selectedOrderId: Long?
     ) : WooPosOrdersState()
 
     @Immutable
     data class Error(
         val message: String,
+        override val searchInputState: WooPosSearchInputState
     ) : WooPosOrdersState() {
         override val pullToRefreshState: WooPosPullToRefreshState = WooPosPullToRefreshState.Disabled
     }
 
     @Immutable
-    data object Loading : WooPosOrdersState() {
+    data class Loading(override val searchInputState: WooPosSearchInputState) : WooPosOrdersState() {
         override val pullToRefreshState: WooPosPullToRefreshState = WooPosPullToRefreshState.Disabled
     }
 
     @Immutable
     data class Empty(
-        override val pullToRefreshState: WooPosPullToRefreshState =
-            WooPosPullToRefreshState.Enabled
+        override val pullToRefreshState: WooPosPullToRefreshState = WooPosPullToRefreshState.Enabled,
+        override val searchInputState: WooPosSearchInputState,
     ) : WooPosOrdersState()
 }