Change element ImageView of preview image fragment for TouchImageView in order to...

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index cddd1ff..eb0ec4d 100644 (file)
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -43,10 +43,10 @@
         android:layout_centerInParent="true"
         />
     
         android:layout_centerInParent="true"
         />
     

-    <ImageView
+    <com.ortiz.touch.TouchImageView

         android:id="@+id/image"
         android:id="@+id/image"

-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"

         android:layout_margin="0dp"
         android:layout_centerInParent="true"
         android:contentDescription="@string/preview_image_description"
         android:layout_margin="0dp"
         android:layout_centerInParent="true"
         android:contentDescription="@string/preview_image_description"

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 5e211e5..291556b 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -18,7 +18,6 @@ package com.owncloud.android.ui.preview;
 
 import java.lang.ref.WeakReference;
 
 
 import java.lang.ref.WeakReference;
 

-

 import android.accounts.Account;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.accounts.Account;
 import android.annotation.SuppressLint;
 import android.app.Activity;


@@ -41,6 +40,7 @@ import android.widget.TextView;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;

+import com.ortiz.touch.TouchImageView;

 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;


@@ -65,7 +65,7 @@ public class PreviewImageFragment extends FileFragment {
 
     private View mView;
     private Account mAccount;
 
     private View mView;
     private Account mAccount;

-    private ImageView mImageView;
+    private TouchImageView mImageView;

     private TextView mMessageView;
     private ProgressBar mProgressWheel;
 
     private TextView mMessageView;
     private ProgressBar mProgressWheel;
 


@@ -124,7 +124,7 @@ public class PreviewImageFragment extends FileFragment {
             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);

-        mImageView = (ImageView)mView.findViewById(R.id.image);
+        mImageView = (TouchImageView) mView.findViewById(R.id.image);

         mImageView.setVisibility(View.GONE);
         mView.setOnTouchListener((OnTouchListener)getActivity());
         mMessageView = (TextView)mView.findViewById(R.id.message);
         mImageView.setVisibility(View.GONE);
         mView.setOnTouchListener((OnTouchListener)getActivity());
         mMessageView = (TextView)mView.findViewById(R.id.message);