Merge pull request #15086 from woocommerce/hack-modularize-selected-site

[HACK week] Modularization of SelectedSite

Author: samiuelson

RELEASE-NOTES.txt

@@ -35,6 +35,7 @@
 - [*][Woo POS] Automatically scroll to newly created orders when returning to the Orders screen [https://github.com/woocommerce/woocommerce-android/pull/14990]
 - [Internal] Restore coupon drawable files mistakenly removed in previous release [https://github.com/woocommerce/woocommerce-android/pull/15005]
 - [*] Fixed a rare crash that occurred when displaying shipping rates for a selected package [https://github.com/woocommerce/woocommerce-android/pull/15032]
+- [*][Woo POS] Prepopulate orders cache after opening POS to improve performance [https://github.com/woocommerce/woocommerce-android/pull/15066]
 - [*] [WEAR] Resolved title clipping on round screens for Wear [https://github.com/woocommerce/woocommerce-android/pull/15108]
 
 23.7

WooCommerce/build.gradle

@@ -266,6 +266,7 @@ dependencies {
 
     implementation(project(":libs:fluxc"))
     implementation(project(":libs:fluxc-plugin"))
+
     implementation(project(":libs:login"))
     implementation(project(":libs:pos"))
 

WooCommerce/src/main/kotlin/com/woocommerce/android/di/SiteComponentEntryPoint.kt

@@ -0,0 +1,16 @@
+package com.woocommerce.android.di
+
+import androidx.datastore.core.DataStore
+import com.woocommerce.android.ui.mystore.data.DashboardDataModel
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import kotlinx.coroutines.CoroutineScope
+
+@InstallIn(SiteComponent::class)
+@EntryPoint
+interface SiteComponentEntryPoint {
+    fun dashboardDataStore(): DataStore<DashboardDataModel>
+
+    @SiteCoroutineScope
+    fun siteCoroutineScope(): CoroutineScope
+}

libs/commons/build.gradle

@@ -1,7 +1,10 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.google.dagger.hilt)
     alias(libs.plugins.dependency.analysis)
 }
 
@@ -19,17 +22,41 @@ android {
         targetCompatibility = libs.versions.java.get()
     }
 
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
+
+    lintOptions {
+        // Workaround for kotlinx-metadata version incompatibility:
+        // Kotlin 2.2.21 generates metadata v2.2.0, but AGP 8.13.2's Compose lint detector
+        // only supports up to v2.0.0, causing crashes when analyzing Kotlin files.
+        // This can be removed when AGP updates its bundled kotlinx-metadata-jvm dependency.
+        disable "StateFlowValueCalledInComposition"
+
+        baseline file("lint-baseline.xml")
+    }
+
     testFixtures.enable = true
 }
 
 dependencies {
     implementation(libs.androidx.annotation)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.compose.ui.main)
     implementation(libs.glassfish.javax.annotation)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.automattic.tracks.crashlogging)
     implementation(libs.androidx.lifecycle.process)
+    implementation(libs.androidx.preference.ktx)
+    implementation(libs.eventbus.android)
     implementation(libs.google.dagger.hilt.android.main)
     implementation(libs.wordpress.utils)
+    implementation(libs.apache.commons.text)
+    implementation(project(":libs:fluxc"))
+    implementation(project(":libs:fluxc-plugin"))
+
+    ksp(libs.google.dagger.hilt.compiler)
 
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.assertj.core)
@@ -38,6 +65,7 @@ dependencies {
     testImplementation(libs.androidx.arch.core.testing)
     testImplementation(libs.androidx.lifecycle.runtime.testing)
 
+    testFixturesImplementation(libs.androidx.compose.ui.main)
     testFixturesCompileOnly(libs.kotlinx.coroutines.test)
     testFixturesCompileOnly(libs.junit)
     testFixturesCompileOnly(libs.mockito.kotlin)

libs/commons/lint-baseline.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="all" version="8.7.2">
+
+    <issue
+        id="StateFlowValueCalledInComposition"
+        message="Calling value on a StateFlow inside of a composable function will not observe changes to the StateFlow"
+        errorLine1="        state.value?.let { return it }"
+        errorLine2="              ~~~~~">
+        <location
+            file="src/main/java/com/woocommerce/android/tools/SelectedSite.kt"
+            line="64"
+            column="15"/>
+    </issue>
+
+</issues>

…/woocommerce/android/di/SiteComponent.kt …/woocommerce/android/di/SiteComponent.ktWooCommerce/src/main/kotlin/com/woocommerce/android/di/SiteComponent.kt renamed to libs/commons/src/main/java/com/woocommerce/android/di/SiteComponent.kt WooCommerce/src/main/kotlin/com/woocommerce/android/di/SiteComponent.kt renamed to libs/commons/src/main/java/com/woocommerce/android/di/SiteComponent.kt

@@ -1,11 +1,7 @@
 package com.woocommerce.android.di
 
-import androidx.datastore.core.DataStore
-import com.woocommerce.android.ui.mystore.data.DashboardDataModel
 import dagger.BindsInstance
 import dagger.hilt.DefineComponent
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.fluxc.model.SiteModel
@@ -29,15 +25,6 @@ interface SiteComponent {
     }
 }
 
-@InstallIn(SiteComponent::class)
-@EntryPoint
-interface SiteComponentEntryPoint {
-    fun dashboardDataStore(): DataStore<DashboardDataModel>
-
-    @SiteCoroutineScope
-    fun siteCoroutineScope(): CoroutineScope
-}
-
 @Qualifier
 @MustBeDocumented
 @Retention(RUNTIME)

…commerce/android/extensions/NumberExt.kt …commerce/android/extensions/NumberExt.ktWooCommerce/src/main/kotlin/com/woocommerce/android/extensions/NumberExt.kt renamed to libs/commons/src/main/java/com/woocommerce/android/extensions/NumberExt.kt WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/NumberExt.kt renamed to libs/commons/src/main/java/com/woocommerce/android/extensions/NumberExt.kt

@@ -1,7 +1,7 @@
 package com.woocommerce.android.tools
 
-import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.util.WooLog
+import com.woocommerce.commons.BuildConfig
 import org.wordpress.android.fluxc.model.SiteModel
 
 enum class SiteConnectionType {