Merge branch 'descendIntoFolder' of https://github.com/owncloud/android into descendI...

[pub/Android/ownCloud.git] / res / layout / drawer.xml

diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index 2c54ad1..aacb1c6 100644 (file)
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -19,7 +19,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <RelativeLayout
         android:id="@+id/left_drawer"
-        android:layout_width="match_parent"
+        android:layout_width="240dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:gravity="center"
@@ -66,19 +66,38 @@
             android:dividerHeight="1dp"
             android:paddingTop="100dp" />
 
-        <TextView
-            android:id="@+id/tv_header"
+        <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="100dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:background="@color/owncloud_blue"
-            android:gravity="bottom"
-            android:orientation="vertical"
-            android:text="@string/app_name"
-            android:textColor="#FFF"
-            android:textStyle="bold"
-            android:padding="10dp"
-            android:textSize="24sp" />
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:background="@color/owncloud_blue_accent">
+
+            <ImageView
+                android:id="@+id/itemIcon"
+                android:layout_width="24sp"
+                android:layout_height="24sp"
+                android:layout_marginLeft="16sp"
+                android:layout_marginBottom="3dp"
+                android:layout_gravity="bottom"
+                android:src="@drawable/ic_account_circle"
+                />
+
+            <TextView
+                android:id="@+id/drawer_username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:gravity="bottom"
+                android:orientation="vertical"
+                android:text="@string/app_name"
+                android:textColor="#FFF"
+                android:paddingLeft="22dp"
+                android:paddingRight="16dp"
+                android:textSize="24sp"
+                android:ellipsize="end"
+                android:singleLine="true"
+                />
+        </LinearLayout>
     </RelativeLayout>
 </merge>
\ No newline at end of file