Merge pull request #174 from virtusize/fix/NSDK-293-infinite-loading

ObranS · web-flow · commit 9f6da900a9ef · 2025-10-28T23:08:33.000+02:00
NSDK-293 infinite loading issue fix
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 #### Fixes
+- Fix: Added close button on error loading webview
+
+### 2.12.7
 - Fix: bra body measurements - suggested size issue fixed
 
 ### 2.12.6
diff --git a/README-COMPOSE.md b/README-COMPOSE.md
@@ -74,15 +74,15 @@ In your app `build.gradle` file, add the following dependencies:
 
   ```groovy
   dependencies {
-    implementation 'com.virtusize.android:virtusize:2.12.7'
+    implementation 'com.virtusize.android:virtusize:2.12.8'
   }
   ```
 
 - Kotlin (build.gradle.kts)
 
   ```kotlin
   dependencies {
-    implementation("com.virtusize.android:virtusize:2.12.7")
+    implementation("com.virtusize.android:virtusize:2.12.8")
   }
   ```
 
diff --git a/README-JP.md b/README-JP.md
@@ -75,15 +75,15 @@ appの`build.gradle`ファイルに下記のdependencyを追加
 
   ```groovy
   dependencies {
-    implementation 'com.virtusize.android:virtusize:2.12.7'
+    implementation 'com.virtusize.android:virtusize:2.12.8'
   }
   ```
 
 - Kotlin (build.gradle.kts)
 
   ```kotlin
   dependencies {
-    implementation("com.virtusize.android:virtusize:2.12.7")
+    implementation("com.virtusize.android:virtusize:2.12.8")
   }
   ```
 
diff --git a/README.md b/README.md
@@ -82,15 +82,15 @@ In your app `build.gradle` file, add the following dependencies:
 
   ```groovy
   dependencies {
-    implementation 'com.virtusize.android:virtusize:2.12.7'
+    implementation 'com.virtusize.android:virtusize:2.12.8'
   }
   ```
 
 - Kotlin (build.gradle.kts)
 
   ```kotlin
   dependencies {
-    implementation("com.virtusize.android:virtusize:2.12.7")
+    implementation("com.virtusize.android:virtusize:2.12.8")
   }
   ```
 
diff --git a/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt b/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt
@@ -6,6 +6,6 @@ object Constants {
     const val TARGET_SDK = 35
 
     // Update versionName when publishing a new release
-    const val VERSION_NAME = "2.12.7"
+    const val VERSION_NAME = "2.12.8"
     const val GROUP_ID = "com.virtusize.android"
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ material = "1.12.0"
 nextPublish = "1.1.0"
 robolectric = "4.13"
 truth = "1.4.4"
-virtusize = "2.12.7"
+virtusize = "2.12.8"
 virtusizeAuth = "1.1.1"
 browser = "1.8.0"
 
diff --git a/virtusize-core/src/main/java/com/virtusize/android/data/local/VirtusizeEvent.kt b/virtusize-core/src/main/java/com/virtusize/android/data/local/VirtusizeEvent.kt
@@ -22,6 +22,7 @@ enum class EventName(val value: String) {
     UserClosedWidget("user-closed-widget"),
     UserClickedStart("user-clicked-start"),
     UserClickedLanguageSelector("user-clicked-language"),
+    WidgetReady("widget-ready"),
     ;
 
     companion object {
@@ -102,6 +103,10 @@ sealed interface VirtusizeEvent {
         override val name: String = EventName.UserClickedLanguageSelector.value
     }
 
+    data class WidgetReady(override val data: JSONObject? = null) : VirtusizeEvent {
+        override val name: String = EventName.WidgetReady.value
+    }
+
     data class Undefined(override val name: String, override val data: JSONObject? = null) : VirtusizeEvent
 }
 
diff --git a/virtusize/src/main/java/com/virtusize/android/VirtusizeImpl.kt b/virtusize/src/main/java/com/virtusize/android/VirtusizeImpl.kt
@@ -177,6 +177,7 @@ internal class VirtusizeImpl(
                     is VirtusizeEvent.UserSawProduct,
                     is VirtusizeEvent.UserSawWidgetButton,
                     is VirtusizeEvent.UserClickedStart,
+                    is VirtusizeEvent.WidgetReady,
                     is VirtusizeEvent.Undefined,
                     -> Unit
                 }
diff --git a/virtusize/src/main/java/com/virtusize/android/data/parsers/VirtusizeEventJsonParser.kt b/virtusize/src/main/java/com/virtusize/android/data/parsers/VirtusizeEventJsonParser.kt
@@ -39,5 +39,6 @@ private fun getVirtusizeEvent(
         EventName.UserClosedWidget -> VirtusizeEvent.UserClosedWidget(data = json)
         EventName.UserClickedStart -> VirtusizeEvent.UserClickedStart(data = json)
         EventName.UserClickedLanguageSelector -> VirtusizeEvent.UserClickedLanguageSelector(data = json)
+        EventName.WidgetReady -> VirtusizeEvent.WidgetReady(data = json)
         null -> VirtusizeEvent.Undefined(name = name, data = json)
     }
diff --git a/virtusize/src/main/java/com/virtusize/android/flutter/VirtusizeFlutterImpl.kt b/virtusize/src/main/java/com/virtusize/android/flutter/VirtusizeFlutterImpl.kt
@@ -185,6 +185,7 @@ internal class VirtusizeFlutterImpl(
                     is VirtusizeEvent.UserSawProduct,
                     is VirtusizeEvent.UserSawWidgetButton,
                     is VirtusizeEvent.UserClickedStart,
+                    is VirtusizeEvent.WidgetReady,
                     is VirtusizeEvent.Undefined,
                     -> Unit
                 }
diff --git a/virtusize/src/main/java/com/virtusize/android/ui/VirtusizeWebViewFragment.kt b/virtusize/src/main/java/com/virtusize/android/ui/VirtusizeWebViewFragment.kt
@@ -8,12 +8,15 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.os.Message
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
 import android.webkit.CookieManager
 import android.webkit.JavascriptInterface
 import android.webkit.WebChromeClient
@@ -41,6 +44,10 @@ import kotlinx.coroutines.launch
 import org.json.JSONObject
 
 class VirtusizeWebViewFragment : DialogFragment() {
+    companion object {
+        private const val CLOSE_BUTTON_TIMER_DELAY = 6000L // 6 seconds
+    }
+
     private var virtusizeWebAppUrl: String = VirtusizeApi.getVirtusizeWebViewURL()
 
     private var showSNSButtons: Boolean = true
@@ -50,6 +57,9 @@ class VirtusizeWebViewFragment : DialogFragment() {
 
     private var virtusizeMessageHandler: VirtusizeMessageHandler? = null
 
+    private var closeButtonHandler: Handler? = null
+    private var closeButtonRunnable: Runnable? = null
+
     private val apiService: VirtusizeAPIService by lazy {
         VirtusizeAPIService.getInstance(requireContext(), virtusizeMessageHandler)
     }
@@ -226,6 +236,11 @@ class VirtusizeWebViewFragment : DialogFragment() {
             true
         }
 
+        binding.closeButton.setOnClickListener {
+            stopCloseButtonTimer()
+            dismiss()
+        }
+
         // Get the Virtusize params script passed in fragment arguments.
         // If the script is not passed, we dismiss this dialog fragment.
         vsParamsFromSDKScript = arguments?.getString(Constants.VIRTUSIZE_PARAMS_SCRIPT_KEY) ?: run {
@@ -264,6 +279,8 @@ class VirtusizeWebViewFragment : DialogFragment() {
                     binding.webView.loadUrl(virtusizeWebAppUrl)
                 }
         }
+
+        startCloseButtonTimer()
     }
 
     override fun onStop() {
@@ -274,6 +291,7 @@ class VirtusizeWebViewFragment : DialogFragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        stopCloseButtonTimer()
         binding.webView.stopLoading()
         binding.webView.destroy()
     }
@@ -324,7 +342,14 @@ class VirtusizeWebViewFragment : DialogFragment() {
             val event = VirtusizeEventJsonParser().parse(JSONObject(eventInfo))
             event?.let { virtusizeMessageHandler?.onEvent(clientProduct, it) }
             when (event) {
-                is VirtusizeEvent.UserClosedWidget -> dismiss()
+                is VirtusizeEvent.UserClosedWidget -> {
+                    stopCloseButtonTimer()
+                    dismiss()
+                }
+                is VirtusizeEvent.WidgetReady -> {
+                    stopCloseButtonTimer()
+                    hideCloseButton()
+                }
                 is VirtusizeEvent.UserClickedStart -> userAcceptedPrivacyPolicy()
                 else -> Unit
             }
@@ -339,4 +364,41 @@ class VirtusizeWebViewFragment : DialogFragment() {
             )
         }
     }
+
+    private fun startCloseButtonTimer() {
+        closeButtonHandler = Handler(Looper.getMainLooper())
+        closeButtonRunnable =
+            Runnable {
+                showCloseButton()
+            }
+        closeButtonHandler?.postDelayed(closeButtonRunnable!!, CLOSE_BUTTON_TIMER_DELAY)
+    }
+
+    private fun stopCloseButtonTimer() {
+        closeButtonRunnable?.let {
+            closeButtonHandler?.removeCallbacks(it)
+        }
+        closeButtonHandler = null
+        closeButtonRunnable = null
+    }
+
+    private fun showCloseButton() {
+        val fadeIn =
+            AlphaAnimation(0f, 1f).apply {
+                duration = 300
+                fillAfter = true
+            }
+        binding.closeButton.visibility = View.VISIBLE
+        binding.closeButton.startAnimation(fadeIn)
+    }
+
+    private fun hideCloseButton() {
+        val fadeOut =
+            AlphaAnimation(1f, 0f).apply {
+                duration = 300
+                fillAfter = true
+            }
+        binding.closeButton.startAnimation(fadeOut)
+        binding.closeButton.visibility = View.GONE
+    }
 }
diff --git a/virtusize/src/main/res/drawable/close_button_background.xml b/virtusize/src/main/res/drawable/close_button_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#E6FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#1A000000" />
+</shape>
diff --git a/virtusize/src/main/res/drawable/ic_close.xml b/virtusize/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/virtusize/src/main/res/layout/fragment_virtusize_webview.xml b/virtusize/src/main/res/layout/fragment_virtusize_webview.xml
@@ -10,4 +10,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <ImageButton
+        android:id="@+id/closeButton"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="16dp"
+        android:background="@drawable/close_button_background"
+        android:contentDescription="@string/close_button_description"
+        android:elevation="4dp"
+        android:padding="8dp"
+        android:src="@drawable/ic_close"
+        android:visibility="gone" />
+
 </FrameLayout>
diff --git a/virtusize/src/main/res/values-ja/strings.xml b/virtusize/src/main/res/values-ja/strings.xml
@@ -7,4 +7,5 @@
     <string name="inpage_loading_text">サイズを分析中</string>
     <string name="inpage_long_error_text">現在バーチャサイズは使えませんが、\nそのままお買い物をお楽しみください。</string>
     <string name="inpage_short_error_text">現在バーチャサイズは使えません。</string>
+    <string name="close_button_description">閉じる</string>
 </resources>
diff --git a/virtusize/src/main/res/values-ko/strings.xml b/virtusize/src/main/res/values-ko/strings.xml
@@ -7,4 +7,5 @@
     <string name="inpage_loading_text">사이즈 분석 중</string>
     <string name="inpage_long_error_text">현재 버츄사이즈 서비스를 이용할 수 없습니다.\n 즐거운 쇼핑되세요.</string>
     <string name="inpage_short_error_text">현재 버츄사이즈 서비스를 이용할 수 없습니다.</string>
+    <string name="close_button_description">닫기</string>
 </resources>
diff --git a/virtusize/src/main/res/values/strings.xml b/virtusize/src/main/res/values/strings.xml
@@ -8,5 +8,6 @@
     <string name="inpage_loading_text">Analyzing the size</string>
     <string name="inpage_long_error_text">Virtusize is not available at the moment.\nPlease enjoy shopping without us.</string>
     <string name="inpage_short_error_text">Virtusize is not available at the moment.</string>
+    <string name="close_button_description">Close</string>
 
 </resources>

Original file line number	Diff line number	Diff line change
@@ -74,15 +74,15 @@ In your app `build.gradle` file, add the following dependencies:
`74`	`74`
`75`	`75`	```groovy
`76`	`76`	`dependencies {`
`77`		`- implementation 'com.virtusize.android:virtusize:2.12.7'`
	`77`	`+ implementation 'com.virtusize.android:virtusize:2.12.8'`
`78`	`78`	`}`
`79`	`79`	```
`80`	`80`
`81`	`81`	`- Kotlin (build.gradle.kts)`
`82`	`82`
`83`	`83`	```kotlin
`84`	`84`	`dependencies {`
`85`		`- implementation("com.virtusize.android:virtusize:2.12.7")`
	`85`	`+ implementation("com.virtusize.android:virtusize:2.12.8")`
`86`	`86`	`}`
`87`	`87`	```
`88`	`88`
Original file line number	Diff line number	Diff line change
@@ -75,15 +75,15 @@ appの`build.gradle`ファイルに下記のdependencyを追加
`75`	`75`
`76`	`76`	```groovy
`77`	`77`	`dependencies {`
`78`		`- implementation 'com.virtusize.android:virtusize:2.12.7'`
	`78`	`+ implementation 'com.virtusize.android:virtusize:2.12.8'`
`79`	`79`	`}`
`80`	`80`	```
`81`	`81`
`82`	`82`	`- Kotlin (build.gradle.kts)`
`83`	`83`
`84`	`84`	```kotlin
`85`	`85`	`dependencies {`
`86`		`- implementation("com.virtusize.android:virtusize:2.12.7")`
	`86`	`+ implementation("com.virtusize.android:virtusize:2.12.8")`
`87`	`87`	`}`
`88`	`88`	```
`89`	`89`
Original file line number	Diff line number	Diff line change
@@ -82,15 +82,15 @@ In your app `build.gradle` file, add the following dependencies:
`82`	`82`
`83`	`83`	```groovy
`84`	`84`	`dependencies {`
`85`		`- implementation 'com.virtusize.android:virtusize:2.12.7'`
	`85`	`+ implementation 'com.virtusize.android:virtusize:2.12.8'`
`86`	`86`	`}`
`87`	`87`	```
`88`	`88`
`89`	`89`	`- Kotlin (build.gradle.kts)`
`90`	`90`
`91`	`91`	```kotlin
`92`	`92`	`dependencies {`
`93`		`- implementation("com.virtusize.android:virtusize:2.12.7")`
	`93`	`+ implementation("com.virtusize.android:virtusize:2.12.8")`
`94`	`94`	`}`
`95`	`95`	```
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ object Constants {`
`6`	`6`	`const val TARGET_SDK = 35`
`7`	`7`
`8`	`8`	`// Update versionName when publishing a new release`
`9`		`- const val VERSION_NAME = "2.12.7"`
	`9`	`+ const val VERSION_NAME = "2.12.8"`
`10`	`10`	`const val GROUP_ID = "com.virtusize.android"`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ enum class EventName(val value: String) {`
`22`	`22`	`UserClosedWidget("user-closed-widget"),`
`23`	`23`	`UserClickedStart("user-clicked-start"),`
`24`	`24`	`UserClickedLanguageSelector("user-clicked-language"),`
	`25`	`+ WidgetReady("widget-ready"),`
`25`	`26`	`;`
`26`	`27`
`27`	`28`	`companion object {`
`@@ -102,6 +103,10 @@ sealed interface VirtusizeEvent {`
`102`	`103`	`override val name: String = EventName.UserClickedLanguageSelector.value`
`103`	`104`	`}`
`104`	`105`
	`106`	`+ data class WidgetReady(override val data: JSONObject? = null) : VirtusizeEvent {`
	`107`	`+ override val name: String = EventName.WidgetReady.value`
	`108`	`+ }`
	`109`	`+`
`105`	`110`	`data class Undefined(override val name: String, override val data: JSONObject? = null) : VirtusizeEvent`
`106`	`111`	`}`
`107`	`112`
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ internal class VirtusizeImpl(`
`177`	`177`	`is VirtusizeEvent.UserSawProduct,`
`178`	`178`	`is VirtusizeEvent.UserSawWidgetButton,`
`179`	`179`	`is VirtusizeEvent.UserClickedStart,`
	`180`	`+ is VirtusizeEvent.WidgetReady,`
`180`	`181`	`is VirtusizeEvent.Undefined,`
`181`	`182`	`-> Unit`
`182`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@ private fun getVirtusizeEvent(`
`39`	`39`	`EventName.UserClosedWidget -> VirtusizeEvent.UserClosedWidget(data = json)`
`40`	`40`	`EventName.UserClickedStart -> VirtusizeEvent.UserClickedStart(data = json)`
`41`	`41`	`EventName.UserClickedLanguageSelector -> VirtusizeEvent.UserClickedLanguageSelector(data = json)`
	`42`	`+ EventName.WidgetReady -> VirtusizeEvent.WidgetReady(data = json)`
`42`	`43`	`null -> VirtusizeEvent.Undefined(name = name, data = json)`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ internal class VirtusizeFlutterImpl(`
`185`	`185`	`is VirtusizeEvent.UserSawProduct,`
`186`	`186`	`is VirtusizeEvent.UserSawWidgetButton,`
`187`	`187`	`is VirtusizeEvent.UserClickedStart,`
	`188`	`+ is VirtusizeEvent.WidgetReady,`
`188`	`189`	`is VirtusizeEvent.Undefined,`
`189`	`190`	`-> Unit`
`190`	`191`	`}`