Add 'Uploads' option into NavigationDrawer

res/menu/main_menu.xml

@@ -49,13 +49,6 @@
         android:title="@string/actionbar_sort"
         android:contentDescription="@string/actionbar_sort"/>
 
-	<item
-        android:id="@+id/action_upload_list"
-        android:icon="@drawable/ic_action_settings"
-        android:orderInCategory="2"
-        app:showAsAction="never"
-        android:title="Open upload list"/>
-
     <!-- <item android:id="@+id/search"
     android:title="@string/actionbar_search"
     android:icon="@drawable/ic_action_search"></item> -->

res/values/drawer_resources.xml

@@ -25,6 +25,7 @@
         <item>@string/drawer_item_all_files</item>
         <!--<item>@string/drawer_item_on_device</item>-->
         <item>@string/actionbar_settings</item>
+        <item>@string/drawer_item_uploads_list</item>
         <item>@string/actionbar_logger</item>
     </string-array>
 
@@ -35,6 +36,7 @@
         <item>@string/drawer_item_all_files</item>
         <!--<item>@string/drawer_item_on_device</item>-->
         <item>@string/drawer_item_settings</item>
+        <item>@string/drawer_item_uploads_list</item>
         <item>@string/drawer_item_logs</item>
     </string-array>
 

res/values/strings.xml

@@ -26,6 +26,7 @@
     <!-- TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
     <string name="drawer_item_settings">Settings</string>
+    <string name="drawer_item_uploads_list">Uploads</string>
     <string name="drawer_item_logs">Logs</string>
 	<string name="drawer_close">Close</string>
     <string name="drawer_open">Open</string>

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -406,10 +406,15 @@ public class FileActivity extends AppCompatActivity
         // Settings
         mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[1], mDrawerContentDescriptions[1],
                 R.drawable.ic_settings));
+
+        // Uploads
+        mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2], mDrawerContentDescriptions[2],
+                R.drawable.ic_uploads));
+
         // Logs
         if (BuildConfig.DEBUG) {
-            mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[2],
-                    mDrawerContentDescriptions[2],R.drawable.ic_log));
+            mDrawerItems.add(new NavigationDrawerItem(mDrawerTitles[3],
+                    mDrawerContentDescriptions[3], R.drawable.ic_log));
         }
 
         // setting the nav drawer list adapter
@@ -988,7 +993,14 @@ public class FileActivity extends AppCompatActivity
                     mDrawerLayout.closeDrawers();
                     break;
 
-                case 2: // Logs
+                case 2: // Uploads
+                    Intent uploadListIntent = new Intent(getApplicationContext(),
+                            UploadListActivity.class);
+                    startActivity(uploadListIntent);
+                    mDrawerLayout.closeDrawers();
+                    break;
+
+                case 3: // Logs
                     Intent loggerIntent = new Intent(getApplicationContext(),
                             LogHistoryActivity.class);
                     startActivity(loggerIntent);

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

@@ -541,12 +541,6 @@ public class FileDisplayActivity extends HookActivity implements
                 dialog.show(getSupportFragmentManager(), DIALOG_UPLOAD_SOURCE);
                 break;
             }
-            case R.id.action_upload_list: {
-                Intent uploadListIntent = new Intent(getApplicationContext(),
-                        UploadListActivity.class);
-                startActivity(uploadListIntent);
-                break;
-            }
             case android.R.id.home: {
                 FileFragment second = getSecondFragment();
                 OCFile currentDir = getCurrentDir();