diff --git a/CHANGELOG.md b/CHANGELOG.md index ee2e16d..063c1c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Cordova Plugin Release Notes +## Cordova Plugin 5.3.1-3.3.1 +Release Date: 24.11.2016 + +#### New +- Includes Wikitude SDK 5.3.1: detailed changelog for Android and iOS + +#### Fixed +- Fixes an issue for Android where the keyboard was not showing up again after entering and returning from an ARView + + ## Cordova Plugin 5.3.0-3.3.1 Release Date: 13.09.2016 diff --git a/plugin.xml b/plugin.xml index 2ec9869..832b8c0 100755 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="5.3.1"> Augmented Reality - Wikitude SDK Plugin diff --git a/src/android/WikitudePlugin.java b/src/android/WikitudePlugin.java index 9a853a1..ddc3cf1 100644 --- a/src/android/WikitudePlugin.java +++ b/src/android/WikitudePlugin.java @@ -11,6 +11,7 @@ import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaWebView; import org.apache.cordova.PluginResult; +import org.apache.cordova.engine.SystemWebView; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -622,6 +623,8 @@ private boolean removeArchitectView() { this.architectView = null; WikitudePlugin.handleResumeInCordovaWebView(cordova.getActivity().getWindow().getDecorView().findViewById(android.R.id.content)); + WikitudePlugin.releaseFocusInCordovaWebView(cordova.getActivity().getWindow().getDecorView().findViewById(android.R.id.content)); + return true; } return false; @@ -812,8 +815,8 @@ public void onLocationChanged( final Location location ) { private static void releaseFocusInCordovaWebView(View rootView) { - if (rootView instanceof CordovaWebView) { - ((CordovaWebView)rootView).getView().clearFocus(); + if (rootView instanceof SystemWebView) { + ((SystemWebView) rootView).getCordovaWebView().getView().clearFocus(); } else if (rootView instanceof ViewGroup) { final int childCount = ((ViewGroup)rootView).getChildCount(); for (int i=0; i< childCount; i++) { @@ -827,8 +830,8 @@ private static void releaseFocusInCordovaWebView(View rootView) { * @param rootView the root view to search recursively for a CordovaWebView */ private static void handleResumeInCordovaWebView(final View rootView) { - if (rootView instanceof CordovaWebView) { - ((CordovaWebView)rootView).handleResume(true); + if (rootView instanceof SystemWebView) { + ((SystemWebView) rootView).getCordovaWebView().handleResume(true); } else if (rootView instanceof ViewGroup) { final int childCount = ((ViewGroup)rootView).getChildCount(); diff --git a/src/android/libs/wikitudesdk.aar b/src/android/libs/wikitudesdk.aar index d42fcb5..3d12a77 100644 Binary files a/src/android/libs/wikitudesdk.aar and b/src/android/libs/wikitudesdk.aar differ diff --git a/src/ios/WTARViewController.m b/src/ios/WTARViewController.m index e966da8..4997c56 100644 --- a/src/ios/WTARViewController.m +++ b/src/ios/WTARViewController.m @@ -64,6 +64,11 @@ - (void)dealloc #pragma mark - UIViewController Overriding +- (BOOL)prefersStatusBarHidden +{ + return YES; +} + - (void)viewDidLoad { [super viewDidLoad]; @@ -90,11 +95,28 @@ - (void)viewDidLoad [self.view addGestureRecognizer:swipeBackRecognizer]; } -- (BOOL)prefersStatusBarHidden +- (void)viewWillAppear:(BOOL)animated { - return YES; + [super viewWillAppear:animated]; + + if ( self.presentingViewController && ![self.architectView isRunning] ) { + [self.architectView start:^(WTStartupConfiguration *configuration) { + configuration = self.startupConfiguration; + } completion:nil]; + } + if ( self.currentArchitectWorldNavigation.wasInterrupted ) { + [self.architectView reloadArchitectWorld]; + } } +- (void)viewDidDisappear:(BOOL)animated +{ + [super viewDidDisappear:animated]; + + if ( self.presentingViewController && [self.architectView isRunning] ) { + [self.architectView stop]; + } +} #pragma mark - Public Methods diff --git a/src/ios/libWikitudeSDK-simulator.a b/src/ios/libWikitudeSDK-simulator.a index 311b800..5f1027c 100644 Binary files a/src/ios/libWikitudeSDK-simulator.a and b/src/ios/libWikitudeSDK-simulator.a differ diff --git a/src/ios/libWikitudeSDK.a b/src/ios/libWikitudeSDK.a index 09bfae4..a9e1d06 100644 Binary files a/src/ios/libWikitudeSDK.a and b/src/ios/libWikitudeSDK.a differ