diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m index 5b7dc0e97..fa5b2ae47 100644 --- a/src/ios/CDVInAppBrowser.m +++ b/src/ios/CDVInAppBrowser.m @@ -19,7 +19,9 @@ Licensed to the Apache Software Foundation (ASF) under one #import "CDVInAppBrowser.h" #import "CDVInAppBrowserOptions.h" +#if !WK_WEB_VIEW_ONLY #import "CDVUIInAppBrowser.h" +#endif #import "CDVWKInAppBrowser.h" #import @@ -49,86 +51,122 @@ - (void)open:(CDVInvokedUrlCommand*)command return; } self.usewkwebview = browserOptions.usewkwebview; - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] open:command]; - }else{ - [[CDVUIInAppBrowser getInstance] open:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] open:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] open:command]; + }else{ + [[CDVUIInAppBrowser getInstance] open:command]; + } + #endif } - (void)close:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] close:command]; - }else{ - [[CDVUIInAppBrowser getInstance] close:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] close:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] close:command]; + }else{ + [[CDVUIInAppBrowser getInstance] close:command]; + } + #endif } - (void)show:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] show:command]; - }else{ - [[CDVUIInAppBrowser getInstance] show:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] show:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] show:command]; + }else{ + [[CDVUIInAppBrowser getInstance] show:command]; + } + #endif } - (void)hide:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] hide:command]; - }else{ - [[CDVUIInAppBrowser getInstance] hide:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] hide:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] hide:command]; + }else{ + [[CDVUIInAppBrowser getInstance] hide:command]; + } + #endif } - (void)injectScriptCode:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] injectScriptCode:command]; - }else{ - [[CDVUIInAppBrowser getInstance] injectScriptCode:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] injectScriptCode:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] injectScriptCode:command]; + }else{ + [[CDVUIInAppBrowser getInstance] injectScriptCode:command]; + } + #endif } - (void)injectScriptFile:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] injectScriptFile:command]; - }else{ - [[CDVUIInAppBrowser getInstance] injectScriptFile:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] injectScriptCode:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] injectScriptCode:command]; + }else{ + [[CDVUIInAppBrowser getInstance] injectScriptCode:command]; + } + #endif } - (void)injectStyleCode:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] injectStyleCode:command]; - }else{ - [[CDVUIInAppBrowser getInstance] injectStyleCode:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] injectStyleCode:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] injectStyleCode:command]; + }else{ + [[CDVUIInAppBrowser getInstance] injectStyleCode:command]; + } + #endif } - (void)injectStyleFile:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] injectStyleFile:command]; - }else{ - [[CDVUIInAppBrowser getInstance] injectStyleFile:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] injectStyleFile:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] injectStyleFile:command]; + }else{ + [[CDVUIInAppBrowser getInstance] injectStyleFile:command]; + } + #endif } - (void)loadAfterBeforeload:(CDVInvokedUrlCommand*)command { - if(self.usewkwebview){ - [[CDVWKInAppBrowser getInstance] loadAfterBeforeload:command]; - }else{ - [[CDVUIInAppBrowser getInstance] loadAfterBeforeload:command]; - } + #if WK_WEB_VIEW_ONLY + [[CDVWKInAppBrowser getInstance] loadAfterBeforeload:command]; + #else + if(self.usewkwebview){ + [[CDVWKInAppBrowser getInstance] loadAfterBeforeload:command]; + }else{ + [[CDVUIInAppBrowser getInstance] loadAfterBeforeload:command]; + } + #endif } -@end +@end \ No newline at end of file diff --git a/src/ios/CDVUIInAppBrowser.h b/src/ios/CDVUIInAppBrowser.h index 0a58d2b4f..d533b8316 100644 --- a/src/ios/CDVUIInAppBrowser.h +++ b/src/ios/CDVUIInAppBrowser.h @@ -17,6 +17,8 @@ under the License. */ +#if !WK_WEB_VIEW_ONLY + #import #import #import @@ -89,3 +91,5 @@ - (id)initWithUserAgent:(NSString*)userAgent prevUserAgent:(NSString*)prevUserAgent browserOptions: (CDVInAppBrowserOptions*) browserOptions; @end + +#endif \ No newline at end of file diff --git a/src/ios/CDVUIInAppBrowser.m b/src/ios/CDVUIInAppBrowser.m index 68070c717..36c3b3e8a 100644 --- a/src/ios/CDVUIInAppBrowser.m +++ b/src/ios/CDVUIInAppBrowser.m @@ -17,6 +17,8 @@ Licensed to the Apache Software Foundation (ASF) under one under the License. */ +#if !WK_WEB_VIEW_ONLY + #import "CDVUIInAppBrowser.h" #import #import @@ -1126,4 +1128,4 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface @end - +#endif \ No newline at end of file