dimagi · pm-dimagi · Aug 8, 2025 · Jul 23, 2025 · Jul 23, 2025 · Jul 23, 2025
diff --git a/app/res/color/nav_drawer_text.xml b/app/res/color/nav_drawer_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/nav_drawer_disable_color" android:state_enabled="false"/>
+    <item android:color="@color/white" android:state_enabled="true"/>
+</selector>
diff --git a/app/res/drawable/nav_drawer_app_icon.xml b/app/res/drawable/nav_drawer_app_icon.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white"
+        android:fillType="evenOdd" android:pathData="M3,3v8h8L11,3L3,3zM9,9L5,9L5,5h4v4zM3,13v8h8v-8L3,13zM9,19L5,19v-4h4v4zM13,3v8h8L21,3h-8zM19,9h-4L15,5h4v4zM13,13v8h8v-8h-8zM19,19h-4v-4h4v4z"/>
+</vector>
diff --git a/app/res/drawable/nav_drawer_arrow_down.xml b/app/res/drawable/nav_drawer_arrow_down.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
+
+</vector>
diff --git a/app/res/drawable/nav_drawer_help_icon.xml b/app/res/drawable/nav_drawer_help_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
+</vector>
diff --git a/app/res/drawable/nav_drawer_logged_out_avatar.xml b/app/res/drawable/nav_drawer_logged_out_avatar.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="135"
+    android:viewportHeight="135"
+    android:width="135dp"
+    android:height="135dp">
+    <path
+        android:pathData="M135 67.5A67.5 67.5 0 0 1 0 67.5A67.5 67.5 0 0 1 135 67.5Z"
+        android:fillColor="#DDDDDD"
+        android:fillAlpha="0.8" />
+    <path
+        android:pathData="M130 67.5A62.5 62.5 0 0 1 5 67.5A62.5 62.5 0 0 1 130 67.5Z"
+        android:fillColor="#F6F6F6" />
+    <path
+        android:pathData="M96.3333 97V89.6667C96.3333 85.7768 94.7881 82.0463 92.0376 79.2958C89.287 76.5452 85.5565 75 81.6667 75H52.3333C48.4435 75 44.713 76.5452 41.9624 79.2958C39.2119 82.0463 37.6667 85.7768 37.6667 89.6667V97M81.6667 45.6667C81.6667 53.7668 75.1002 60.3333 67 60.3333C58.8998 60.3333 52.3333 53.7668 52.3333 45.6667C52.3333 37.5665 58.8998 31 67 31C75.1002 31 81.6667 37.5665 81.6667 45.6667Z"
+        android:strokeColor="#A1A1A1"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/res/drawable/nav_drawer_message_icon.xml b/app/res/drawable/nav_drawer_message_icon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L6,16l-2,2L4,4h16v12z" />
+</vector>
diff --git a/app/res/drawable/nav_drawer_opportunity_icon.xml b/app/res/drawable/nav_drawer_opportunity_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/transparent"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.5"
+        android:strokeLineJoin="round"
+        android:strokeLineCap="round"
+        android:pathData="M11.0927 13.6631C11.5567 14.2372 12.1487 14.7122 12.8285 15.056C13.5083 15.3997 14.2601 15.6042 15.0328 15.6554C15.8055 15.7066 16.5811 15.6034 17.3069 15.3528C18.0327 15.1022 18.6918 14.7101 19.2395 14.2031L22.481 11.2031C23.465 10.26 24.0096 8.99703 23.9973 7.68605C23.985 6.37506 23.4168 5.121 22.4151 4.19396C21.4135 3.26692 20.0585 2.74107 18.642 2.72968C17.2255 2.71829 15.8608 3.22226 14.8419 4.13305L12.9835 5.84305M15.4146 11.6631C14.9506 11.0889 14.3586 10.6139 13.6787 10.2701C12.9989 9.92635 12.2471 9.72193 11.4744 9.67072C10.7017 9.6195 9.92618 9.72268 9.20035 9.97327C8.47453 10.2239 7.81542 10.616 7.26774 11.1231L4.02629 14.1231C3.04219 15.0661 2.49766 16.3291 2.50997 17.6401C2.52228 18.951 3.09045 20.2051 4.0921 21.1321C5.09375 22.0592 6.44874 22.585 7.86524 22.5964C9.28174 22.6078 10.6464 22.1038 11.6653 21.1931L13.5129 19.4831" />
+</vector>
diff --git a/app/res/drawable/nav_drawer_payments_icon.xml b/app/res/drawable/nav_drawer_payments_icon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z" />
+</vector>
diff --git a/app/res/drawable/nav_drawer_person_avatar.png b/app/res/drawable/nav_drawer_person_avatar.png
diff --git a/app/res/drawable/nav_drawer_worker_history_icon.xml b/app/res/drawable/nav_drawer_worker_history_icon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>
diff --git a/app/res/layout-land/home_screen.xml b/app/res/layout-land/home_screen.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.drawerlayout.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:tag="layout/activity_login_0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout
+        android:id="@+id/nav_drawer_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
+<LinearLayout
     style="@style/MainPane"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -81,3 +93,6 @@
         </RelativeLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
+    </FrameLayout>
+    <include layout="@layout/nav_drawer_base"/>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/res/layout/first_start_screen_modern.xml b/app/res/layout/first_start_screen_modern.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:tag="layout/activity_login_0"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
+<FrameLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/cc_core_bg"
-    tools:viewBindingIgnore="true">
+    tools:viewBindingIgnore="true"
+    android:id="@+id/nav_drawer_frame">
     <!-- Fragment container, will hold the actual setup app screen here -->
     <FrameLayout
         android:id="@+id/setup_fragment_container"
@@ -16,3 +21,6 @@
 
 
 </FrameLayout>
+    <include layout="@layout/nav_drawer_base"/>
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/res/layout/home_screen.xml b/app/res/layout/home_screen.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.drawerlayout.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:tag="layout/activity_login_0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <FrameLayout
+        android:id="@+id/nav_drawer_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/cc_core_bg"
@@ -76,3 +88,6 @@
         </RelativeLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
+    </FrameLayout>
+    <include layout="@layout/nav_drawer_base"/>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/res/layout/nav_drawer_base.xml b/app/res/layout/nav_drawer_base.xml
@@ -0,0 +1,70 @@
+<LinearLayout android:layout_width="@dimen/nav_drawer_width"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/cc_brand_color"
+    android:layout_gravity="start"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true"
+            android:background="@color/cc_brand_color">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <include
+                    android:id="@+id/nav_drawer_header"
+                    layout="@layout/nav_drawer_header"/>
+
+                <LinearLayout
+                    android:id="@+id/signout_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:paddingTop="92dp"
+                    android:layout_weight="1">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:src="@drawable/nav_drawer_logged_out_avatar"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:focusable="true"
+                        android:layout_gravity="center"
+                        android:textAlignment="center"
+                        android:paddingTop="16dp"
+                        android:clickable="true"
+                        android:textAppearance="@style/TextAppearance.NavDrawerItem"
+                        android:text="@string/nav_drawer_not_signed_in_to_personal_id"/>
+                    <TextView
+                        android:id="@+id/nav_drawer_sign_in_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:paddingTop="16dp"
+                        android:text="@string/nav_drawer_signin_register"
+                        android:textAppearance="@style/TextAppearance.NavDrawerItem"/>
+                </LinearLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/nav_drawer_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
+                    android:background="@color/cc_brand_color" />
+
+                <include
+                    android:id="@+id/nav_drawer_footer"
+                    layout="@layout/nav_drawer_footer" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+    </LinearLayout>
diff --git a/app/res/layout/nav_drawer_footer.xml b/app/res/layout/nav_drawer_footer.xml
@@ -0,0 +1,81 @@
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:layout_gravity="bottom"
+    android:background="@color/cc_brand_color">
+    <View
+        android:layout_marginTop="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/darker_grey"/>
+
+    <LinearLayout
+        android:id="@+id/about_view"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:paddingStart="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="?attr/selectableItemBackground"
+        android:paddingEnd="16dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/commcare_actionbar_logo"/>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/about_cc"
+            android:textAppearance="@style/TextAppearance.NavDrawerItem"
+            android:layout_marginStart="8dp"
+            android:fontFamily="sans-serif-medium" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/help_view"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:paddingStart="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="?attr/selectableItemBackground"
+        android:paddingEnd="16dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/nav_drawer_help_icon"
+            android:contentDescription="@null"/>
+
+        <TextView
+            android:id="@+id/nav_help"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/nav_drawer_help"
+            android:textAppearance="@style/TextAppearance.NavDrawerItem"
+            android:layout_marginStart="8dp"/>
+    </LinearLayout>
+    <TextView
+        android:id="@+id/app_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.NavDrawerItem.SubTitle"
+        android:enabled="false"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"/>
+
+</LinearLayout>
+</layout>