Add additional options content

3 files changed, 35 insertions, 3 deletions

diff --git a/app/src/main/res/layout/view_nav_header.xml b/app/src/main/res/layout/view_nav_header.xml
index af918736..38df36d7 100644
--- a/app/src/main/res/layout/view_nav_header.xml
+++ b/app/src/main/res/layout/view_nav_header.xml
@@ -8,6 +8,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
+        android:elevation="2dp"
         android:layout_height="160dp">
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -86,6 +87,18 @@
         android:visibility="gone"
         tools:visibility="visible">
 
+        <LinearLayout
+            android:id="@+id/options_accounts_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <TextView
+            android:id="@+id/options_logout"
+            style="@style/Main.DrawerAccountOptions"
+            android:text="@string/kau_logout"
+            tools:drawableStart="@drawable/abc_vector_test" />
+
         <TextView
             android:id="@+id/options_add_account"
             style="@style/Main.DrawerAccountOptions"
@@ -93,9 +106,9 @@
             tools:drawableStart="@drawable/abc_vector_test" />
 
         <TextView
-            android:id="@+id/options_logout"
+            android:id="@+id/options_manage_account"
             style="@style/Main.DrawerAccountOptions"
-            android:text="@string/kau_logout"
+            android:text="@string/kau_manage_account"
             tools:drawableStart="@drawable/abc_vector_test" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1f66683d..c81aee3c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,4 +13,6 @@
     <dimen name="toolbar_icon_size">24dp</dimen>
 
     <dimen name="dialog_corner_radius">8dp</dimen>
+
+    <dimen name="drawer_account_avatar_size">32dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b194a975..38c5de7d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -157,11 +157,28 @@
         <item name="android:layout_height">40dp</item>
     </style>
 
-    <style name="Main.DrawerAccountOptions" parent="Main.DrawerMargins">
+    <!-- Expected icon size is 20dp to match NavigationView -->
+    <style name="Main.DrawerAccountOptions" parent="">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:drawablePadding">16dp</item>
+        <item name="android:paddingStart">24dp</item>
+        <item name="android:paddingEnd">24dp</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
         <item name="android:gravity">center_vertical</item>
     </style>
 
+    <!-- Avatar size is 32dp (R.dimen.drawer_account_avatar_size) -->
+    <style name="Main.DrawerAccountUserOptions" parent="">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:drawablePadding">10dp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingStart">18dp</item>
+        <item name="android:paddingEnd">24dp</item>
+    </style>
+
 </resources>