Merge branch 'trunk' into woomob-1452-woo-possurveys-implement-a-click-on-the-notifications-to

Author: samiuelson

.buildkite/release-pipelines/start-code-freeze.yml

@@ -12,7 +12,7 @@ steps:
       install_gems
 
       echo '--- :snowflake: Start Code Freeze'
-      bundle exec fastlane start_code_freeze skip_confirm:true
+      bundle exec fastlane start_code_freeze version:"${RELEASE_VERSION}" skip_confirm:true
     agents:
         queue: "tumblr-metal"
     retry:

RELEASE-NOTES.txt

@@ -3,7 +3,9 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 23.5
 -----
-
+- [Internal][Wear] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
+- [Internal] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
+- [*] Fix a rare crash in order refund flow [https://github.com/woocommerce/woocommerce-android/pull/14742]
 
 23.4
 -----

WooCommerce-Wear/build.gradle

@@ -135,15 +135,10 @@ dependencies {
         exclude group: "com.mcxiaoke.volley"
         exclude group: "com.android.support"
     }
-    implementation(libs.automattic.tracks.android)
     implementation(libs.automattic.tracks.crashlogging)
 
     // WearOS
     implementation(libs.google.play.services.wearable)
-    implementation(libs.androidx.wear.tiles.main)
-    implementation(libs.androidx.wear.tiles.material)
-    implementation(libs.google.horologist.compose.tools)
-    implementation(libs.google.horologist.tiles)
     implementation(libs.google.horologist.compose.layout)
     implementation(libs.androidx.wear.watchface.complications.data.source.ktx)
     implementation(libs.androidx.wear.compose.material)
@@ -164,30 +159,26 @@ dependencies {
     // Android Support
     implementation(libs.androidx.work.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.savedstate)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.preference.ktx)
     implementation(libs.androidx.datastore.preferences)
-    implementation(libs.androidx.datastore.main)
     implementation(libs.google.gson)
 
     // Coroutines
     implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlinx.coroutines.android)
+    runtimeOnly(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.coroutines.play.services)
     testImplementation(libs.kotlinx.coroutines.test)
 
     // Dagger & Hilt
     implementation(libs.google.dagger.hilt.android.main)
-    implementation(libs.androidx.hilt.navigation.fragment)
-    implementation(libs.androidx.hilt.common)
-    implementation(libs.androidx.hilt.work)
     implementation(libs.androidx.hilt.navigation.compose)
+    compileOnly(libs.androidx.hilt.common)
+    implementation(libs.androidx.hilt.work)
     ksp(libs.androidx.hilt.compiler)
     ksp(libs.google.dagger.hilt.compiler)
-    implementation(libs.google.dagger.android.support)
     ksp(libs.google.dagger.android.processor)
 
     // Testing

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/datasource/StatsRepository.kt

@@ -21,6 +21,8 @@ import com.woocommerce.android.wear.util.DateUtils
 import com.woocommerce.commons.DataParameters.ORDERS_COUNT
 import com.woocommerce.commons.DataParameters.TOTAL_REVENUE
 import com.woocommerce.commons.DataParameters.VISITORS_TOTAL
+import com.woocommerce.commons.stats.StatsTimeRange
+import com.woocommerce.commons.stats.StatsUtils.toRevenueRangeId
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import org.wordpress.android.fluxc.model.SiteModel
@@ -61,7 +63,8 @@ class StatsRepository @Inject constructor(
                 site = selectedSite,
                 granularity = StatsGranularity.DAYS,
                 startDate = todayRange.start.formatToYYYYmmDDhhmmss(),
-                endDate = todayRange.end.formatToYYYYmmDDhhmmss()
+                endDate = todayRange.end.formatToYYYYmmDDhhmmss(),
+                revenueRangeId = StatsTimeRange(todayRange.start, todayRange.end).toRevenueRangeId("Wear")
             )
         )
 

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/range/StatsTimeRangeData.kt

@@ -1,15 +1,7 @@
 package com.woocommerce.android.wear.ui.stats.range
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import com.woocommerce.commons.stats.StatsTimeRange
 import java.util.Calendar
-import java.util.Date
-
-@Parcelize
-data class StatsTimeRange(
-    val start: Date,
-    val end: Date
-) : Parcelable
 
 abstract class StatsTimeRangeData(
     referenceCalendar: Calendar

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/range/TodayRangeData.kt

@@ -5,6 +5,7 @@ import com.woocommerce.android.wear.extensions.formatToMMMddYYYY
 import com.woocommerce.android.wear.extensions.oneDayAgo
 import com.woocommerce.android.wear.extensions.startOfCurrentDay
 import com.woocommerce.android.wear.util.DateUtils
+import com.woocommerce.commons.stats.StatsTimeRange
 import java.util.Calendar
 import java.util.Locale
 

WooCommerce/build.gradle

@@ -281,20 +281,18 @@ dependencies {
     // Dagger
     implementation(libs.google.dagger.hilt.android.main)
     implementation(libs.androidx.hilt.navigation.fragment)
-    implementation(libs.androidx.hilt.common)
+    compileOnly(libs.androidx.hilt.common)
     implementation(libs.androidx.hilt.work)
 
     ksp(libs.androidx.hilt.compiler)
     ksp(libs.google.dagger.hilt.compiler)
-    implementation(libs.google.dagger.android.support)
     ksp(libs.google.dagger.android.processor)
 
     implementation(libs.mpandroidchart)
 
     implementation(libs.bumptech.glide.main)
     ksp(libs.bumptech.glide.compiler)
     implementation(libs.bumptech.glide.volley.integration)
-    implementation(libs.bumptech.glide.avif.integration)
     implementation(libs.google.play.app.update)
     implementation(libs.google.play.review)
 
@@ -350,6 +348,7 @@ dependencies {
         exclude group: 'asm', module: 'asm'
         exclude group: 'org.json', module: 'json'
     }
+    androidTestImplementation(libs.apache.http.client.android)
     constraints {
         androidTestImplementation(libs.wiremock) {
             because("newer versions of WireMock use Java APIs not available on Android")
@@ -376,7 +375,6 @@ dependencies {
             because("version shipped with WireMock 2.26.3 contains security vulnerabilities")
         }
     }
-    androidTestImplementation(libs.apache.http.client.android)
 
     implementation(libs.zendesk.support) {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -386,10 +384,11 @@ dependencies {
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.savedstate)
     implementation(libs.androidx.lifecycle.process)
+    implementation(libs.androidx.paging.runtime)
 
     // Coroutines
     implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlinx.coroutines.android)
+    runtimeOnly(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.coroutines.play.services)
     testImplementation(libs.kotlinx.coroutines.test)
 
@@ -425,15 +424,15 @@ dependencies {
     implementation(libs.coil.svg)
 
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
+    debugRuntimeOnly(libs.androidx.compose.ui.test.manifest)
 
     coreLibraryDesugaring(libs.android.desugar)
 
     // Lottie
     implementation(libs.lottie.compose)
 
     // CameraX
-    implementation(libs.androidx.camera.camera2)
+    runtimeOnly(libs.androidx.camera.camera2)
     implementation(libs.androidx.camera.lifecycle)
     implementation(libs.androidx.camera.view)
 

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/WooPosErrorScreenTest.kt

@@ -5,8 +5,8 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.woocommerce.android.ui.woopos.common.composeui.component.Button
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorScreen
+import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorScreenButtonState
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -55,8 +55,8 @@ class WooPosErrorScreenTest {
         var primaryClicked = false
         var secondaryClicked = false
 
-        val primaryButton = Button(primaryButtonText) { primaryClicked = true }
-        val secondaryButton = Button(secondaryButtonText) { secondaryClicked = true }
+        val primaryButton = WooPosErrorScreenButtonState(primaryButtonText) { primaryClicked = true }
+        val secondaryButton = WooPosErrorScreenButtonState(secondaryButtonText) { secondaryClicked = true }
 
         composeTestRule.setContent {
             WooPosTheme {

WooCommerce/src/main/kotlin/com/woocommerce/android/background/BackgroundUpdateAnalyticsRepository.kt

@@ -11,7 +11,7 @@ import com.woocommerce.android.ui.analytics.ranges.revenueStatsGranularity
 import com.woocommerce.android.ui.analytics.ranges.visitorStatsGranularity
 import com.woocommerce.android.ui.analytics.ranges.visitorSummaryStatsGranularity
 import com.woocommerce.android.ui.dashboard.data.StatsRepository
-import com.woocommerce.android.ui.dashboard.data.asRevenueRangeId
+import com.woocommerce.commons.stats.StatsUtils.asRevenueRangeId
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope

WooCommerce/src/main/kotlin/com/woocommerce/android/datastore/DataStoreModule.kt

@@ -11,6 +11,7 @@ import androidx.datastore.preferences.preferencesDataStoreFile
 import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.woocommerce.android.datastore.DataStoreType.ANALYTICS_CONFIGURATION
 import com.woocommerce.android.datastore.DataStoreType.ANALYTICS_UI_CACHE
+import com.woocommerce.android.datastore.DataStoreType.BOOKINGS_FILTERS
 import com.woocommerce.android.datastore.DataStoreType.COUPONS
 import com.woocommerce.android.datastore.DataStoreType.DASHBOARD_STATS
 import com.woocommerce.android.datastore.DataStoreType.LAST_UPDATE
@@ -196,4 +197,22 @@ class DataStoreModule {
         },
         scope = CoroutineScope(appCoroutineScope.coroutineContext + Dispatchers.IO)
     )
+
+    @Provides
+    @Singleton
+    @DataStoreQualifier(BOOKINGS_FILTERS)
+    fun provideBookingsFiltersDataStore(
+        appContext: Context,
+        crashLogging: CrashLogging,
+        @AppCoroutineScope appCoroutineScope: CoroutineScope
+    ): DataStore<Preferences> = PreferenceDataStoreFactory.create(
+        produceFile = { appContext.preferencesDataStoreFile("bookings_filters") },
+        corruptionHandler = ReplaceFileCorruptionHandler {
+            crashLogging.recordEvent(
+                "Corrupted data store. DataStore Type: ${BOOKINGS_FILTERS.name}"
+            )
+            emptyPreferences()
+        },
+        scope = CoroutineScope(appCoroutineScope.coroutineContext + Dispatchers.IO)
+    )
 }