Forráskód Böngészése

Removed unused Sync account + Fixed a display inconsistency bug

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
Kilian Périsset 5 éve
szülő
commit
2ce949cb81

+ 5 - 6
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -764,6 +764,10 @@ 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);
     }
 
@@ -785,9 +789,8 @@ 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<>(4);
+        mDrawerMenuItemstoShowHideList = new ArrayList<>(3);
         mDrawerMenuItemstoShowHideList.add(menu.findItem(R.id.action_sort));
-        mDrawerMenuItemstoShowHideList.add(menu.findItem(R.id.action_sync_account));
         mDrawerMenuItemstoShowHideList.add(menu.findItem(R.id.action_switch_view));
         mDrawerMenuItemstoShowHideList.add(searchMenuItem);
 
@@ -848,10 +851,6 @@ public class FileDisplayActivity extends FileActivity
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         switch (item.getItemId()) {
-            case R.id.action_sync_account: {
-                startSynchronization();
-                break;
-            }
             case android.R.id.home: {
                 FileFragment second = getSecondFragment();
                 OCFile currentDir = getCurrentDir();

+ 0 - 7
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -432,13 +432,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
             FileMenuFilter.hideMenuItems(menu.findItem(R.id.action_send_file));
             FileMenuFilter.hideMenuItems(menu.findItem(R.id.action_sync_file));
         }
-
-        // dual pane restrictions
-        if (!getResources().getBoolean(R.bool.large_land_layout)){
-            FileMenuFilter.hideMenuItems(menu.findItem(R.id.action_sync_account));
-        }
-
-
     }
 
     private boolean optionsItemSelected(MenuItem item) {

+ 0 - 1
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -825,7 +825,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
             case REMOVE_ALL_EXCEPT_SEARCH:
                 menu.removeItem(R.id.action_sort);
                 menu.removeItem(R.id.action_switch_view);
-                menu.removeItem(R.id.action_sync_account);
                 mSwitchGridViewButton.setVisibility(View.VISIBLE);
                 mSortButton.setVisibility(View.VISIBLE);
                 break;

+ 0 - 1
src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

@@ -283,7 +283,6 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
             menu.findItem(R.id.action_move),
             menu.findItem(R.id.action_download_file),
             menu.findItem(R.id.action_sync_file),
-            menu.findItem(R.id.action_sync_account),
             menu.findItem(R.id.action_favorite),
             menu.findItem(R.id.action_unset_favorite)
         );

+ 0 - 1
src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java

@@ -144,7 +144,6 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
     public void onPrepareOptionsMenu(@NonNull Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
-        menu.findItem(R.id.action_sync_account).setVisible(false);
         menu.findItem(R.id.action_sort).setVisible(false);
         menu.findItem(R.id.action_switch_view).setVisible(false);
     }

+ 0 - 7
src/main/res/menu/activity_file_display.xml

@@ -40,13 +40,6 @@
         android:orderInCategory="2"
         app:showAsAction="never"
         android:title="@string/action_switch_grid_view" />
-    <item
-        android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
-        android:orderInCategory="1"
-        app:showAsAction="never"
-        android:title="@string/actionbar_sync"
-        android:contentDescription="@string/actionbar_sync"/>
 	<item
         android:id="@+id/action_sort"
         android:icon="@drawable/ic_sort_variant"