Merge branch 'develop2' into imageGrid2

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / OCFileListFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 9c85dd9..114b048 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -135,11 +135,11 @@ public class OCFileListFragment extends ExtendedListFragment {
                 mContainerActivity
                 );
         setListAdapter(mAdapter);
-
-        registerForContextMenu(getListView());
-        getListView().setOnCreateContextMenuListener(this);
-    }
-
+        
+        registerForContextMenu(getGridView());
+        getGridView().setOnCreateContextMenuListener(this);
+  }
+    
     /**
      * Saves the current listed folder.
      */
@@ -389,7 +389,7 @@ public class OCFileListFragment extends ExtendedListFragment {
 
             mAdapter.swapDirectory(directory, storageManager);
             if (mFile == null || !mFile.equals(directory)) {
-                mList.setSelectionFromTop(0, 0);
+                imageView.setSelection(0);
             }
             mFile = directory;
             
@@ -398,6 +398,31 @@ public class OCFileListFragment extends ExtendedListFragment {
             Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));
             footerText.setText(generateFooterText(directory));
             Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));
+            
+         // decide image vs. file view
+            double countImages = 0;
+            double countFiles = 0;
+            
+            Vector<OCFile> files = storageManager.getFolderContent(directory);
+            for (OCFile file : files){
+                if (!file.isFolder()){
+                    countFiles++;
+                    
+                    if (file.isImage()){
+                        countImages++;
+                    }
+                }
+            }
+            
+            // > 50% Images --> image view
+            // TODO threshold as constant in Preferences
+            if ((countImages / countFiles) >= 0.5){
+                Log_OC.i(TAG, "Image View");
+                switchImageView();
+            } else {
+                Log_OC.i(TAG, "Folder View");
+                switchFileView();
+            }
         }
     }