add sort to UploadFileActiviy

diff --git a/res/menu/uploader_menu.xml b/res/menu/uploader_menu.xml
new file mode 100644 (file)
index 0000000..a721c7b
--- /dev/null
+++ b/res/menu/uploader_menu.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2015 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_sort"
+        android:icon="@android:drawable/ic_menu_sort_by_size"
+        android:orderInCategory="2"
+        app:showAsAction="always"
+        android:title="@string/actionbar_sort"
+        android:contentDescription="@string/actionbar_sort"/>
+</menu>
\ No newline at end of file

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 7a7f8e5..fa5c9cd 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -23,12 +23,18 @@ package com.owncloud.android.ui.activity;
 import java.io.File;
 
 import android.accounts.Account;
 import java.io.File;
 
 import android.accounts.Account;

+import android.app.AlertDialog;
+import android.content.DialogInterface;

 import android.content.Intent;
 import android.content.Intent;

+import android.content.SharedPreferences;

 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;

+import android.preference.PreferenceManager;

 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.ActionBar;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.ActionBar;

+import android.view.Menu;
+import android.view.MenuInflater;

 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;


@@ -134,6 +140,13 @@ public class UploadFilesActivity extends FileActivity implements
         Log_OC.d(TAG, "onCreate() end");
     }
 
         Log_OC.d(TAG, "onCreate() end");
     }
 

+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.uploader_menu, menu);
+        return true;
+    }
+

 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {


@@ -145,6 +158,34 @@ public class UploadFilesActivity extends FileActivity implements
                 }
                 break;
             }
                 }
                 break;
             }

+            case R.id.action_sort: {
+                SharedPreferences appPreferences = PreferenceManager
+                        .getDefaultSharedPreferences(this);
+
+                // Read sorting order, default to sort by name ascending
+                Integer sortOrder = appPreferences
+                        .getInt("sortOrder", FileStorageUtils.SORT_NAME);
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.actionbar_sort_title)
+                        .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder ,
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        switch (which){
+                                            case 0:
+                                                mFileListFragment.sortByName(true);
+                                                break;
+                                            case 1:
+                                                mFileListFragment.sortByDate(false);
+                                                break;
+                                        }
+
+                                        dialog.dismiss();
+                                    }
+                                });
+                builder.create().show();
+                break;
+            }

             default:
                 retval = super.onOptionsItemSelected(item);
         }
             default:
                 retval = super.onOptionsItemSelected(item);
         }

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index c6ea034..b48f9d4 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -427,7 +427,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             mFiles = null;\r
         }\r
 \r
             mFiles = null;\r
         }\r
 \r

-        mFiles = FileStorageUtils.sortFolder(mFiles);\r
+        mFiles = FileStorageUtils.sortOcFolder(mFiles);\r

         notifyDataSetChanged();\r
     }\r
     \r
         notifyDataSetChanged();\r
     }\r
     \r


@@ -474,7 +474,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         FileStorageUtils.mSortAscending = ascending;\r
         \r
 \r
         FileStorageUtils.mSortAscending = ascending;\r
         \r
 \r

-        mFiles = FileStorageUtils.sortFolder(mFiles);\r
+        mFiles = FileStorageUtils.sortOcFolder(mFiles);\r

         notifyDataSetChanged();\r
 \r
     }\r
         notifyDataSetChanged();\r
 \r
     }\r

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 287c5b9..a5f11ce 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -25,7 +25,9 @@ import java.util.Arrays;
 import java.util.Comparator;
 
 import android.content.Context;
 import java.util.Comparator;
 
 import android.content.Context;

+import android.content.SharedPreferences;

 import android.graphics.Bitmap;
 import android.graphics.Bitmap;

+import android.preference.PreferenceManager;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;


@@ -39,6 +41,7 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;

+import com.owncloud.android.utils.FileStorageUtils;

 
 /**
  * This Adapter populates a ListView with all files and directories contained
 
 /**
  * This Adapter populates a ListView with all files and directories contained


@@ -49,9 +52,18 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
     private Context mContext;
     private File mDirectory;
     private File[] mFiles = null;
     private Context mContext;
     private File mDirectory;
     private File[] mFiles = null;

+    private SharedPreferences mAppPreferences;

     
     public LocalFileListAdapter(File directory, Context context) {
         mContext = context;
     
     public LocalFileListAdapter(File directory, Context context) {
         mContext = context;

+
+        mAppPreferences = PreferenceManager
+                .getDefaultSharedPreferences(mContext);
+
+        // Read sorting order, default to sort by name ascending
+        FileStorageUtils.mSortOrder = mAppPreferences.getInt("sortOrder", 0);
+        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+

         swapDirectory(directory);
     }
 
         swapDirectory(directory);
     }
 


@@ -218,7 +230,23 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
                 }
             
             });
                 }
             
             });

+
+            mFiles = FileStorageUtils.sortLocalFolder(mFiles);

         }
         notifyDataSetChanged();
     }
         }
         notifyDataSetChanged();
     }

+
+    public void setSortOrder(Integer order, boolean ascending) {
+        SharedPreferences.Editor editor = mAppPreferences.edit();
+        editor.putInt("sortOrder", order);
+        editor.putBoolean("sortAscending", ascending);
+        editor.commit();
+
+        FileStorageUtils.mSortOrder = order;
+        FileStorageUtils.mSortAscending = ascending;
+
+        mFiles = FileStorageUtils.sortLocalFolder(mFiles);
+        notifyDataSetChanged();
+
+    }

 }
 }

diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 8a268b7..5d9a7fb 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -37,6 +37,7 @@ import android.widget.ListView;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;

+import com.owncloud.android.utils.FileStorageUtils;

 
 
 /**
 
 
 /**


@@ -228,7 +229,19 @@ public class LocalFileListFragment extends ExtendedListFragment {
         return result.toArray(new String[result.size()]);
     }
 
         return result.toArray(new String[result.size()]);
     }
 

-    
+    public void sortByName(boolean descending) {
+        mAdapter.setSortOrder(FileStorageUtils.SORT_NAME, descending);
+    }
+
+    public void sortByDate(boolean descending) {
+        mAdapter.setSortOrder(FileStorageUtils.SORT_DATE, descending);
+    }
+
+    public void sortBySize(boolean descending) {
+        mAdapter.setSortOrder(FileStorageUtils.SORT_SIZE, descending);
+    }
+
+

     /**
      * Interface to implement by any Activity that includes some instance of LocalFileListFragment
      */
     /**
      * Interface to implement by any Activity that includes some instance of LocalFileListFragment
      */

diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index dda7dda..caff31c 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -80,7 +80,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
         // TODO Enable when "On Device" is recovered ?
         mImageFiles = mStorageManager.getFolderImages(parentFolder/*, false*/);
         
         // TODO Enable when "On Device" is recovered ?
         mImageFiles = mStorageManager.getFolderImages(parentFolder/*, false*/);
         

-        mImageFiles = FileStorageUtils.sortFolder(mImageFiles);
+        mImageFiles = FileStorageUtils.sortOcFolder(mImageFiles);

         
         mObsoleteFragments = new HashSet<Object>();
         mObsoletePositions = new HashSet<Integer>();
         
         mObsoleteFragments = new HashSet<Object>();
         mObsoletePositions = new HashSet<Integer>();

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index e70302f..3f854b8 100644 (file)
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -21,8 +21,11 @@
 package com.owncloud.android.utils;
 
 import java.io.File;
 package com.owncloud.android.utils;
 
 import java.io.File;

+import java.util.ArrayList;
+import java.util.Arrays;

 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Collections;
 import java.util.Comparator;

+import java.util.List;

 import java.util.Vector;
 
 import third_parties.daveKoeller.AlphanumComparator;
 import java.util.Vector;
 
 import third_parties.daveKoeller.AlphanumComparator;


@@ -155,13 +158,13 @@ public class FileStorageUtils {
     /**
      * Sorts all filenames, regarding last user decision 
      */
     /**
      * Sorts all filenames, regarding last user decision 
      */

-    public static Vector<OCFile> sortFolder(Vector<OCFile> files){
+    public static Vector<OCFile> sortOcFolder(Vector<OCFile> files){

         switch (mSortOrder){
         case 0:
         switch (mSortOrder){
         case 0:

-            files = FileStorageUtils.sortByName(files);
+            files = FileStorageUtils.sortOCFilesByName(files);

             break;
         case 1:
             break;
         case 1:

-            files = FileStorageUtils.sortByDate(files);
+            files = FileStorageUtils.sortOCFilesByDate(files);

             break;
         case 2: 
            // mFiles = FileStorageUtils.sortBySize(mSortAscending);
             break;
         case 2: 
            // mFiles = FileStorageUtils.sortBySize(mSortAscending);


@@ -170,12 +173,31 @@ public class FileStorageUtils {
        
         return files;
     }
        
         return files;
     }

+
+    /**
+     * Sorts all filenames, regarding last user decision
+     */
+    public static File[] sortLocalFolder(File[] files){
+        switch (mSortOrder){
+            case 0:
+                files = FileStorageUtils.sortLocalFilesByName(files);
+                break;
+            case 1:
+                files = FileStorageUtils.sortLocalFilesByDate(files);
+                break;
+            case 2:
+                // mFiles = FileStorageUtils.sortBySize(mSortAscending);
+                break;
+        }
+
+        return files;
+    }

     
     /**
      * Sorts list by Date
      * @param files
      */
     
     /**
      * Sorts list by Date
      * @param files
      */

-    public static Vector<OCFile> sortByDate(Vector<OCFile> files){
+    public static Vector<OCFile> sortOCFilesByDate(Vector<OCFile> files){

         final Integer val;
         if (mSortAscending){
             val = 1;
         final Integer val;
         if (mSortAscending){
             val = 1;


@@ -205,6 +227,43 @@ public class FileStorageUtils {
         return files;
     }
 
         return files;
     }
 

+    /**
+     * Sorts list by Date
+     * @param filesArray
+     */
+    public static File[] sortLocalFilesByDate(File[] filesArray){
+        final Integer val;
+        if (mSortAscending){
+            val = 1;
+        } else {
+            val = -1;
+        }
+
+        List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
+
+        Collections.sort(files, new Comparator<File>() {
+            public int compare(File o1, File o2) {
+                if (o1.isDirectory() && o2.isDirectory()) {
+                    Long obj1 = o1.lastModified();
+                    return val * obj1.compareTo(o2.lastModified());
+                }
+                else if (o1.isDirectory()) {
+                    return -1;
+                } else if (o2.isDirectory()) {
+                    return 1;
+                } else if (o1.lastModified() == 0 || o2.lastModified() == 0){
+                    return 0;
+                } else {
+                    Long obj1 = o1.lastModified();
+                    return val * obj1.compareTo(o2.lastModified());
+                }
+            }
+        });
+
+        File[] returnArray = new File[1];
+        return files.toArray(returnArray);
+    }
+

 //    /**
 //     * Sorts list by Size
 //     * @param sortAscending true: ascending, false: descending
 //    /**
 //     * Sorts list by Size
 //     * @param sortAscending true: ascending, false: descending


@@ -243,7 +302,7 @@ public class FileStorageUtils {
      * Sorts list by Name
      * @param files     files to sort
      */
      * Sorts list by Name
      * @param files     files to sort
      */

-    public static Vector<OCFile> sortByName(Vector<OCFile> files){
+    public static Vector<OCFile> sortOCFilesByName(Vector<OCFile> files){

         final Integer val;
         if (mSortAscending){
             val = 1;
         final Integer val;
         if (mSortAscending){
             val = 1;


@@ -266,6 +325,38 @@ public class FileStorageUtils {
         
         return files;
     }
         
         return files;
     }

+
+    /**
+     * Sorts list by Name
+     * @param filesArray    files to sort
+     */
+    public static File[] sortLocalFilesByName(File[] filesArray){
+        final Integer val;
+        if (mSortAscending){
+            val = 1;
+        } else {
+            val = -1;
+        }
+
+        List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
+
+        Collections.sort(files, new Comparator<File>() {
+            public int compare(File o1, File o2) {
+                if (o1.isDirectory() && o2.isDirectory()) {
+                    return val * o1.getPath().toLowerCase().compareTo(o2.getPath().toLowerCase());
+                } else if (o1.isDirectory()) {
+                    return -1;
+                } else if (o2.isDirectory()) {
+                    return 1;
+                }
+                return val * new AlphanumComparator().compare(o1.getPath().toLowerCase(),
+                                                              o2.getPath().toLowerCase());
+            }
+        });
+
+        File[] returnArray = new File[1];
+        return files.toArray(returnArray);
+    }

     
     /**
      * Local Folder size
     
     /**
      * Local Folder size

diff --git a/src/third_parties/daveKoeller/AlphanumComparator.java b/src/third_parties/daveKoeller/AlphanumComparator.java
index e6bd6f3..d087957 100644 (file)
--- a/src/third_parties/daveKoeller/AlphanumComparator.java
+++ b/src/third_parties/daveKoeller/AlphanumComparator.java
@@ -23,6 +23,7 @@
  */\r
 \r
 package third_parties.daveKoeller;\r
  */\r
 \r
 package third_parties.daveKoeller;\r

+import java.io.File;\r

 import java.util.Comparator;\r
 \r
 import com.owncloud.android.datamodel.OCFile;\r
 import java.util.Comparator;\r
 \r
 import com.owncloud.android.datamodel.OCFile;\r


@@ -78,11 +79,21 @@ public class AlphanumComparator implements Comparator<OCFile>
         return chunk.toString();\r
     }\r
 \r
         return chunk.toString();\r
     }\r
 \r

-    public int compare(OCFile o1, OCFile o2)\r
-    {\r
-        String s1 = (String)o1.getRemotePath().toLowerCase();\r
-        String s2 = (String)o2.getRemotePath().toLowerCase();\r
+    public int compare(OCFile o1, OCFile o2){\r
+        String s1 = o1.getRemotePath().toLowerCase();\r
+        String s2 = o2.getRemotePath().toLowerCase();\r
+\r
+        return compare(s1, s2);\r
+    }\r
+\r
+    public int compare(File f1, File f2){\r
+        String s1 = f1.getPath().toLowerCase();\r
+        String s2 = f2.getPath().toLowerCase();\r
+\r
+        return compare(s1, s2);\r
+    }\r

 \r
 \r

+    public int compare(String s1, String s2) {\r

         int thisMarker = 0;\r
         int thatMarker = 0;\r
         int s1Length = s1.length();\r
         int thisMarker = 0;\r
         int thatMarker = 0;\r
         int s1Length = s1.length();\r