refactor(app): further improve keyboard interactions

socketsupply · May 15, 2024 · 8d4bef2 · 8d4bef2
1 parent 7e1bbe6
commit 8d4bef2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/src/app/app.cc b/src/app/app.cc
@@ -369,11 +369,13 @@ didFailToContinueUserActivityWithType: (NSString*) userActivityType
   CGFloat keyboardHeight = keyboardFrame.size.height;
 
   const auto window = self.app->windowManager.getWindow(0);
+  window->webview.scrollView.scrollEnabled = YES;
+
   CGRect startFrame = window->webview.frame;
   CGRect endFrame = CGRectMake(startFrame.origin.x, startFrame.origin.y, startFrame.size.width, startFrame.size.height + keyboardHeight);  // Expanding back
 
   __block CGFloat animationProgress = 0;
-  NSTimeInterval duration = ([userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]) * 1.25;
+  NSTimeInterval duration = ([userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]) * 0.9;
   NSTimeInterval stepDuration = duration / 120.0;
 
   NSNumber *curve = userInfo[UIKeyboardAnimationCurveUserInfoKey];
@@ -435,33 +437,35 @@ didFailToContinueUserActivityWithType: (NSString*) userActivityType
   CGFloat keyboardHeight = keyboardFrame.size.height;
 
   const auto window = self.app->windowManager.getWindow(0);
+  window->webview.scrollView.scrollEnabled = NO;
+
   CGRect startFrame = window->webview.frame;
   CGRect endFrame = CGRectMake(startFrame.origin.x, startFrame.origin.y, startFrame.size.width, startFrame.size.height - keyboardHeight);
 
   __block CGFloat animationProgress = 0;
-  NSTimeInterval duration = (([userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]) * 1.6);
+  NSTimeInterval duration = (([userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]) * 1.9);
   NSTimeInterval stepDuration = duration / 120.0;
 
   NSNumber *curve = userInfo[UIKeyboardAnimationCurveUserInfoKey];
   UIViewAnimationOptions animationCurve = [curve unsignedIntegerValue] << 16;
 
   [NSTimer scheduledTimerWithTimeInterval:stepDuration repeats:YES block:^(NSTimer * _Nonnull timer) {
-    animationProgress += stepDuration / duration;
+      animationProgress += stepDuration / duration;
 
-    if (animationProgress >= 1.0) {
-      animationProgress = 1.0;
-      window->webview.frame = endFrame;
-      [timer invalidate];
-    } else {
-      CGFloat interpolatedProgress = 1 - pow(1 - animationProgress, 3);
+      if (animationProgress >= 1.0) {
+        animationProgress = 1.0;
+        window->webview.frame = endFrame;
+        [timer invalidate];
+      } else {
+        CGFloat interpolatedProgress = 1 - pow(1 - animationProgress, 3);
 
-      CGRect newFrame = CGRectMake(startFrame.origin.x + (endFrame.origin.x - startFrame.origin.x) * interpolatedProgress,
-                                   startFrame.origin.y + (endFrame.origin.y - startFrame.origin.y) * interpolatedProgress,
-                                   startFrame.size.width + (endFrame.size.width - startFrame.size.width) * interpolatedProgress,
-                                   startFrame.size.height + (endFrame.size.height - startFrame.size.height) * interpolatedProgress);
+        CGRect newFrame = CGRectMake(startFrame.origin.x + (endFrame.origin.x - startFrame.origin.x) * interpolatedProgress,
+                                     startFrame.origin.y + (endFrame.origin.y - startFrame.origin.y) * interpolatedProgress,
+                                     startFrame.size.width + (endFrame.size.width - startFrame.size.width) * interpolatedProgress,
+                                     startFrame.size.height + (endFrame.size.height - startFrame.size.height) * interpolatedProgress);
 
-      window->webview.frame = newFrame;
-    }
+        window->webview.frame = newFrame;
+      }
   }];
 
   for (const auto window : self.app->windowManager.windows) {

diff --git a/src/window/apple.mm b/src/window/apple.mm
@@ -1299,9 +1299,24 @@ -                       (void) webView: (WKWebView*) webview
     this->window = [SSCWindow.alloc initWithFrame: frame];
     this->viewController = [SSCWebViewController new];
     this->viewController.webview = this->webview;
-    [this->viewController.view addSubview: this->webview];
+
+    UIUserInterfaceStyle interfaceStyle = this->window.traitCollection.userInterfaceStyle;
+
+    if (interfaceStyle == UIUserInterfaceStyleDark && opts.backgroundColorDark.size() > 0) {
+      this->setBackgroundColor(opts.backgroundColorDark);
+    } else if (opts.backgroundColorLight.size() > 0) {
+      this->setBackgroundColor(opts.backgroundColorLight);
+    } else {
+      this->viewController.webview.backgroundColor = [UIColor systemBackgroundColor];
+      this->window.backgroundColor = [UIColor systemBackgroundColor];
+      this->viewController.webview.opaque = NO;
+    }
+
+    [this->viewController.view addSubview:this->webview];
+
     this->window.rootViewController = this->viewController;
     this->window.rootViewController.view.frame = frame;
+
   #endif
 
     if (opts.title.size() > 0) {

diff --git a/src/window/webview.hh b/src/window/webview.hh
@@ -13,6 +13,7 @@ namespace SSC {
 @interface SSCBridgedWebView :
 #if SSC_PLATFORM_IOS
   WKWebView<WKUIDelegate>
+  @property (strong, nonatomic) NSLayoutConstraint *keyboardHeightConstraint;
 #else
   WKWebView<
     WKUIDelegate,