Removed useless swipe detection from details view

diff --git a/src/com/owncloud/android/ui/OnSwipeTouchListener.java b/src/com/owncloud/android/ui/OnSwipeTouchListener.java
deleted file mode 100644 (file)
index 0d8874d..0000000
--- a/src/com/owncloud/android/ui/OnSwipeTouchListener.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.owncloud.android.ui;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.widget.Toast;
-
-public class OnSwipeTouchListener implements OnTouchListener {
-
-    private final Context mContext;
-    private final GestureDetector mGestureDetector;
-    
-    public OnSwipeTouchListener(Context context) {
-        mContext = context;
-        mGestureDetector = new GestureDetector(context, new GestureListener());
-    }
-
-    public boolean onTouch(final View v, final MotionEvent event) {
-        //super.onTouch(v, event);
-        Log.d("SWIPE", "Swipe listener touched");
-        return mGestureDetector.onTouchEvent(event);
-    }
-
-    private final class GestureListener extends SimpleOnGestureListener {
-
-        private static final int SWIPE_THRESHOLD = 100;
-        private static final int SWIPE_VELOCITY_THRESHOLD = 100;
-
-        @Override
-        public boolean onDown(MotionEvent e) {
-            return true;
-        }
-
-        @Override
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            boolean result = false;
-            try {
-                float diffY = e2.getY() - e1.getY();
-                float diffX = e2.getX() - e1.getX();
-                if (Math.abs(diffX) > Math.abs(diffY)) {
-                    if (Math.abs(diffX) > SWIPE_THRESHOLD && Math.abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
-                        if (diffX > 0) {
-                            onSwipeRight();
-                        } else {
-                            onSwipeLeft();
-                        }
-                    }
-                } else {
-                    if (Math.abs(diffY) > SWIPE_THRESHOLD && Math.abs(velocityY) > SWIPE_VELOCITY_THRESHOLD) {
-                        if (diffY > 0) {
-                            onSwipeBottom();
-                        } else {
-                            onSwipeTop();
-                        }
-                    }
-                }
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-            return result;
-        }
-    }
-
-    public void onSwipeTop() {
-        Toast.makeText(mContext, "top", Toast.LENGTH_SHORT).show();
-    }
-    public void onSwipeRight() {
-        Toast.makeText(mContext, "right", Toast.LENGTH_SHORT).show();
-    }
-    public void onSwipeLeft() {
-        Toast.makeText(mContext, "left", Toast.LENGTH_SHORT).show();
-    }
-    public void onSwipeBottom() {
-        Toast.makeText(mContext, "bottom", Toast.LENGTH_SHORT).show();
-    }
-    
-}    
-

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index da21531..2735e5e 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -29,7 +29,6 @@ import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
 import org.apache.http.HttpStatus;\r
 import org.apache.http.NameValuePair;\r
 import org.apache.http.client.utils.URLEncodedUtils;\r
 import org.apache.http.HttpStatus;\r
 import org.apache.http.NameValuePair;\r
 import org.apache.http.client.utils.URLEncodedUtils;\r

-import org.apache.http.entity.FileEntity;\r

 import org.apache.http.message.BasicNameValuePair;\r
 import org.apache.http.protocol.HTTP;\r
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r
 import org.apache.http.message.BasicNameValuePair;\r
 import org.apache.http.protocol.HTTP;\r
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r


@@ -37,7 +36,6 @@ import org.json.JSONObject;
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r

-import android.annotation.SuppressLint;\r

 import android.app.Activity;\r
 import android.content.ActivityNotFoundException;\r
 import android.content.BroadcastReceiver;\r
 import android.app.Activity;\r
 import android.content.ActivityNotFoundException;\r
 import android.content.BroadcastReceiver;\r


@@ -46,27 +44,17 @@ import android.content.Context;
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.ServiceConnection;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.ServiceConnection;\r

-import android.graphics.Bitmap;\r
-import android.graphics.BitmapFactory;\r
-import android.graphics.BitmapFactory.Options;\r
-import android.graphics.Point;\r

 import android.net.Uri;\r
 import android.net.Uri;\r

-import android.os.AsyncTask;\r

 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.os.IBinder;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.os.IBinder;\r

-import android.support.v4.app.DialogFragment;\r

 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r

-import android.view.Display;\r

 import android.view.LayoutInflater;\r
 import android.view.LayoutInflater;\r

-import android.view.MotionEvent;\r

 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r

-import android.view.View.OnTouchListener;\r

 import android.view.ViewGroup;\r
 import android.webkit.MimeTypeMap;\r
 import android.view.ViewGroup;\r
 import android.webkit.MimeTypeMap;\r

-import android.webkit.WebView.FindListener;\r

 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.ImageView;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.ImageView;\r


@@ -74,7 +62,6 @@ import android.widget.MediaController;
 import android.widget.ProgressBar;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.ProgressBar;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r

-import android.widget.VideoView;\r

 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 import com.owncloud.android.AccountUtils;\r
 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 import com.owncloud.android.AccountUtils;\r


@@ -100,8 +87,6 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r

-import com.owncloud.android.ui.OnSwipeTouchListener;\r
-import com.owncloud.android.ui.activity.TransferServiceGetter;\r

 import com.owncloud.android.ui.activity.PreviewVideoActivity;\r
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r
 import com.owncloud.android.ui.activity.PreviewVideoActivity;\r
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r


@@ -246,7 +231,6 @@ public class FileDetailFragment extends SherlockFragment implements
         super.onActivityCreated(savedInstanceState);\r
         if (mAccount != null) {\r
             mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());;\r
         super.onActivityCreated(savedInstanceState);\r
         if (mAccount != null) {\r
             mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());;\r

-            mView.setOnTouchListener(new OnSwipeTouchListener(getActivity()));            \r

         }\r
     }\r
         \r
         }\r
     }\r
         \r