From dcb32ea3ad7c876a9104daba38953924f89b3add Mon Sep 17 00:00:00 2001 From: Niklas Merz Date: Thu, 4 Jun 2020 20:14:39 +0200 Subject: [PATCH 1/2] Add PreferredContentMode preference --- .../Plugins/CDVWebViewEngine/CDVWebViewEngine.m | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m b/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m index cf3bf583e9..3af440fe07 100644 --- a/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m +++ b/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m @@ -135,6 +135,16 @@ - (WKWebViewConfiguration*) createConfigurationFromSettings:(NSDictionary*)setti } configuration.applicationNameForUserAgent = userAgent; + if (@available(iOS 13.0, *)) { + NSString *contentMode = [settings cordovaSettingForKey:@"PreferredContentMode"]; + if ([contentMode isEqual: @"mobile"]) { + configuration.defaultWebpagePreferences.preferredContentMode = WKContentModeMobile; + } else if ([contentMode isEqual: @"desktop"]) { + configuration.defaultWebpagePreferences.preferredContentMode = WKContentModeDesktop; + } + + } + return configuration; } From d27a36660585d1b972ce95913c9baabfe0abb9af Mon Sep 17 00:00:00 2001 From: Niklas Merz Date: Fri, 12 Jun 2020 18:06:13 +0200 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: エリス --- .../Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m b/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m index 3af440fe07..cede8bce55 100644 --- a/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m +++ b/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m @@ -137,9 +137,9 @@ - (WKWebViewConfiguration*) createConfigurationFromSettings:(NSDictionary*)setti if (@available(iOS 13.0, *)) { NSString *contentMode = [settings cordovaSettingForKey:@"PreferredContentMode"]; - if ([contentMode isEqual: @"mobile"]) { + if ([contentMode isEqual: @"mobile"]) { configuration.defaultWebpagePreferences.preferredContentMode = WKContentModeMobile; - } else if ([contentMode isEqual: @"desktop"]) { + } else if ([contentMode isEqual: @"desktop"]) { configuration.defaultWebpagePreferences.preferredContentMode = WKContentModeDesktop; }