Merge branch 'trunk' into issue/12699-json-fields-read-only

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 20.6
+We're excited to bring you new features in our WooCommerce app! Users can now set a password to protect products when signed in with site credentials, enhancing security for WooCommerce 8.1.0 and above. Also, promoting a Blaze product from the campaign detail will now trigger a smoother native flow. Enjoy the updates!
+
 ## 20.5
 We’re excited to bring you a smoother experience with our latest update! We've resolved an issue that prevented renaming Product Variation Attributes and fixed a bug related to notification removal. Plus, users can now easily select product images when creating Blaze ads, and the Blaze feature is now fully enabled for sites with the Blaze for WooCommerce plugin active. Enjoy the improvements!
 

RELEASE-NOTES.txt

@@ -1,9 +1,12 @@
 *** 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.
-20.7
+20.8
 -----
 - [**] Improve barcode scanner reading accuracy [https://github.com/woocommerce/woocommerce-android/pull/12673]
+- [Internal] AI product creation banner is removed [https://github.com/woocommerce/woocommerce-android/pull/12705]
+- [*] [Login] Fix an issue where the app doesn't show the correct error screen when application passwords are disabled [https://github.com/woocommerce/woocommerce-android/pull/12717]
+- [**] Fixed bug with coupons disappearing from the order creation screen unexpectedly [https://github.com/woocommerce/woocommerce-android/pull/12724]
 
 20.6
 -----

WooCommerce/build.gradle

@@ -240,7 +240,7 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "com.google.android.material:material:$materialVersion"
-    implementation "androidx.transition:transition-ktx:$transitionVersion"
+    implementation "androidx.transition:transition:$transitionVersion"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation("androidx.browser:browser:1.5.0") {
         exclude group: 'com.google.guava', module: 'listenablefuture'
@@ -249,8 +249,10 @@ dependencies {
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation "androidx.datastore:datastore:1.0.0"
 
-    implementation "androidx.navigation:navigation-fragment-ktx:$gradle.ext.navigationVersion"
-    implementation "androidx.navigation:navigation-ui-ktx:$gradle.ext.navigationVersion"
+    implementation "androidx.navigation:navigation-common:$gradle.ext.navigationVersion"
+    implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion"
+    implementation "androidx.navigation:navigation-runtime:$gradle.ext.navigationVersion"
+    implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion"
 
     implementation "androidx.work:work-runtime-ktx:$workManagerVersion"
 
@@ -320,8 +322,8 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     ksp "com.github.bumptech.glide:compiler:$glideVersion"
     implementation "com.github.bumptech.glide:volley-integration:$glideVersion@aar"
-    implementation 'com.google.android.play:app-update-ktx:2.1.0'
-    implementation 'com.google.android.play:review-ktx:2.0.1'
+    implementation 'com.google.android.play:app-update:2.1.0'
+    implementation 'com.google.android.play:review:2.0.1'
 
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
@@ -408,7 +410,6 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.8.2"
     implementation "androidx.activity:activity-ktx:1.8.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
 
     // Coroutines
@@ -448,8 +449,6 @@ dependencies {
     implementation 'androidx.hilt:hilt-navigation-compose:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
-    implementation "com.google.accompanist:accompanist-swiperefresh:$composeAccompanistVersion"
-    implementation "com.google.accompanist:accompanist-systemuicontroller:$composeAccompanistVersion"
     implementation "io.coil-kt:coil-compose:$coilVersion"
     implementation "io.coil-kt:coil-svg:$coilVersion"
 

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/helpers/util/Screen.kt

@@ -70,9 +70,6 @@ open class Screen {
     private fun initializeAppPrefs() {
         AppPrefs.init(getInstrumentation().targetContext.applicationContext)
 
-        // hide the promo dialog because it breaks the tests
-        AppPrefs.wasAIProductDescriptionPromoDialogShown = true
-
         // also hide AI description tooltip to make test more simple
         AppPrefs.isAIProductDescriptionTooltipDismissed = true
 

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

@@ -113,12 +113,10 @@ object AppPrefs {
         NOTIFICATIONS_PERMISSION_BAR,
         IS_EU_SHIPPING_NOTICE_DISMISSED,
         HAS_SAVED_PRIVACY_SETTINGS,
-        WAS_AI_DESCRIPTION_PROMO_DIALOG_SHOWN,
         IS_AI_DESCRIPTION_TOOLTIP_DISMISSED,
         NUMBER_OF_TIMES_AI_DESCRIPTION_TOOLTIP_SHOWN,
         STORE_CREATION_PROFILER_ANSWERS,
         AI_CONTENT_GENERATION_TONE,
-        AI_PRODUCT_CREATION_IS_FIRST_ATTEMPT,
         BLAZE_FIRST_TIME_WITHOUT_CAMPAIGN,
         BLAZE_CAMPAIGN_CREATED,
         BLAZE_CELEBRATION_SCREEN_SHOWN,
@@ -976,16 +974,6 @@ object AppPrefs {
             value = value
         )
 
-    var wasAIProductDescriptionPromoDialogShown: Boolean
-        get() = getBoolean(
-            key = DeletablePrefKey.WAS_AI_DESCRIPTION_PROMO_DIALOG_SHOWN,
-            default = false
-        )
-        set(value) = setBoolean(
-            key = DeletablePrefKey.WAS_AI_DESCRIPTION_PROMO_DIALOG_SHOWN,
-            value = value
-        )
-
     var isAIProductDescriptionTooltipDismissed: Boolean
         get() = getBoolean(
             key = DeletablePrefKey.IS_AI_DESCRIPTION_TOOLTIP_DISMISSED,
@@ -1013,16 +1001,6 @@ object AppPrefs {
             value = value.slug
         )
 
-    var aiProductCreationIsFirstAttempt: Boolean
-        get() = getBoolean(
-            key = DeletablePrefKey.AI_PRODUCT_CREATION_IS_FIRST_ATTEMPT,
-            default = true
-        )
-        set(value) = setBoolean(
-            key = DeletablePrefKey.AI_PRODUCT_CREATION_IS_FIRST_ATTEMPT,
-            value = value
-        )
-
     var isBlazeCelebrationScreenShown: Boolean
         get() = getBoolean(
             key = DeletablePrefKey.BLAZE_CELEBRATION_SCREEN_SHOWN,

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

@@ -14,14 +14,10 @@ import javax.inject.Inject
 class AppPrefsWrapper @Inject constructor() {
     var savedPrivacyBannerSettings by AppPrefs::savedPrivacySettings
 
-    var wasAIProductDescriptionPromoDialogShown by AppPrefs::wasAIProductDescriptionPromoDialogShown
-
     var isAIProductDescriptionTooltipDismissed by AppPrefs::isAIProductDescriptionTooltipDismissed
 
     var aiContentGenerationTone by AppPrefs::aiContentGenerationTone
 
-    var aiProductCreationIsFirstAttempt by AppPrefs::aiProductCreationIsFirstAttempt
-
     var isBlazeCelebrationScreenShown by AppPrefs::isBlazeCelebrationScreenShown
 
     var blazeFirstTimeWithoutCampaign by AppPrefs::blazeFirstTimeWithoutCampaign

WooCommerce/src/main/kotlin/com/woocommerce/android/model/Order.kt

@@ -114,7 +114,8 @@ data class Order(
         val attributesList: List<Attribute>,
         val parent: Long? = null,
         val configuration: ProductConfiguration? = null,
-        val configurationKey: Long? = null
+        val configurationKey: Long? = null,
+        val containsMetadata: Boolean = false
     ) : Parcelable {
         @IgnoredOnParcel
         val uniqueId: Long = ProductHelper.productOrVariationId(productId, variationId)

WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderMapper.kt

@@ -127,7 +127,8 @@ class OrderMapper @Inject constructor(
                         Item.Attribute(attribute.key.orEmpty(), attribute.value.orEmpty())
                     },
                     it.bundledBy?.toLongOrNull() ?: it.compositeParent?.toLongOrNull(),
-                    configurationKey = it.configurationKey
+                    configurationKey = it.configurationKey,
+                    containsMetadata = it.metaData?.isNotEmpty() ?: false
                 )
             }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardFragment.kt

@@ -52,7 +52,6 @@ import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.Fe
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.OpenEditWidgets
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.OpenRangePicker
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.ShareStore
-import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.ShowAIProductDescriptionDialog
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.ShowPrivacyBanner
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardWidgetUiModel
 import com.woocommerce.android.ui.google.webview.GoogleAdsWebViewFragment
@@ -173,11 +172,6 @@ class DashboardFragment :
 
                 is ShareStore -> ActivityUtils.shareStoreUrl(requireActivity(), event.storeUrl)
 
-                is ShowAIProductDescriptionDialog ->
-                    findNavController().navigateSafely(
-                        DashboardFragmentDirections.actionDashboardToAIProductDescriptionDialogFragment()
-                    )
-
                 is OpenEditWidgets -> {
                     findNavController().navigateSafely(
                         DashboardFragmentDirections.actionDashboardToEditWidgetsFragment()