back button functionality

Author: tanvidadu

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -34,11 +34,13 @@
 import android.support.v4.graphics.BitmapCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -146,8 +148,13 @@ public class ShareActivity
     private FloatingActionButton zoomInButton;
     private FloatingActionButton zoomOutButton;
     private FloatingActionButton mainFab;
+    private PhotoView expandedImageView;
     private boolean isFABOpen = false;
-
+    private Rect startBounds = new Rect();
+    private Rect finalBounds = new Rect();
+    private Point globalOffset = new Point();
+    private float startScale;
+    private boolean isZoom = false;
 
     /**
      * Called when user taps the submit button.
@@ -783,6 +790,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+
+
     /*
      * Get SHA1 of file from input stream
      */
@@ -831,6 +840,7 @@ private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
         if (CurrentAnimator != null) {
             CurrentAnimator.cancel();
         }
+        isZoom = true;
         ViewUtil.hideKeyboard(ShareActivity.this.findViewById(R.id.titleEdit | R.id.descEdit));
         closeFABMenu();
         mainFab.setVisibility(View.GONE);
@@ -865,17 +875,17 @@ private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
             scaled = bitmap;
         }
         // Load the high-resolution "zoomed-in" image.
-        PhotoView expandedImageView = (PhotoView) findViewById(
+         expandedImageView = (PhotoView) findViewById(
                 R.id.expanded_image);
         expandedImageView.setImageBitmap(scaled);
 
 
 
         // Calculate the starting and ending bounds for the zoomed-in image.
-        // This step involves lots of math. Yay, math.
-        final Rect startBounds = new Rect();
-        final Rect finalBounds = new Rect();
-        final Point globalOffset = new Point();
+        // This step involves lots of math.
+         startBounds = new Rect();
+         finalBounds = new Rect();
+         globalOffset = new Point();
 
         // The start bounds are the global visible rectangle of the thumbnail,
         // and the final bounds are the global visible rectangle of the container
@@ -892,7 +902,7 @@ private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
         // bounds using the "center crop" technique. This prevents undesirable
         // stretching during the animation. Also calculate the start scaling
         // factor (the end scaling factor is always 1.0).
-       float startScale;
+
         if ((float) finalBounds.width() / finalBounds.height()
                 > (float) startBounds.width() / startBounds.height()) {
         // Extend start bounds horizontally
@@ -962,46 +972,66 @@ public void onClick(View view) {
                 if (CurrentAnimator != null) {
                     CurrentAnimator.cancel();
                 }
-                zoomOutButton.setVisibility(View.GONE);
-                mainFab.setVisibility(View.VISIBLE);
-
-                // Animate the four positioning/sizing properties in parallel,
-                // back to their original values.
-                AnimatorSet set = new AnimatorSet();
-                set.play(ObjectAnimator
-                        .ofFloat(expandedImageView, View.X, startBounds.left))
-                        .with(ObjectAnimator
-                                .ofFloat(expandedImageView,
-                                        View.Y,startBounds.top))
-                        .with(ObjectAnimator
-                                .ofFloat(expandedImageView,
-                                        View.SCALE_X, startScaleFinal))
-                        .with(ObjectAnimator
-                                .ofFloat(expandedImageView,
-                                        View.SCALE_Y, startScaleFinal));
-                set.setDuration(ShortAnimationDuration);
-                set.setInterpolator(new DecelerateInterpolator());
-                set.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        thumbView.setAlpha(1f);
-                        expandedImageView.setVisibility(View.GONE);
-                        CurrentAnimator = null;
-                    }
+               zoomOut(thumbView,startScaleFinal,startBounds);
 
-                   @Override
-                    public void onAnimationCancel(Animator animation) {
-                       thumbView.setAlpha(1f);
-                       expandedImageView.setVisibility(View.GONE);
-                        CurrentAnimator = null;
-                    }
-                });
-                set.start();
-                CurrentAnimator = set;
+            }
+
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                if(isZoom) {
+                    zoomOut(backgroundImageView, startScale, startBounds);
+                    return true;
+                }
+        }
+         return super.onKeyDown(keyCode,event);
+
+    }
 
+    void zoomOut(View thumbView, float startScaleFinal,Rect startBounds){
+        zoomOutButton.setVisibility(View.GONE);
+        mainFab.setVisibility(View.VISIBLE);
+        isZoom = false;
+
+        // Animate the four positioning/sizing properties in parallel,
+        // back to their original values.
+        AnimatorSet set = new AnimatorSet();
+        set.play(ObjectAnimator
+                .ofFloat(expandedImageView, View.X, startBounds.left))
+                .with(ObjectAnimator
+                        .ofFloat(expandedImageView,
+                                View.Y,startBounds.top))
+                .with(ObjectAnimator
+                        .ofFloat(expandedImageView,
+                                View.SCALE_X, startScaleFinal))
+                .with(ObjectAnimator
+                        .ofFloat(expandedImageView,
+                                View.SCALE_Y, startScaleFinal));
+        set.setDuration(ShortAnimationDuration);
+        set.setInterpolator(new DecelerateInterpolator());
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                thumbView.setAlpha(1f);
+                expandedImageView.setVisibility(View.GONE);
+                CurrentAnimator = null;
             }
 
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                thumbView.setAlpha(1f);
+                expandedImageView.setVisibility(View.GONE);
+                CurrentAnimator = null;
+            }
         });
+        set.start();
+        CurrentAnimator = set;
     }
 
+
+
 }