Merge pull request #182 from virtusize/bugfix/NSDK-383-no-size

NSDK-383 no size test issue

Author: ObranS

CHANGELOG.md

@@ -1,3 +1,7 @@
+### Changes
+- Fix: issue with no size found text
+- Fix: Virtusize button state when loading a new product
+
 ### 2.12.13
 - Fix: External Link redirect issue
 

virtusize-core/src/main/java/com/virtusize/android/data/remote/I18nLocalization.kt

@@ -22,6 +22,7 @@ data class I18nLocalization(
     val sizeComparisonMultiSizeText: String,
     val willFitResultText: String,
     val willNotFitResultText: String,
+    val willNotFitResultDefaultText: String,
     val bodyDataEmptyText: String,
 ) {
     enum class TrimType {

virtusize-core/src/main/java/com/virtusize/android/data/remote/Product.kt

@@ -41,6 +41,7 @@ data class Product(
         i18nLocalization: I18nLocalization,
         sizeComparisonRecommendedSize: SizeComparisonRecommendedSize?,
         bodyProfileRecommendedSizeName: String?,
+        bodyProfileWillFit: Boolean? = null,
     ): String {
         return when {
             isAccessory() -> accessoryText(i18nLocalization, sizeComparisonRecommendedSize)
@@ -49,12 +50,14 @@ data class Product(
                     i18nLocalization = i18nLocalization,
                     sizeComparisonRecommendedSize = sizeComparisonRecommendedSize,
                     bodyProfileRecommendedSizeName = bodyProfileRecommendedSizeName,
+                    bodyProfileWillFit = bodyProfileWillFit,
                 )
             else ->
                 multiSizeText(
                     i18nLocalization,
                     sizeComparisonRecommendedSize,
                     bodyProfileRecommendedSizeName,
+                    bodyProfileWillFit,
                 )
         }
     }
@@ -88,13 +91,27 @@ data class Product(
         i18nLocalization: I18nLocalization,
         sizeComparisonRecommendedSize: SizeComparisonRecommendedSize?,
         bodyProfileRecommendedSizeName: String?,
+        bodyProfileWillFit: Boolean?,
     ): String {
-        bodyProfileRecommendedSizeName?.let {
-            return i18nLocalization.oneSizeWillFitResultText
+        // Check if body data is provided (bodyProfileRecommendedSizeName is not null means body data was provided)
+        val hasBodyData = bodyProfileRecommendedSizeName != null
+
+        // For one-size products with body data provided
+        if (hasBodyData) {
+            // If willFit is not explicitly false and we have a recommended size, show the will fit message
+            if (bodyProfileWillFit != false) {
+                return i18nLocalization.oneSizeWillFitResultText
+            }
+            // If willFit is false or no recommended size, show "Your size not found"
+            return i18nLocalization.willNotFitResultDefaultText
         }
+
+        // No body data provided, check for product comparison
         sizeComparisonRecommendedSize?.let {
             return i18nLocalization.getOneSizeProductComparisonText(it)
         }
+
+        // No data at all, show body data empty message
         return i18nLocalization.bodyDataEmptyText
     }
 
@@ -105,15 +122,29 @@ data class Product(
         i18nLocalization: I18nLocalization,
         sizeComparisonRecommendedSize: SizeComparisonRecommendedSize?,
         bodyProfileRecommendedSizeName: String?,
+        bodyProfileWillFit: Boolean?,
     ): String {
-        bodyProfileRecommendedSizeName?.let {
-            return i18nLocalization.getMultiSizeBodyProfileText(
-                bodyProfileRecommendedSizeName = bodyProfileRecommendedSizeName,
-            )
+        // Check if body data is provided
+        val hasBodyData = bodyProfileRecommendedSizeName != null
+
+        // For multi-size products with body data provided
+        if (hasBodyData) {
+            // If willFit is not explicitly false and we have a recommended size, show it
+            if (bodyProfileWillFit != false && bodyProfileRecommendedSizeName.isNotEmpty()) {
+                return i18nLocalization.getMultiSizeBodyProfileText(
+                    bodyProfileRecommendedSizeName = bodyProfileRecommendedSizeName,
+                )
+            }
+            // If willFit is false or no recommended size, show "Your size not found"
+            return i18nLocalization.willNotFitResultDefaultText
         }
+
+        // No body data provided, check for product comparison
         sizeComparisonRecommendedSize?.bestStoreProductSize?.name?.let {
             return i18nLocalization.getMultiSizeProductComparisonText(it)
         }
+
+        // No data at all, show body data empty message
         return i18nLocalization.bodyDataEmptyText
     }
 

virtusize-core/src/main/res/values-ja/strings.xml

@@ -12,5 +12,6 @@
     <string name="inpage_multi_size_comparison_text">あなたの服に近いサイズ</string>
     <string name="inpage_will_fit_result_text">あなたにフィットするサイズ</string>
     <string name="inpage_will_not_fit_result_text">試着をおすすめします</string>
+    <string name="inpage_will_not_fit_result_default_text">試着をおすすめします</string>
     <string name="inpage_body_data_empty_text">簡単サイズチェック</string>
 </resources>

virtusize-core/src/main/res/values-ko/strings.xml

@@ -12,5 +12,6 @@
     <string name="inpage_multi_size_comparison_text">가장 유사한 상품은</string>
     <string name="inpage_will_fit_result_text">추천하는 사이즈는</string>
     <string name="inpage_will_not_fit_result_text">당신에게 잘 맞는지 확인해 보세요</string>
+    <string name="inpage_will_not_fit_result_default_text">당신에게 잘 맞는지 확인해 보세요</string>
     <string name="inpage_body_data_empty_text">당신에게 맞는 사이즈를 찾아보세요</string>
 </resources>

virtusize-core/src/main/res/values/strings.xml

@@ -11,6 +11,7 @@
     <string name="inpage_one_size_will_fit_result_text">This item should fit you</string>
     <string name="inpage_multi_size_comparison_text">The closest size to your item is</string>
     <string name="inpage_will_fit_result_text">Your recommended size is</string>
-    <string name="inpage_will_not_fit_result_text">Check how it fits you</string>
+    <string name="inpage_will_not_fit_result_text">Your size not found</string>
+    <string name="inpage_will_not_fit_result_default_text">Your size not found</string>
     <string name="inpage_body_data_empty_text">Find your right size</string>
 </resources>

virtusize-core/src/test/java/com/virtusize/android/data/remote/ProductTest.kt

@@ -41,6 +41,7 @@ class ProductTest {
                 sizeComparisonMultiSizeText = context.getString(R.string.inpage_multi_size_comparison_text),
                 willFitResultText = context.getString(R.string.inpage_will_fit_result_text),
                 willNotFitResultText = context.getString(R.string.inpage_will_not_fit_result_text),
+                willNotFitResultDefaultText = context.getString(R.string.inpage_will_not_fit_result_default_text),
                 bodyDataEmptyText = context.getString(R.string.inpage_body_data_empty_text),
             )
     }

virtusize/src/main/java/com/virtusize/android/VirtusizeImpl.kt

@@ -247,6 +247,7 @@ internal class VirtusizeImpl(
                 externalProductId: String,
                 userProductRecommendedSize: SizeComparisonRecommendedSize?,
                 userBodyRecommendedSize: String?,
+                userBodyWillFit: Boolean?,
             ) {
                 val storeProduct = virtusizeRepository.getProductBy(externalProductId)
                 virtusizeViews
@@ -266,6 +267,7 @@ internal class VirtusizeImpl(
                                         i18nLocalization = i18nLocalization,
                                         sizeComparisonRecommendedSize = userProductRecommendedSize,
                                         bodyProfileRecommendedSizeName = userBodyRecommendedSize,
+                                        bodyProfileWillFit = userBodyWillFit,
                                     ).trimI18nText(trimType)
                                 virtusizeView.setRecommendationText(
                                     externalProductId,

virtusize/src/main/java/com/virtusize/android/VirtusizePresenter.kt

@@ -12,6 +12,7 @@ internal interface VirtusizePresenter {
         externalProductId: String,
         userProductRecommendedSize: SizeComparisonRecommendedSize?,
         userBodyRecommendedSize: String?,
+        userBodyWillFit: Boolean?,
     )
 
     fun hasInPageError(

virtusize/src/main/java/com/virtusize/android/VirtusizeRepository.kt

@@ -48,6 +48,7 @@ class VirtusizeRepository internal constructor(
     private var userProducts: List<Product>? = null
     private var userProductRecommendedSize: SizeComparisonRecommendedSize? = null
     private var userBodyRecommendedSize: String? = null
+    private var userBodyWillFit: Boolean? = null
 
     // This variable holds the list of product types from the Virtusize API
     private var productTypes: List<ProductType>? = null
@@ -373,6 +374,7 @@ class VirtusizeRepository internal constructor(
                             externalProductId = productId,
                             userProductRecommendedSize = userProductRecommendedSize,
                             userBodyRecommendedSize = null,
+                            userBodyWillFit = null,
                         )
                     }
 
@@ -381,6 +383,7 @@ class VirtusizeRepository internal constructor(
                             externalProductId = productId,
                             userProductRecommendedSize = null,
                             userBodyRecommendedSize = userBodyRecommendedSize,
+                            userBodyWillFit = userBodyWillFit,
                         )
                     }
 
@@ -389,6 +392,7 @@ class VirtusizeRepository internal constructor(
                             externalProductId = productId,
                             userProductRecommendedSize = userProductRecommendedSize,
                             userBodyRecommendedSize = userBodyRecommendedSize,
+                            userBodyWillFit = userBodyWillFit,
                         )
                     }
                 }
@@ -406,6 +410,7 @@ class VirtusizeRepository internal constructor(
         userProducts = null
         userProductRecommendedSize = null
         userBodyRecommendedSize = null
+        userBodyWillFit = null
     }
 
     /**
@@ -419,6 +424,7 @@ class VirtusizeRepository internal constructor(
         productTypes: List<ProductType>?,
     ): String? {
         if (storeProduct == null || productTypes == null || storeProduct.isAccessory()) {
+            userBodyWillFit = null
             return null
         }
         val userBodyProfileResponse = virtusizeAPIService.getUserBodyProfile()
@@ -430,6 +436,7 @@ class VirtusizeRepository internal constructor(
                         storeProduct,
                         userBodyProfileResponse.successData!!,
                     )
+                userBodyWillFit = bodyProfileRecommendedSizeResponse.successData?.willFit
                 return bodyProfileRecommendedSizeResponse.successData?.sizeName
             } else {
                 val bodyProfileRecommendedSizeResponse =
@@ -438,13 +445,15 @@ class VirtusizeRepository internal constructor(
                         storeProduct,
                         userBodyProfileResponse.successData!!,
                     )
+                userBodyWillFit = bodyProfileRecommendedSizeResponse.successData?.get(0)?.willFit
                 return bodyProfileRecommendedSizeResponse.successData?.get(0)?.sizeName
             }
         } else if (userBodyProfileResponse.failureData?.code != HttpURLConnection.HTTP_NOT_FOUND) {
             userBodyProfileResponse.failureData?.let {
                 messageHandler.onError(it)
             }
         }
+        userBodyWillFit = null
         return null
     }