Update cover image status when editing order

woocommerce · Jan 17, 2025 · 2dd833c · 2dd833c
1 parent 2648b4e
commit 2dd833c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/...erce/src/main/kotlin/com/woocommerce/android/ui/products/images/ProductImagesViewModel.kt b/...erce/src/main/kotlin/com/woocommerce/android/ui/products/images/ProductImagesViewModel.kt
@@ -148,7 +148,10 @@ class ProductImagesViewModel @Inject constructor(
     }
 
     fun onValidateButtonClicked() {
-        viewState = viewState.copy(productImagesState = Browsing)
+        viewState = viewState.copy(
+            images = images.updateProductCoverImageToFirstItem(),
+            productImagesState = Browsing
+        )
     }
 
     fun onNavigateBackButtonClicked() {
@@ -159,6 +162,7 @@ class ProductImagesViewModel @Inject constructor(
                     images = productImagesState.initialState
                 )
             }
+
             Browsing -> {
                 val hasChange = !images.areSameImagesAs(originalImages)
                 analyticsTracker.track(
@@ -228,8 +232,13 @@ class ProductImagesViewModel @Inject constructor(
 
     fun onGalleryImageDragStarted() {
         when (viewState.productImagesState) {
-            is Dragging -> { /* no-op*/ }
-            Browsing -> viewState = viewState.copy(productImagesState = Dragging(images))
+            is Dragging -> { /* no-op*/
+            }
+
+            Browsing -> viewState = viewState.copy(
+                images = images.uncheckProductCoverImage(),
+                productImagesState = Dragging(images)
+            )
         }
     }
 
@@ -249,6 +258,16 @@ class ProductImagesViewModel @Inject constructor(
         }
     }
 
+    private fun List<Product.Image>.updateProductCoverImageToFirstItem() =
+        this.mapIndexed { index, image ->
+            when {
+                index == 0 -> image.copy(isCoverImage = true)
+                else -> image.copy(isCoverImage = false)
+            }
+        }
+
+    private fun List<Product.Image>.uncheckProductCoverImage() = this.map { it.copy(isCoverImage = false) }
+
     @Parcelize
     data class ViewState(
         val showSourceChooser: Boolean? = null,

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCProductImageGalleryView.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCProductImageGalleryView.kt
@@ -251,7 +251,7 @@ class WCProductImageGalleryView @JvmOverloads constructor(
             imageList.addAll(images)
 
             // restore the "Add image" icon (never shown when list is empty)
-            if (showAddImageIcon && imageList.size > 0) {
+            if (showAddImageIcon && imageList.isNotEmpty()) {
                 imageList.add(
                     Product.Image(
                         id = ADD_IMAGE_ITEM_ID,
@@ -299,7 +299,7 @@ class WCProductImageGalleryView @JvmOverloads constructor(
             }
 
             for (index in images.indices) {
-                if (images[index].id != actualImages[index].id) {
+                if (images[index] != actualImages[index]) {
                     return false
                 }
             }
@@ -451,7 +451,7 @@ class WCProductImageGalleryView @JvmOverloads constructor(
                 listener.onGalleryImageDeleteIconClicked(image)
             }
             viewBinding.coverTag.visibility = when {
-                image.isCoverImage && !viewBinding.deleteImageButton.isVisible  -> View.VISIBLE
+                image.isCoverImage -> View.VISIBLE
                 else -> View.GONE
             }
         }