Gallery in full screen, action bar shown on tap

diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml
index 378fc8f..d41eb0e 100644 (file)
--- a/res/layout/preview_image_fragment.xml
+++ b/res/layout/preview_image_fragment.xml
@@ -41,7 +41,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

-        android:layout_margin="16dp"
+        android:layout_margin="0dp"

         android:contentDescription="@string/image_preview"
         android:src="@drawable/owncloud_logo" />
     
         android:contentDescription="@string/image_preview"
         android:src="@drawable/owncloud_logo" />
     

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 62dc8cf..a55ae16 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -30,10 +30,14 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.os.IBinder;
 import android.support.v4.view.ViewPager;
 import android.util.Log;

+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;

 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;

+import com.actionbarsherlock.view.Window;

 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;


@@ -53,7 +57,7 @@ import com.owncloud.android.R;
  *  
  *  @author David A. Velasco
  */
  *  
  *  @author David A. Velasco
  */

-public class PreviewImageActivity extends SherlockFragmentActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener {
+public class PreviewImageActivity extends SherlockFragmentActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener, OnTouchListener {

     
     public static final int DIALOG_SHORT_WAIT = 0;
 
     
     public static final int DIALOG_SHORT_WAIT = 0;
 


@@ -77,6 +81,8 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi
     private boolean mRequestWaitingForBinder;
     
     private DownloadFinishReceiver mDownloadFinishReceiver;
     private boolean mRequestWaitingForBinder;
     
     private DownloadFinishReceiver mDownloadFinishReceiver;

+
+    private boolean mFullScreen;

     
 
     @Override
     
 
     @Override


@@ -94,12 +100,15 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi
         if (!mFile.isImage()) {
             throw new IllegalArgumentException("Non-image file passed as argument");
         }
         if (!mFile.isImage()) {
             throw new IllegalArgumentException("Non-image file passed as argument");
         }

-        
+        requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);

         setContentView(R.layout.preview_image_activity);
     
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(mFile.getFileName());
         setContentView(R.layout.preview_image_activity);
     
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(mFile.getFileName());

+        actionBar.hide();
+        
+        mFullScreen = true;

         
         mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
         mParentFolder = mStorageManager.getFileById(mFile.getParentId());
         
         mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
         mParentFolder = mStorageManager.getFileById(mFile.getParentId());


@@ -424,6 +433,36 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi
         }
 
     }
         }
 
     }

+
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        Log.e(TAG, "TOUCH!!! **********************");
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            Log.e(TAG, "TOUCH DOWN!!! **********************");
+            
+        } else if (event.getAction() == MotionEvent.ACTION_UP) {
+            Log.e(TAG, "TOUCH UP!!! **********************");
+            toggleFullScreen();
+            
+        } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+            Log.e(TAG, "TOUCH MOVE!!! **********************");
+        }
+        return true;
+    }
+
+    
+    private void toggleFullScreen() {
+        ActionBar actionBar = getSupportActionBar();
+        if (mFullScreen) {
+            actionBar.show();
+            
+        } else {
+            actionBar.hide();
+            
+        }
+        mFullScreen = !mFullScreen;
+    }

     
     
 }
     
     
 }

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 87b3520..b1a6f05 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -41,6 +41,7 @@ import android.util.Log;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;

+import android.view.View.OnTouchListener;

 import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
 import android.widget.ImageView;
 import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
 import android.widget.ImageView;


@@ -147,6 +148,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = (ImageView)mView.findViewById(R.id.image);
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = (ImageView)mView.findViewById(R.id.image);

+        mView.setOnTouchListener((OnTouchListener)getActivity());   // WATCH OUT

         return mView;
     }
     
         return mView;
     }