Merge branch 'trunk' into woomob-1648-woo-posapp-listings-add-a-tablet-to-the-ci-configuration-to

Author: kidinov

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.7
+Selling in-person just got faster! We've supercharged Woo POS with lightning-fast product search, instant barcode scanning, and near-instant loading. Your in-store experience is now smoother than ever.
+
 ## 23.6
 Did you give Woo POS a try? It’s now even better because you can view orders right inside it. What else? Interac refunds are smoother, filters and buttons got a fresh look, and tablet UI got better. Customer data quirks? Fixed. Selling in-person? Try out Woo Point Of Sale.
 

RELEASE-NOTES.txt

@@ -1,10 +1,16 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
+
+23.8
+-----
+- [Internal][Woo POS] Improve detection and handling of deleted products during checkout [https://github.com/woocommerce/woocommerce-android/pull/14981]
+
 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]
+- [**] Faster POS performance - search, barcode scanning, and loading are now nearly instant. [https://github.com/woocommerce/woocommerce-android/pull/14926]
 
 23.6
 -----

WooCommerce-Wear/build.gradle

@@ -219,3 +219,16 @@ static def loadPropertiesFromFile(inputFile) {
     }
     return properties
 }
+
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the app will crash with a runtime exception.
+            exclude(libs.androidx.hilt.navigation.compose.get().module.toString())
+            // This dependency is actually needed otherwise the app will crash with a runtime exception.
+            exclude(libs.androidx.preference.ktx.get().module.toString())
+            // This dependency is actually needed otherwise the app will crash with a runtime exception.
+            exclude(libs.androidx.work.runtime.ktx.get().module.toString())
+        }
+    }
+}

WooCommerce/build.gradle

@@ -26,6 +26,10 @@ fladle {
     devices = [
             ["model": "MediumPhone.arm", "version": "35"]
     ]
+
+    additionalTestApks = [
+            "- test: ${rootProject.projectDir}/libs/fluxc-plugin/build/outputs/apk/androidTest/debug/fluxc-plugin-debug-androidTest.apk".toString()
+    ]
     localResultsDir = "$rootDir/build/instrumented-tests"
 
     useOrchestrator = true
@@ -514,4 +518,19 @@ def isLeakCanaryEnabled() {
     return developerProperties.get("enable_leak_canary") ?: true
 }
 
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise UI tests will crash with a runtime exception.
+            exclude(libs.apache.http.client.android.get().module.toString())
+            // This dependency is actually needed otherwise it will cause the app to fail to build.
+            exclude(libs.androidx.hilt.navigation.compose.get().module.toString())
+            // This dependency is actually needed otherwise it will cause the app to fail to build.
+            exclude(libs.androidx.work.runtime.ktx.get().module.toString())
+            // This dependency is actually needed otherwise it will cause the app to fail to build.
+            exclude(libs.google.protobuf.kotlinlite.get().module.toString())
+        }
+    }
+}
+
 apply from: '../config/gradle/build_optimization.gradle'

WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc-analytics/reports_products.json

@@ -0,0 +1,52 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPathPattern": "/rest/v1.1/jetpack-blogs/161477129/rest-api/",
+    "queryParameters": {
+      "json": {
+        "equalTo": "true"
+      },
+      "path": {
+        "matches": "/wc-analytics/reports/products/(.*)"
+      },
+      "locale": {
+        "matches": "(.*)"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "data": [
+        {
+          "product_id": 2129,
+          "items_sold": 1,
+          "net_revenue": 110.00,
+          "orders_count": 1,
+          "extended_info": {
+            "name": "Akoya Pearl shades",
+            "sku": "",
+            "image": "https://i0.wp.com/automatticwidgets.wpcomstaging.com/wp-content/uploads/2020/01/Mask-Group-2.png",
+            "permalink": "https://automatticwidgets.wpcomstaging.com/product/akoya-pearl-shades/"
+          }
+        },
+        {
+          "product_id": 2131,
+          "items_sold": 1,
+          "net_revenue": 100.00,
+          "orders_count": 1,
+          "extended_info": {
+            "name": "Colorado shades",
+            "sku": "",
+            "image": "https://i0.wp.com/automatticwidgets.wpcomstaging.com/wp-content/uploads/2020/01/Mask-Group-4.png",
+            "permalink": "https://automatticwidgets.wpcomstaging.com/product/colorado-shades/"
+          }
+        }
+      ]
+    },
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive"
+    }
+  }
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

@@ -135,7 +135,8 @@ object AppPrefs {
         BLAZE_CAMPAIGN_SELECTED_OBJECTIVE,
         BLAZE_CAMPAIGN_OBJECTIVE_SWITCH_CHECKED,
         IS_SITE_WPCOM_SUSPENDED,
-        JETPACK_APP_PASSWORDS_ENABLED
+        JETPACK_APP_PASSWORDS_ENABLED,
+        WOO_POS_LOCAL_CATALOG_ENABLED
     }
 
     /**
@@ -310,6 +311,10 @@ object AppPrefs {
         get() = getBoolean(DeletablePrefKey.JETPACK_APP_PASSWORDS_ENABLED, true)
         set(value) = setBoolean(DeletablePrefKey.JETPACK_APP_PASSWORDS_ENABLED, value)
 
+    var wooPosLocalCatalogEnabled: Boolean
+        get() = getBoolean(DeletablePrefKey.WOO_POS_LOCAL_CATALOG_ENABLED, true)
+        set(value) = setBoolean(DeletablePrefKey.WOO_POS_LOCAL_CATALOG_ENABLED, value)
+
     var isWooPosSurveyNotificationCurrentUserShown: Boolean
         get() = getBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_CURRENT_USER_SHOWN, false)
         set(value) = setBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_CURRENT_USER_SHOWN, value)

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

@@ -134,6 +134,7 @@ class BookingMapper @Inject constructor(
         BookingEntity.AttendanceStatus.Booked -> BookingAttendanceStatus.Booked
         BookingEntity.AttendanceStatus.CheckedIn -> BookingAttendanceStatus.CheckedIn
         BookingEntity.AttendanceStatus.NoShow -> BookingAttendanceStatus.NoShow
+        BookingEntity.AttendanceStatus.Cancelled -> BookingAttendanceStatus.Cancelled
         is BookingEntity.AttendanceStatus.Unknown -> null
     }
 

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

@@ -7,8 +7,8 @@ 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.BookingFilters
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingUpdatePayload
-import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsOrderOption
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsStore
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity
@@ -24,7 +24,7 @@ class BookingsRepository @Inject constructor(
         page: Int,
         perPage: Int,
         query: String? = null,
-        filters: List<BookingsFilterOption> = emptyList(),
+        filters: BookingFilters? = null,
         order: BookingsOrderOption
     ): Result<FetchResult> {
         val result = bookingsStore.fetchBookings(
@@ -51,7 +51,7 @@ class BookingsRepository @Inject constructor(
 
     fun observeBookings(
         limit: Int? = null,
-        filters: List<BookingsFilterOption> = emptyList(),
+        filters: BookingFilters? = null,
         order: BookingsOrderOption
     ): Flow<List<Booking>> =
         bookingsStore.observeBookings(
@@ -61,6 +61,8 @@ class BookingsRepository @Inject constructor(
             order = order
         )
 
+    fun observeBookingsCount(): Flow<Long> = bookingsStore.observeBookingCount(site = selectedSite.get())
+
     fun observeBooking(bookingId: Long): Flow<Booking?> =
         bookingsStore.observeBooking(
             site = selectedSite.get(),
@@ -88,6 +90,19 @@ class BookingsRepository @Inject constructor(
         }
     }
 
+    suspend fun fetchResources(): Result<Unit> {
+        val result = bookingsStore.fetchResources(site = selectedSite.get())
+        return if (result.isError) {
+            Result.failure(WooException(result.error))
+        } else {
+            Result.success(Unit)
+        }
+    }
+
+    suspend fun getResource(
+        resourceId: Long
+    ): BookingResource? = bookingsStore.getResource(site = selectedSite.get(), resourceId = resourceId)
+
     suspend fun fetchResource(
         resourceId: Long
     ): Result<Unit> {
@@ -113,6 +128,9 @@ class BookingsRepository @Inject constructor(
         }
     }
 
+    fun observeResources(): Flow<List<BookingResource>> =
+        bookingsStore.observeResources(site = selectedSite.get())
+
     suspend fun updateAttendanceStatus(
         bookingId: Long,
         attendanceStatus: BookingEntity.AttendanceStatus,

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

@@ -115,7 +115,7 @@ private fun AppointmentDetailsRow(
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp, vertical = 12.dp)
         ) {
-            BookingDetailsLabel(label)
+            BookingLabel(label)
             Box(Modifier.padding(start = 8.dp)) {
                 value()
             }

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

@@ -82,7 +82,7 @@ private fun AttendanceRow(
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp, vertical = 12.dp)
         ) {
-            BookingDetailsLabel(label)
+            BookingLabel(label)
             when (attendanceUpdateStatus) {
                 AttendanceUpdateStatus.InProgress -> {
                     SkeletonView(