Merge pull request #1021 from nextcloud/brandingDrawer

Drawer branding

drawable_resources/ic_list_empty_image.svg

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1"
-   id="svg4"
-   sodipodi:docname="ic_list_empty_image.svg"
-   inkscape:version="0.92.1 r15371"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_image.png"
-   inkscape:export-xdpi="432"
-   inkscape:export-ydpi="432">
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    height="16"
+    width="16"
+    version="1"
+    id="svg4"
+    sodipodi:docname="ic_list_empty_image.svg"
+    inkscape:version="0.91 r13725"
+    inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_image.png"
+    inkscape:export-xdpi="432"
+    inkscape:export-ydpi="432">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -38,19 +37,19 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
+     inkscape:window-width="1600"
+     inkscape:window-height="835"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="14.75"
-     inkscape:cx="8"
+     inkscape:cx="17.694915"
      inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4" />
   <path
-     style="block-progression:tb;text-transform:none;text-indent:0;fill:#000000;fill-opacity:1;opacity:0.5"
+     style="block-progression:tb;text-transform:none;text-indent:0;fill:#757575;fill-opacity:1;opacity:1"
      d="M1.344 2A.445.445 0 0 0 1 2.438v11.124c0 .23.212.44.438.44h13.125a.457.457 0 0 0 .437-.44V2.61c0-.337-.264-.61-.515-.61zM2 3h12v5l-1-1-3 4-3-3-4 4H2zm2.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"
      fill="#969696"
      color="#000"

drawable_resources/ic_list_empty_video.svg

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1"
-   id="svg4"
-   sodipodi:docname="ic_list_empty_video.svg"
-   inkscape:version="0.92.1 r15371"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_video.png"
-   inkscape:export-xdpi="432"
-   inkscape:export-ydpi="432">
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    height="16"
+    width="16"
+    version="1"
+    id="svg4"
+    sodipodi:docname="ic_list_empty_video.svg"
+    inkscape:version="0.91 r13725"
+    inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_video.png"
+    inkscape:export-xdpi="432"
+    inkscape:export-ydpi="432">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -38,21 +37,21 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
+     inkscape:window-width="1600"
+     inkscape:window-height="835"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
+     inkscape:zoom="20.85965"
+     inkscape:cx="-15.290906"
+     inkscape:cy="9.1100694"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4" />
   <path
-     style="block-progression:tb;text-transform:none;text-indent:0;fill:#000000;fill-opacity:1;opacity:0.5"
+     style="block-progression:tb;text-transform:none;text-indent:0;fill:#757575;fill-opacity:1;opacity:1"
      d="M1.344 2A.445.445 0 0 0 1 2.438v11.124c0 .23.212.44.438.44h13.124a.457.457 0 0 0 .438-.44V2.61c0-.336-.265-.61-.516-.61zM2 3h12v10H2zm3 2v6l6-3z"
+     id="path2"
      fill="#969696"
-     color="#000"
-     id="path2" />
+     color="#000" />
 </svg>

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

@@ -316,7 +316,7 @@ public class FileDisplayActivity extends HookActivity
                             dialog.dismiss();
                         }
                     })
-                    .setIcon(R.drawable.ic_cloud_upload)
+                    .setIcon(R.drawable.nav_folder_sync)
                     .show();
         }
     }

src/main/res/menu/drawer_menu.xml

@@ -27,65 +27,65 @@
         android:checkableBehavior="single">
         <item
             android:id="@+id/nav_all_files"
-            android:icon="@drawable/ic_folder_open"
+            android:icon="@drawable/nav_all_files"
             android:orderInCategory="0"
             android:title="@string/drawer_item_all_files"/>
         <item
             android:id="@+id/nav_activity"
-            android:icon="@drawable/ic_activity"
+            android:icon="@drawable/nav_activity"
             android:title="@string/drawer_item_activities"/>
         <item
             android:id="@+id/nav_favorites"
-            android:icon="@drawable/ic_star"
+            android:icon="@drawable/nav_favorites"
             android:orderInCategory="0"
             android:title="@string/drawer_item_favorites"/>
         <item
             android:id="@+id/nav_photos"
-            android:icon="@drawable/file_image"
+            android:icon="@drawable/nav_photos"
             android:title="@string/drawer_item_photos"
             android:visible="false"/>
         <item
             android:id="@+id/nav_videos"
-            android:icon="@drawable/file_movie"
+            android:icon="@drawable/nav_videos"
             android:orderInCategory="0"
             android:title="@string/drawer_item_videos"
             android:visible="false"/>
         <item
             android:id="@+id/nav_shared"
             android:orderInCategory="0"
-            android:icon="@drawable/ic_shared"
+            android:icon="@drawable/nav_shared"
             android:title="@string/drawer_item_shared"
             android:visible="false"/>
         <item
             android:id="@+id/nav_on_device"
-            android:icon="@drawable/ic_action_available_offline"
+            android:icon="@drawable/nav_on_device"
             android:orderInCategory="0"
             android:title="@string/drawer_item_on_device"/>
         <item
             android:id="@+id/nav_recently_added"
-            android:icon="@drawable/ic_recent"
+            android:icon="@drawable/nav_recently"
             android:orderInCategory="0"
             android:title="@string/drawer_item_recently_added"
             android:visible="false"/>
         <item
             android:id="@+id/nav_recently_modified"
-            android:icon="@drawable/ic_recent"
+            android:icon="@drawable/nav_recently"
             android:orderInCategory="0"
             android:title="@string/drawer_item_recently_modified"
             android:visible="false"/>
         <item
             android:orderInCategory="0"
             android:id="@+id/nav_notifications"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/nav_notifications"
             android:title="@string/drawer_item_notifications"/>
         <item
             android:orderInCategory="0"
             android:id="@+id/nav_folder_sync"
-            android:icon="@drawable/ic_cloud_upload"
+            android:icon="@drawable/nav_folder_sync"
             android:title="@string/drawer_folder_sync"/>
         <item
             android:id="@+id/nav_uploads"
-            android:icon="@drawable/ic_uploads"
+            android:icon="@drawable/nav_uploads"
             android:orderInCategory="2"
             android:title="@string/drawer_item_uploads_list"/>
     </group>
@@ -124,22 +124,22 @@
         android:checkableBehavior="single">
         <item
             android:id="@+id/nav_contacts"
-            android:icon="@drawable/ic_user"
+            android:icon="@drawable/nav_contacts"
             android:orderInCategory="3"
             android:title="@string/actionbar_contacts"/>
         <item
             android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings"
+            android:icon="@drawable/nav_settings"
             android:orderInCategory="4"
             android:title="@string/actionbar_settings"/>
         <item
             android:id="@+id/nav_participate"
-            android:icon="@drawable/ic_participate"
+            android:icon="@drawable/nav_participate"
             android:orderInCategory="4"
             android:title="@string/drawer_participate"/>
         <item
             android:id="@+id/nav_logout"
-            android:icon="@drawable/logout"
+            android:icon="@drawable/nav_logout"
             android:orderInCategory="4"
             android:title="@string/drawer_logout"/>
     </group>

src/main/res/menu/navigation_bar_menu.xml

@@ -2,18 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/nav_bar_files"
-        android:icon="@drawable/ic_folder_open"
+        android:icon="@drawable/nav_all_files"
         android:title="@string/drawer_item_all_files"/>
     <item
         android:id="@+id/nav_bar_favorites"
-        android:icon="@drawable/ic_star"
+        android:icon="@drawable/nav_favorites"
         android:title="@string/drawer_item_favorites"/>
     <item
         android:id="@+id/nav_bar_photos"
-        android:icon="@drawable/file_image"
+        android:icon="@drawable/nav_photos"
         android:title="@string/drawer_item_photos"/>
     <item
         android:id="@+id/nav_bar_settings"
-        android:icon="@drawable/ic_settings"
+        android:icon="@drawable/nav_settings"
         android:title="@string/drawer_item_settings"/>
 </menu>