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

Merge pull request #9463 from nextcloud/highlightSortOrder

Browse source 
Correctly highlight selected sort order
This commit is contained in:
Álvaro Brey 2021-12-09 15:33:02 +01:00 committed by GitHub
commit 60aa2becf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -364,7 +364,7 @@ public class UploadFilesActivity extends DrawerActivity implements LocalFileList
@Override @Override
public void onSortingOrderChosen(FileSortOrder selection) { public void onSortingOrderChosen(FileSortOrder selection) {
preferences.setSortOrder(FileSortOrder.Type.uploadFilesView, selection); preferences.setSortOrder(FileSortOrder.Type.localFileListView, selection);
mFileListFragment.sortFiles(selection); mFileListFragment.sortFiles(selection);
} }

8
src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file

@ -133,8 +133,12 @@ public class LocalFileListFragment extends ExtendedListFragment implements
listDirectory(mContainerActivity.getInitialDirectory()); listDirectory(mContainerActivity.getInitialDirectory());
FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.uploadFilesView); mSortButton.setOnClickListener(v -> {
mSortButton.setOnClickListener(v -> openSortingOrderDialogFragment(requireFragmentManager(), sortOrder)); FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.localFileListView);
openSortingOrderDialogFragment(requireFragmentManager(), sortOrder);
});
FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.localFileListView);
mSortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder)); mSortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder));
setGridSwitchButton(); setGridSwitchButton();

2
src/main/java/com/owncloud/android/utils/FileSortOrder.java
View file

@ -51,7 +51,7 @@ public class FileSortOrder {
public static final Map<String, FileSortOrder> sortOrders; public static final Map<String, FileSortOrder> sortOrders;
public enum Type { public enum Type {
trashBinView, localFileListView, uploadFilesView trashBinView, localFileListView
} }
static { static {
HashMap<String, FileSortOrder> temp = new HashMap<>(); HashMap<String, FileSortOrder> temp = new HashMap<>();