Przeglądaj źródła

Merge pull request #268 from nextcloud/toolbarSimplification

Move action hard to discover - difference between single/multi selection
Andy Scherzinger 8 lat temu
rodzic
commit
3a5dae194b
1 zmienionych plików z 23 dodań i 7 usunięć
  1. 23 7
      res/menu/file_actions_menu.xml

+ 23 - 7
res/menu/file_actions_menu.xml

@@ -18,84 +18,100 @@
   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"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:ignore="AppCompatResource">
 
     <item
         android:id="@+id/action_share_file"
         android:title="@string/action_share"
         android:icon="@drawable/ic_share"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"
         android:icon="@drawable/ic_open_in_app"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_download_file"
         android:title="@string/filedetails_download"
         android:icon="@drawable/ic_action_download"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_sync_file"
         android:title="@string/filedetails_sync_file"
         android:icon="@drawable/ic_action_refresh_white"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_cancel_sync"
         android:title="@string/common_cancel_sync"
         android:icon="@drawable/ic_action_cancel_sync"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_rename_file"
         android:title="@string/common_rename"
         android:icon="@drawable/ic_edit"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_move"
         android:title="@string/actionbar_move"
         android:icon="@drawable/ic_action_move"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_copy"
         android:title="@string/actionbar_copy"
         android:icon="@drawable/ic_action_copy"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_remove_file"
         android:title="@string/common_remove"
         android:icon="@drawable/ic_action_delete_white"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_send_file"
         android:title="@string/actionbar_send_file"
         android:icon="@drawable/ic_send"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_favorite_file"
         android:title="@string/favorite"
         android:icon="@drawable/ic_action_set_available_offline_white"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_unfavorite_file"
         android:title="@string/unfavorite"
         android:icon="@drawable/ic_action_unset_available_offline_white"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
     <item
         android:id="@+id/action_see_details"
         android:title="@string/actionbar_see_details"
         android:icon="@drawable/ic_information"
         app:showAsAction="never"
+        android:showAsAction="never"
         android:orderInCategory="1" />
 
 </menu>