Merge pull request #2613 from nextcloud/overflowMenu

setting the menu item order according to the webUI

src/main/java/com/owncloud/android/authentication/AccountUtils.java

@@ -38,7 +38,6 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.operations.GetCapabilitiesOperarion;
 import com.owncloud.android.ui.activity.ManageAccountsActivity;
 
-import java.util.Locale;
 
 public class AccountUtils {
     private static final String TAG = AccountUtils.class.getSimpleName();

src/main/res/menu/file_actions_menu.xml

@@ -2,7 +2,7 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012 Bartek Przybylski
   Copyright (C) 2015 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
@@ -23,119 +23,117 @@
       tools:ignore="AppCompatResource">
 
     <item
-        android:id="@+id/action_send_share_file"
-        android:title="@string/action_send_share"
-        app:showAsAction="never"
-        android:showAsAction="never"
-        android:icon="@drawable/ic_share"
-        android:orderInCategory="1" />
-    <item
-        android:id="@+id/action_open_file_with"
-        android:title="@string/actionbar_open_with"
-        app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
-    <item
-        android:id="@+id/action_download_file"
-        android:title="@string/filedetails_download"
+        android:id="@+id/action_favorite"
+        android:title="@string/favorite_real"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+    
     <item
-        android:id="@+id/action_sync_file"
-        android:title="@string/filedetails_sync_file"
+        android:id="@+id/action_unset_favorite"
+        android:title="@string/unset_favorite_real"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
-        android:id="@+id/action_cancel_sync"
-        android:title="@string/common_cancel_sync"
+        android:id="@+id/action_see_details"
+        android:title="@string/actionbar_see_details"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_rename_file"
         android:title="@string/common_rename"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_move"
         android:title="@string/actionbar_move"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_copy"
         android:title="@string/actionbar_copy"
         app:showAsAction="never"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_download_file"
+        android:title="@string/filedetails_download"
+        app:showAsAction="never"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_send_share_file"
+        android:title="@string/action_send_share"
+        app:showAsAction="never"
         android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:icon="@drawable/ic_share" />
+
+    <item
+        android:id="@+id/action_open_file_with"
+        android:title="@string/actionbar_open_with"
+        app:showAsAction="never"
+        android:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_sync_file"
+        android:title="@string/filedetails_sync_file"
+        app:showAsAction="never"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/action_cancel_sync"
+        android:title="@string/common_cancel_sync"
+        app:showAsAction="never"
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_select_all_action_menu"
         android:title="@string/select_all"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_deselect_all_action_menu"
         android:title="@string/deselect_all"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_keep_files_offline"
         android:title="@string/favorite"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_unset_keep_files_offline"
         android:title="@string/unfavorite"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
-    <item
-        android:id="@+id/action_favorite"
-        android:title="@string/favorite_real"
-        app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
-    <item
-        android:id="@+id/action_unset_favorite"
-        android:title="@string/unset_favorite_real"
-        app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_encrypted"
         android:title="@string/encrypted"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1"/>
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_unset_encrypted"
         android:title="@string/unset_encrypted"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1"/>
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_set_as_wallpaper"
         android:title="@string/set_picture_as"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
-    <item
-        android:id="@+id/action_see_details"
-        android:title="@string/actionbar_see_details"
-        app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
+
     <item
         android:id="@+id/action_remove_file"
         android:title="@string/common_remove"
         app:showAsAction="never"
-        android:showAsAction="never"
-        android:orderInCategory="1" />
+        android:showAsAction="never" />
 
 </menu>

src/main/res/values/strings.xml

@@ -267,8 +267,8 @@
 
     <string name="favorite">Set as available offline</string>
     <string name="unfavorite">Unset as available offline</string>
-    <string name="favorite_real">Set as favorite</string>
-    <string name="unset_favorite_real">Unset favorite</string>
+    <string name="favorite_real">Add to favorites</string>
+    <string name="unset_favorite_real">Remove from favourites</string>
     <string name="encrypted">Set as encrypted</string>
     <string name="unset_encrypted">Unset encryption</string>
     <string name="common_rename">Rename</string>