- iOS: clear the image after the drawer effect

- Android: Android < 4.4 was below par
Telerik-Verified-Plugins · Sep 27, 2014 · 54bc8d8 · 54bc8d8
1 parent 67ffe89
commit 54bc8d8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="com.telerik.plugins.nativepagetransitions"
-    version="0.1.0">
+    version="0.1.1">
 
 	<name>Native Page Transitions</name>
 

diff --git a/src/android/NativePageTransitions.java b/src/android/NativePageTransitions.java
@@ -31,7 +31,8 @@ public class NativePageTransitions extends CordovaPlugin {
   // this plugin listens to page changes, so only kick in a transition when it was actually requested by the JS bridge
   private boolean calledFromJS;
   private FrameLayout layout;
-  private final boolean requiresRedraw = Build.VERSION.SDK_INT < 19; // Build.VERSION_CODES.KITKAT
+  private static final boolean BEFORE_KITKAT = Build.VERSION.SDK_INT < 19;
+  private final boolean requiresRedraw = BEFORE_KITKAT;
 
   class MyCordovaWebViewClient extends CordovaWebViewClient {
     public MyCordovaWebViewClient(CordovaInterface cordova, CordovaWebView view) {
@@ -341,6 +342,13 @@ public void onAnimationRepeat(Animation animation) {
             webView.setAnimation(webViewAnimation);
             layout.startLayoutAnimation();
 
+            if (BEFORE_KITKAT) {
+              // This fixes an issue observed on a Samsung Galaxy S3 /w Android 4.3 where the img is shown,
+              // but the transition doesn't kick in unless the screen is touched again.
+              imageView.requestFocusFromTouch();
+              webView.requestFocus();
+            }
+
             calledFromJS = false;
           }
         });
@@ -360,9 +368,12 @@ private void enableHardwareAcceleration() {
       cordova.getActivity().getWindow().setFlags(
           WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
           WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
-      webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
       imageView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+      if (BEFORE_KITKAT) {
+        webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+      } else {
+        webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+      }
     }
   }
-
 }
diff --git a/src/ios/NativePageTransitions.m b/src/ios/NativePageTransitions.m
@@ -188,7 +188,8 @@ - (void) drawer:(CDVInvokedUrlCommand*)command {
                      }
                      completion:^(BOOL finished) {
                        if ([action isEqualToString:@"close"]) {
-                         [_screenShotImageView removeFromSuperview];
+                         _screenShotImageView = nil;
+                         // [_screenShotImageView removeFromSuperview];
                        }
                        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
                        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];