Merge pull request #111 from KevinnZou/feature/ios_zoom_disable

feat:make support zoom a common feature (desktop excluded)

Author: KevinnZou

webview/src/androidMain/kotlin/com/multiplatform/webview/web/AccompanistWebView.kt

@@ -178,6 +178,7 @@ fun AccompanistWebView(
                         userAgentString = it.customUserAgentString
                         allowFileAccessFromFileURLs = it.allowFileAccessFromFileURLs
                         allowUniversalAccessFromFileURLs = it.allowUniversalAccessFromFileURLs
+                        setSupportZoom(it.supportZoom)
                     }
 
                     state.webSettings.androidWebSettings.let {
@@ -187,7 +188,6 @@ fun AccompanistWebView(
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                             isAlgorithmicDarkeningAllowed = it.isAlgorithmicDarkeningAllowed
                         }
-                        setSupportZoom(it.supportZoom)
                         setBackgroundColor(state.webSettings.backgroundColor.toArgb())
                         allowFileAccess = it.allowFileAccess
                         textZoom = it.textZoom

webview/src/commonMain/kotlin/com/multiplatform/webview/setting/PlatformWebSettings.kt

@@ -10,16 +10,6 @@ sealed class PlatformWebSettings {
      * Android web settings
      */
     data class AndroidWebSettings(
-        /**
-         * whether the WebView should support zooming using its on-screen zoom
-         * controls and gestures. The particular zoom mechanisms that should be used
-         * can be set with {@link #setBuiltInZoomControls}. This setting does not
-         * affect zooming performed using the {@link WebView#zoomIn()} and
-         * {@link WebView#zoomOut()} methods. The default is {@code true}.
-         *
-         * @param support whether the WebView should support zoom
-         */
-        var supportZoom: Boolean = true,
         /**
          * Enables or disables file access within WebView.
          * Note that this enables or disables file system access only. Assets and resources

webview/src/commonMain/kotlin/com/multiplatform/webview/setting/WebSettings.kt

@@ -30,6 +30,14 @@ class WebSettings {
      */
     var zoomLevel: Double = 1.0
 
+    /**
+     * whether the WebView should support zooming using its on-screen zoom
+     * controls and gestures. The default is {@code true}.
+     *
+     * @param support whether the WebView should support zoom
+     */
+    var supportZoom: Boolean = true
+
     /**
      * Whether cross-origin requests in the context of a file scheme URL should be allowed to
      * access content from other file scheme URLs. Note that some accesses such as image HTML

webview/src/iosMain/kotlin/com/multiplatform/webview/web/WKNavigationDelegate.kt

@@ -41,8 +41,10 @@ class WKNavigationDelegate(
         webView: WKWebView,
         didCommitNavigation: WKNavigation?,
     ) {
+        val supportZoom = if (state.webSettings.supportZoom) "yes" else "no"
+
         @Suppress("ktlint:standard:max-line-length")
-        val script = "var meta = document.createElement('meta');meta.setAttribute('name', 'viewport');meta.setAttribute('content', 'width=device-width, initial-scale=${state.webSettings.zoomLevel}, maximum-scale=10.0, minimum-scale=0.1,user-scalable=yes');document.getElementsByTagName('head')[0].appendChild(meta);"
+        val script = "var meta = document.createElement('meta');meta.setAttribute('name', 'viewport');meta.setAttribute('content', 'width=device-width, initial-scale=${state.webSettings.zoomLevel}, maximum-scale=10.0, minimum-scale=0.1,user-scalable=$supportZoom');document.getElementsByTagName('head')[0].appendChild(meta);"
         webView.evaluateJavaScript(script) { _, _ -> }
         KLogger.info { "didCommitNavigation" }
     }

webview/src/iosMain/kotlin/com/multiplatform/webview/web/WebView.ios.kt

@@ -93,6 +93,7 @@ fun IOSWebView(
                     val scrollViewColor = (it.iOSWebSettings.underPageBackgroundColor ?: it.backgroundColor).toUIColor()
                     setBackgroundColor(backgroundColor)
                     scrollView.setBackgroundColor(scrollViewColor)
+                    scrollView.pinchGestureRecognizer?.enabled = it.supportZoom
                 }
                 state.webSettings.iOSWebSettings.let {
                     with(scrollView) {