feat: recieved message from hub to disable webview loading (#43)

* feat: recieve message from hub to disable webview loading * feat(hub): animate in after loading (#44) * feat: recieve message from hub to disable webview loading * feat: fade in webview on load * feat: fade in webview on load * fix(lottie): loop animations * chore: test estimatedprogress * chore: revert test estimatedprogress * chore: cleanup --------- Co-authored-by: mfmurray <mfmurray@umich.edu> * chore: consolidate loading states * fix: added default animateInContent delay --------- Co-authored-by: Matt Hamann <mhamann@rownd.io>
rownd · Feb 27, 2023 · c708bed · c708bed
1 parent 06ec768
commit c708bed
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist b/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Rownd.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>22</integer>
 		</dict>
 		<key>RowndFrameworkTestApp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>23</integer>
 		</dict>
 		<key>RowndTests.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/Sources/Rownd/Models/RowndHubInteropMessage.swift b/Sources/Rownd/Models/RowndHubInteropMessage.swift
@@ -50,6 +50,7 @@ enum MessageType: String, Codable {
     case triggerSignUpWithPasskey = "trigger_sign_up_with_passkey"
     case userDataUpdate = "user_data_update"
     case tryAgain = "try_again"
+    case hubLoaded = "hub_loaded"
     case unknown
 
     enum CodingKeys: String, CodingKey {
@@ -76,6 +77,7 @@ enum MessagePayload: Decodable {
     case triggerSignInWithApple(TriggerSignInWithAppleMessage)
     case triggerSignInWithGoogle(TriggerSignInWithGoogleMessage)
     case triggerSignUpWithPasskey
+    case hubLoaded
     case tryAgain
 
     enum CodingKeys: String, CodingKey {
@@ -121,6 +123,9 @@ enum MessagePayload: Decodable {
         case .tryAgain:
             self = .tryAgain
 
+        case .hubLoaded:
+            self = .hubLoaded
+
         case .unknown:
             self = .unknown
         }

diff --git a/Sources/Rownd/Views/HubWebView/HubWebViewController.swift b/Sources/Rownd/Views/HubWebView/HubWebViewController.swift
@@ -106,6 +106,7 @@ public class HubWebViewController: UIViewController, WKUIDelegate {
         webView.backgroundColor = UIColor.clear
         webView.scrollView.backgroundColor = UIColor.clear
         webView.hack_removeInputAccessory()
+        webView.alpha = 0
         self.modalPresentationStyle = .pageSheet
         view = webView
     }
@@ -173,8 +174,15 @@ extension HubWebViewController: WKScriptMessageHandler, WKNavigationDelegate {
         webView.backgroundColor = UIColor.clear
         webView.scrollView.backgroundColor = UIColor.clear
 
-        hubViewController?.setLoading(false)
-
+        let webViewOrigin = (webView.url?.absoluteURL.scheme ?? "") + "://" + (webView.url?.absoluteURL.host ?? "")
+        if (webViewOrigin != Rownd.config.baseUrl) {
+            // Only disable loading if webView is not from hub
+            self.animateInContent()
+        } else {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 6.0) {
+                self.animateInContent()
+            }
+        }
         setFeatureFlagsJS()
 
         if let jsFnOptions = jsFnOptions {
@@ -280,11 +288,20 @@ extension HubWebViewController: WKScriptMessageHandler, WKNavigationDelegate {
                 }
             case .tryAgain:
                 startLoading()
+            case .hubLoaded:
+                self.animateInContent()
             case .unknown:
                 break
             }
         } catch {
             logger.error("Failed to decode incoming interop message: \(String(describing: error))")
         }
     }
+
+    private func animateInContent() {
+        UIView.animate(withDuration: 1.0) {
+            self.webView.alpha = 1.0
+            self.hubViewController?.setLoading(false)
+        }
+    }
 }
diff --git a/Sources/Rownd/framework/Customizations.swift b/Sources/Rownd/framework/Customizations.swift
@@ -40,6 +40,7 @@ open class RowndCustomizations: Encodable {
             height: 100
         )
 
+        aniView.loopMode = .loop
         aniView.startAnimating()
         return aniView
     }