mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:06:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Keep folders on top

Browse source
This commit is contained in:
tobiasKaminsky 2014-09-15 12:00:19 +02:00
parent c98f2b56c6
commit 0523ec4e88
1 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -34,6 +34,7 @@ import android.widget.TextView;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.AlphanumComparator;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
@ -258,22 +259,18 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
private void sortDirectory(){
switch (sort){
case NAME:
sortByName();
sortByName(sortAscending);
break;
case SIZE:
sortBySize();
sortBySize(sortAscending);
break;
case DATE:
sortByDate();
sortByDate(sortAscending);
break;
}
if (!sortAscending){
Collections.reverse(mFiles);
}
notifyDataSetChanged();
}
@ -308,11 +305,18 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
&& file.getPermissions() != null && file.getPermissions().contains(PERMISSION_SHARED_WITH_ME));
}
private void sortByDate(){
private void sortByDate(boolean sortAscending){
final Integer val;
if (sortAscending){
val = 1;
} else {
val = -1;
}
Collections.sort(mFiles, new Comparator<OCFile>() {
public int compare(OCFile o1, OCFile o2) {
if (o1.isFolder() && o2.isFolder()) {
return Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp());
return val * Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp());
}
else if (o1.isFolder()) {
return -1;
@ -321,13 +325,20 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
} else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
return 0;
} else {
return Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp());
return val * Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp());
}
}
});
}
private void sortBySize(){
private void sortBySize(boolean sortAscending){
final Integer val;
if (sortAscending){
val = 1;
} else {
val = -1;
}
Collections.sort(mFiles, new Comparator<OCFile>() {
public int compare(OCFile o1, OCFile o2) {
if (o1.isFolder() && o2.isFolder()) {
@ -340,14 +351,32 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
} else if (o1.getFileLength() == 0 || o2.getFileLength() == 0){
return 0;
} else {
return Long.compare(o1.getFileLength(), o2.getFileLength());
return val * Long.compare(o1.getFileLength(), o2.getFileLength());
}
}
});
}
private void sortByName(){
Collections.sort(mFiles);
private void sortByName(boolean sortAscending){
final Integer val;
if (sortAscending){
val = 1;
} else {
val = -1;
}
Collections.sort(mFiles, new Comparator<OCFile>() {
public int compare(OCFile o1, OCFile o2) {
if (o1.isFolder() && o2.isFolder()) {
return val * o1.getRemotePath().toLowerCase().compareTo(o2.getRemotePath().toLowerCase());
} else if (o1.isFolder()) {
return -1;
} else if (o2.isFolder()) {
return 1;
}
return val * new AlphanumComparator().compare(o1, o2);
}
});
}
public void setSortOrder(sortOrders order, boolean descending) {