X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdrawer.xml;h=3dc96fd4bbd14ef503155725ad508269a025541c;hb=89e0fa95e3fca65277711a762f0643c974481e0a;hp=b8f069ff2a8493f8bdb7fe6fac3f4d59299d44fb;hpb=a22636e820e23c9cad303d980f1d5c7a0fd7ae88;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
index b8f069ff..3dc96fd4 100644
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -7,53 +7,35 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true">
+        android:layout_alignParentTop="true"
+        android:background="@color/drawer_background">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <LinearLayout
+            <include
+                layout="@layout/nav_header_latest_transactions"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/colorPrimary"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:paddingLeft="16dp">
-
-                    <TextView
-                        android:id="@+id/textView6"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="32dp"
-                        android:text="@string/app_name"
-                        android:textColor="@android:color/white" />
-
-                    <TextView
-                        android:id="@+id/drawer_version_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="v1.1.1"
-                        android:textColor="@android:color/white" />
-                </LinearLayout>
-
-            </LinearLayout>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
+                android:id="@+id/nav_actions"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingLeft="16dp">
+                android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/textView4"
+                    android:id="@+id/nav_account_summary"
                     style="@style/nav_button"
                     android:drawableStart="@drawable/ic_home_black_24dp"
+                    android:text="@string/account_summary_title" />
+
+                <TextView
+                    android:id="@+id/nav_latest_transactions"
+                    style="@style/nav_button"
+                    android:drawableStart="@drawable/ic_event_note_black_24dp"
                     android:text="@string/nav_latest_transactions_title" />
 
                 <TextView
@@ -61,6 +43,7 @@
                     style="@style/nav_button"
                     android:drawableStart="@drawable/ic_assignment_black_24dp"
                     android:text="@string/nav_reports_title" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -72,21 +55,27 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:layout_marginEnd="0dp"
+        android:divider="@drawable/list_divider"
+        android:elevation="2dp"
         android:orientation="vertical"
-        android:paddingLeft="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:showDividers="beginning">
 
         <TextView
             android:id="@+id/textView2"
             style="@style/nav_button"
             android:layout_weight="1"
             android:drawableStart="@drawable/ic_settings_black_24dp"
+            android:onClick="nav_settings_clicked"
             android:text="@string/action_settings" />
 
         <TextView
-            android:id="@+id/textView3"
+            android:id="@+id/nav_exit"
             style="@style/nav_button"
             android:layout_weight="1"
             android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
+            android:onClick="nav_exit_clicked"
             android:text="@string/nav_exit_title" />
 
     </LinearLayout>