Removed unused items in FileDisplayActivity + Fixed some bugs

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -31,13 +31,11 @@ import android.accounts.AuthenticatorException;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.content.SyncRequest;
 import android.content.pm.PackageManager;
 import android.content.res.Resources.NotFoundException;
 import android.net.Uri;
@@ -145,14 +143,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import static com.owncloud.android.datamodel.OCFile.PATH_SEPARATOR;
-import static com.owncloud.android.utils.DisplayUtils.openSortingOrderDialogFragment;
 
 /**
  * Displays, what files the user has available in his ownCloud. This is the main view.
@@ -764,10 +760,6 @@ public class FileDisplayActivity extends FileActivity
             menuItem.setVisible(!drawerOpen);
         }
 
-        // Hiding unused elements
-        menu.findItem(R.id.action_sort).setVisible(false);
-        menu.findItem(R.id.action_switch_view).setVisible(false);
-
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -775,7 +767,6 @@ public class FileDisplayActivity extends FileActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.activity_file_display, menu);
-        menu.findItem(R.id.action_create_dir).setVisible(false);
 
         menu.findItem(R.id.action_select_all).setVisible(false);
         MenuItem searchMenuItem = menu.findItem(R.id.action_search);
@@ -789,9 +780,7 @@ public class FileDisplayActivity extends FileActivity
         ThemeUtils.themeSearchView(searchView, this);
 
         // populate list of menu items to show/hide when drawer is opened/closed
-        mDrawerMenuItemstoShowHideList = new ArrayList<>(3);
-        mDrawerMenuItemstoShowHideList.add(menu.findItem(R.id.action_sort));
-        mDrawerMenuItemstoShowHideList.add(menu.findItem(R.id.action_switch_view));
+        mDrawerMenuItemstoShowHideList = new ArrayList<>(1);
         mDrawerMenuItemstoShowHideList.add(searchMenuItem);
 
         //focus the SearchView
@@ -865,23 +854,6 @@ public class FileDisplayActivity extends FileActivity
                 }
                 break;
             }
-            case R.id.action_sort: {
-                openSortingOrderDialogFragment(getSupportFragmentManager(),
-                                               preferences.getSortOrderByFolder(getListOfFilesFragment().getCurrentFile()));
-                break;
-            }
-            case R.id.action_switch_view: {
-                if (isGridView()) {
-                    item.setTitle(getString(R.string.action_switch_grid_view));
-                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_view_module));
-                    getListOfFilesFragment().setListAsPreferred();
-                } else {
-                    item.setTitle(getApplicationContext().getString(R.string.action_switch_list_view));
-                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_view_list));
-                    getListOfFilesFragment().setGridAsPreferred();
-                }
-                break;
-            }
             case R.id.action_select_all: {
                 getListOfFilesFragment().selectAllFiles(true);
                 break;

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -221,8 +221,7 @@ public class ExtendedListFragment extends Fragment implements
                 searchView.setMaxWidth((int) (width * 0.4));
             } else {
                 if (activity instanceof FolderPickerActivity) {
-                    searchView.
-                        setMaxWidth((int) (width * 0.8));
+                    searchView.setMaxWidth((int) (width * 0.8));
                 } else {
                     searchView.setMaxWidth(width);
                 }

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -769,8 +769,10 @@ public class OCFileListFragment extends ExtendedListFragment implements
     public void onPrepareOptionsMenu(@NonNull Menu menu) {
 
         if (mOriginalMenuItems.size() == 0) {
-            mOriginalMenuItems.add(menu.findItem(R.id.action_switch_view));
-            mOriginalMenuItems.add(menu.findItem(R.id.action_sort));
+            if (!(getActivity() instanceof FileDisplayActivity)) {
+                mOriginalMenuItems.add(menu.findItem(R.id.action_switch_view));
+                mOriginalMenuItems.add(menu.findItem(R.id.action_sort));
+            }
             mOriginalMenuItems.add(menu.findItem(R.id.action_search));
         }
 
@@ -789,18 +791,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
             case ADD_GRID_AND_SORT:
             case ADD_GRID_AND_SORT_WITH_SEARCH:
-                if (menu.findItem(R.id.action_switch_view) == null) {
-                    menuItemOrig = mOriginalMenuItems.get(0);
-                    menu.add(menuItemOrig.getGroupId(), menuItemOrig.getItemId(), menuItemOrig.getOrder(),
-                             menuItemOrig.getTitle());
-                }
                 mSwitchGridViewButton.setVisibility(View.VISIBLE);
-
-                if (menu.findItem(R.id.action_sort) == null) {
-                    menuItemOrig = mOriginalMenuItems.get(1);
-                    menu.add(menuItemOrig.getGroupId(), menuItemOrig.getItemId(), menuItemOrig.getOrder(),
-                             menuItemOrig.getTitle());
-                }
                 mSortButton.setVisibility(View.VISIBLE);
                 break;
 

src/main/res/menu/activity_file_display.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
@@ -18,41 +17,22 @@
   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"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/action_search"
-          android:icon="@drawable/ic_search"
-          android:title="@string/actionbar_search"
-          android:contentDescription="@string/actionbar_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-          app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_create_dir"
-        android:icon="@drawable/ic_action_create_dir"
-        android:orderInCategory="1"
-        app:showAsAction="never"
-        android:title="@string/actionbar_mkdir"
-        android:contentDescription="@string/actionbar_mkdir"/>
     <item
-        android:id="@+id/action_switch_view"
-        android:icon="@drawable/ic_view_module"
-        android:orderInCategory="2"
-        app:showAsAction="never"
-        android:title="@string/action_switch_grid_view" />
-	<item
-        android:id="@+id/action_sort"
-        android:icon="@drawable/ic_sort_variant"
-        android:orderInCategory="1"
-        app:showAsAction="never"
-        android:title="@string/actionbar_sort"
-        android:contentDescription="@string/actionbar_sort"/>
+        android:id="@+id/action_search"
+        android:contentDescription="@string/actionbar_search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/actionbar_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_select_all"
+        android:contentDescription="@string/select_all"
         android:icon="@drawable/ic_select_all"
         android:orderInCategory="1"
-        app:showAsAction="never"
         android:title="@string/select_all"
-        android:contentDescription="@string/select_all"/>
+        app:showAsAction="never" />
 
 </menu>