X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdrawer.xml;h=3dc96fd4bbd14ef503155725ad508269a025541c;hb=ffd3fc6e70872c8fcbf41a39ba6641bfbc45a37e;hp=92bac44ddff9b77cb14a05c46f3255b488052400;hpb=5e6987246be580c0f5b23c95d163432f7c6edb44;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
index 92bac44d..3dc96fd4 100644
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -3,53 +3,81 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:background="@color/drawer_background">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <include
+                layout="@layout/nav_header_latest_transactions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:id="@+id/nav_actions"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    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
+                    android:id="@+id/textView5"
+                    style="@style/nav_button"
+                    android:drawableStart="@drawable/ic_assignment_black_24dp"
+                    android:text="@string/nav_reports_title" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </ScrollView>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="96dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:layout_marginEnd="0dp"
-        android:orientation="vertical">
+        android:divider="@drawable/list_divider"
+        android:elevation="2dp"
+        android:orientation="vertical"
+        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>
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView4"
-                style="@style/nav_button"
-                android:drawableStart="@drawable/ic_home_black_24dp"
-                android:text="@string/nav_latest_transactions_title" />
-
-            <TextView
-                android:id="@+id/textView5"
-                style="@style/nav_button"
-                android:drawableStart="@drawable/ic_assignment_black_24dp"
-                android:text="@string/nav_reports_title" />
-        </LinearLayout>
-    </ScrollView>
-
 </RelativeLayout>