From f5c40a1cfa82ac2c68ec4517e436d773c7263233 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 19 Jan 2017 21:41:38 +0100
Subject: [PATCH] Fix an issue with pinch to zoom

---
 res/layout/preview_image_fragment.xml         |  6 +++--
 .../ui/preview/PreviewImageFragment.java      | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index 1f28690155..2f698f0f2b 100644
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -31,7 +31,8 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000">
+    android:background="#000000"
+    android:animateLayoutChanges="true">
 
     <ProgressBar
         android:id="@+id/progressWheel"
@@ -49,7 +50,8 @@
         android:layout_margin="@dimen/zero"
         android:layout_centerInParent="true"
         android:contentDescription="@string/preview_image_description"
-        android:src="@drawable/image_fail" />
+        android:src="@drawable/image_fail"
+        />
 
     <TextView
         android:id="@+id/message"
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 3bdfe1fecb..2f15299817 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -37,6 +37,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
@@ -75,6 +76,7 @@ public class PreviewImageFragment extends FileFragment {
     private TouchImageViewCustom mImageView;
     private TextView mMessageView;
     private ProgressBar mProgressWheel;
+    private RelativeLayout mRelativeLayout;
 
     public Bitmap mBitmap = null;
 
@@ -84,6 +86,8 @@ public class PreviewImageFragment extends FileFragment {
 
     private LoadBitmapTask mLoadBitmapTask = null;
 
+    private boolean weZoomedAlready;
+
 
     /**
      * Public factory method to create a new fragment that previews an image.
@@ -149,8 +153,30 @@ public class PreviewImageFragment extends FileFragment {
         super.onCreateView(inflater, container, savedInstanceState);
         View view = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = (TouchImageViewCustom) view.findViewById(R.id.image);
+        mRelativeLayout = (RelativeLayout) view.findViewById(R.id.top);
         mImageView.setVisibility(View.GONE);
 
+        mImageView.setOnTouchImageViewListener(new TouchImageViewCustom.OnTouchImageViewListener() {
+            @Override
+            public void onMove() {
+                if (!weZoomedAlready && mImageView.isZoomed()) {
+                    weZoomedAlready = true;
+                    RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+                            RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
+                    layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
+                    mImageView.setLayoutParams(layoutParams);
+                    mRelativeLayout.invalidate();
+                } else if (!mImageView.isZoomed()) {
+                    weZoomedAlready = false;
+                    RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+                            RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+                    layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
+                    mImageView.setLayoutParams(layoutParams);
+                    mRelativeLayout.invalidate();
+                }
+            }
+        });
+
         view.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {