dimagi · pm-dimagi · Sep 19, 2024 · Sep 19, 2024 · Sep 20, 2024 · Sep 20, 2024
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
diff --git a/app/assets/locales/android_translatable_strings.txt b/app/assets/locales/android_translatable_strings.txt
@@ -65,6 +65,7 @@ home.sync=Sync with Server
 home.unsent.forms.indicator=Unsent Forms: ${0}
 home.logout=Log out of CommCare
 home.report=Report an Issue
+home.connect=View Job Status
 # IMPORTANT: do NOT change the name of this key for any reason; HQ uses it for the training root menu
 training.root.title=Training
 
@@ -107,6 +108,7 @@ menu.privilege.claim.disable=Disable Privileges
 menu.data.change.logs=Data Change Logs
 menu.enable.rate.limit.popup=Enable Rate Limit Error Popup
 menu.enable.manual.form.quarantine=Enable Manual Form Quarantine
+menu.enable.connect.id=Enable ConnectID
 
 install.fail.error=We encountered an ${0} error processing your request. Please try again later. If the problem persists, contact CommCare Support.
 
@@ -178,6 +180,7 @@ login.password=Password
 login.pin.password=PIN
 login.primed.prompt=Your password has been saved for you! Just press 'Log In'.
 login.button=Log In
+login.app.connect=Go to Connect Jobs
 login.sync=Synchronize with server
 login.bad.password=We couldn't find a user with this password. Please try another!
 login.welcome.single=Welcome back! Please log in.
@@ -198,7 +201,7 @@ post.generic.error=An error occurred while preparing the HTTP request
 post.dialog.title=Claiming...
 post.dialog.body=Claiming chosen data from server
 post.io.error=Error reading server response: ${0}
-post.unknown.response=Received unknown resonse code (${0}) from server
+post.unknown.response=Received unknown response code (${0}) from server
 post.client.error=Client-side error (code ${0}) received from network request.
 post.server.error=Server-side error (code ${0}) received from network request.
 post.gone.error=Case is not present on server.
@@ -363,13 +366,15 @@ select.detail.bypass=Done
 select.address.show=Show Address
 select.menu.sort=Sort By...
 select.menu.map=View on Map
+select.menu.scan=Scan Barcode
 select.menu.settings=Settings
 select.detail.title=Details
 select.list.title=Select
 select.detail.callout.title=Select phone number action
 select.detail.callout.call=Call
 select.detail.callout.sms=Send SMS
 
+
 home.logged.in.message=Logged In: ${0}
 notification.logged.in=Logged Into ${0}
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -14,6 +14,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'androidx.navigation.safeargs'
 apply from: 'jacoco.gradle'
 
 repositories {
@@ -84,6 +85,11 @@ dependencies {
     implementation 'joda-time:joda-time:2.9.4'
     implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
     implementation 'androidx.sqlite:sqlite:2.2.0'
+    implementation 'com.google.android.gms:play-services-auth:21.2.0'
+    implementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
+    implementation 'com.google.android.gms:play-services-identity:18.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.5.0'
+
     implementation('org.apache.james:apache-mime4j:0.7.2') {
         exclude module: 'commons-io'
     }
@@ -100,7 +106,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:21.1.0'
     implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation (name: 'rtl-viewpager-2.0.0', ext: 'aar')
     implementation('com.github.bumptech.glide:glide:4.9.0') {
         exclude group: 'com.android.support'
     }
@@ -140,6 +145,19 @@ dependencies {
 
     // Dependency required for API desugaring
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.1.3'
+
+    implementation 'androidx.biometric:biometric:1.1.0'
+
+    implementation 'io.michaelrocks:libphonenumber-android:8.13.11'
+    implementation 'com.nulab-inc:zxcvbn:1.7.0'
+
+    def nav_version = '2.6.0'
+    implementation "androidx.navigation:navigation-fragment:$nav_version"
+    implementation "androidx.navigation:navigation-ui:$nav_version"
+    implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
+    implementation "androidx.navigation:navigation-compose:$nav_version"
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 }
 
 ext {
@@ -246,6 +264,7 @@ android {
 
     buildFeatures {
         buildConfig true
+        dataBinding true
     }
 
     defaultConfig {
@@ -400,7 +419,6 @@ android {
             resValue 'string', 'application_name', applicationName
         }
 
-
         cccStaging {
             buildConfigField 'String', 'CCC_HOST', "\"connect-staging.dimagi.com\""
 
@@ -588,7 +606,7 @@ static def numbersToLetters(String version) {
             case '8': words.append('eight'); break
             case '9': words.append('nine'); break
             case '0': words.append('zero'); break
-            default: break // skip non-numeric'
+            default: break // skip non-numeric
         }
     }
     return words.toString()

diff --git a/app/libs/rtl-viewpager-2.0.0.aar b/app/libs/rtl-viewpager-2.0.0.aar
diff --git a/app/res/drawable-anydpi/ic_marker.xml b/app/res/drawable-anydpi/ic_marker.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/app/res/drawable-hdpi/arrow_right.png b/app/res/drawable-hdpi/arrow_right.png
diff --git a/app/res/drawable-hdpi/book.png b/app/res/drawable-hdpi/book.png
diff --git a/app/res/drawable-hdpi/calendar_heart.png b/app/res/drawable-hdpi/calendar_heart.png
diff --git a/app/res/drawable-hdpi/checklist.png b/app/res/drawable-hdpi/checklist.png
diff --git a/app/res/drawable-hdpi/cloud_backup.png b/app/res/drawable-hdpi/cloud_backup.png
diff --git a/app/res/drawable-hdpi/connect_arrow_down.png b/app/res/drawable-hdpi/connect_arrow_down.png
diff --git a/app/res/drawable-hdpi/connect_edittext_cancel.png b/app/res/drawable-hdpi/connect_edittext_cancel.png
diff --git a/app/res/drawable-hdpi/connect_ic_inventory.png b/app/res/drawable-hdpi/connect_ic_inventory.png
diff --git a/app/res/drawable-hdpi/ic_connect_delivery.png b/app/res/drawable-hdpi/ic_connect_delivery.png
diff --git a/app/res/drawable-hdpi/ic_connect_download_green.png b/app/res/drawable-hdpi/ic_connect_download_green.png
diff --git a/app/res/drawable-hdpi/ic_connect_expired.png b/app/res/drawable-hdpi/ic_connect_expired.png
diff --git a/app/res/drawable-hdpi/ic_connect_learning.png b/app/res/drawable-hdpi/ic_connect_learning.png
diff --git a/app/res/drawable-hdpi/ic_connect_new_opportunity.png b/app/res/drawable-hdpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-hdpi/ic_marker.png b/app/res/drawable-hdpi/ic_marker.png
diff --git a/app/res/drawable-hdpi/icon_chevron_left_attnpos.png b/app/res/drawable-hdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-hdpi/icon_chevron_right_attnpos.png b/app/res/drawable-hdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-hdpi/mobile_support.png b/app/res/drawable-hdpi/mobile_support.png
diff --git a/app/res/drawable-hdpi/monetary_support.png b/app/res/drawable-hdpi/monetary_support.png
diff --git a/app/res/drawable-hdpi/money.png b/app/res/drawable-hdpi/money.png
diff --git a/app/res/drawable-hdpi/money2.png b/app/res/drawable-hdpi/money2.png
diff --git a/app/res/drawable-hdpi/phone_heart.png b/app/res/drawable-hdpi/phone_heart.png
diff --git a/app/res/drawable-hdpi/report_approved.png b/app/res/drawable-hdpi/report_approved.png
diff --git a/app/res/drawable-hdpi/time.png b/app/res/drawable-hdpi/time.png
diff --git a/app/res/drawable-hdpi/watch.png b/app/res/drawable-hdpi/watch.png
diff --git a/app/res/drawable-ldpi/arrow_right.png b/app/res/drawable-ldpi/arrow_right.png
diff --git a/app/res/drawable-ldpi/book.png b/app/res/drawable-ldpi/book.png
diff --git a/app/res/drawable-ldpi/calendar_heart.png b/app/res/drawable-ldpi/calendar_heart.png
diff --git a/app/res/drawable-ldpi/checklist.png b/app/res/drawable-ldpi/checklist.png
diff --git a/app/res/drawable-ldpi/cloud_backup.png b/app/res/drawable-ldpi/cloud_backup.png
diff --git a/app/res/drawable-ldpi/ic_connect_delivery.png b/app/res/drawable-ldpi/ic_connect_delivery.png
diff --git a/app/res/drawable-ldpi/ic_connect_download_green.png b/app/res/drawable-ldpi/ic_connect_download_green.png
diff --git a/app/res/drawable-ldpi/ic_connect_expired.png b/app/res/drawable-ldpi/ic_connect_expired.png
diff --git a/app/res/drawable-ldpi/ic_connect_learning.png b/app/res/drawable-ldpi/ic_connect_learning.png
diff --git a/app/res/drawable-ldpi/ic_connect_new_opportunity.png b/app/res/drawable-ldpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-ldpi/icon_chevron_left_attnpos.png b/app/res/drawable-ldpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-ldpi/icon_chevron_right_attnpos.png b/app/res/drawable-ldpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-ldpi/mobile_support.png b/app/res/drawable-ldpi/mobile_support.png
diff --git a/app/res/drawable-ldpi/monetary_support.png b/app/res/drawable-ldpi/monetary_support.png
diff --git a/app/res/drawable-ldpi/money.png b/app/res/drawable-ldpi/money.png
diff --git a/app/res/drawable-ldpi/money2.png b/app/res/drawable-ldpi/money2.png
diff --git a/app/res/drawable-ldpi/phone_heart.png b/app/res/drawable-ldpi/phone_heart.png
diff --git a/app/res/drawable-ldpi/report_approved.png b/app/res/drawable-ldpi/report_approved.png
diff --git a/app/res/drawable-ldpi/time.png b/app/res/drawable-ldpi/time.png
diff --git a/app/res/drawable-ldpi/watch.png b/app/res/drawable-ldpi/watch.png
diff --git a/app/res/drawable-mdpi/arrow_right.png b/app/res/drawable-mdpi/arrow_right.png
diff --git a/app/res/drawable-mdpi/book.png b/app/res/drawable-mdpi/book.png
diff --git a/app/res/drawable-mdpi/calendar_heart.png b/app/res/drawable-mdpi/calendar_heart.png
diff --git a/app/res/drawable-mdpi/checklist.png b/app/res/drawable-mdpi/checklist.png
diff --git a/app/res/drawable-mdpi/cloud_backup.png b/app/res/drawable-mdpi/cloud_backup.png
diff --git a/app/res/drawable-mdpi/connect_arrow_down.png b/app/res/drawable-mdpi/connect_arrow_down.png
diff --git a/app/res/drawable-mdpi/connect_edittext_cancel.png b/app/res/drawable-mdpi/connect_edittext_cancel.png
diff --git a/app/res/drawable-mdpi/connect_ic_inventory.png b/app/res/drawable-mdpi/connect_ic_inventory.png
diff --git a/app/res/drawable-mdpi/ic_connect_delivery.png b/app/res/drawable-mdpi/ic_connect_delivery.png
diff --git a/app/res/drawable-mdpi/ic_connect_download_green.png b/app/res/drawable-mdpi/ic_connect_download_green.png
diff --git a/app/res/drawable-mdpi/ic_connect_expired.png b/app/res/drawable-mdpi/ic_connect_expired.png
diff --git a/app/res/drawable-mdpi/ic_connect_learning.png b/app/res/drawable-mdpi/ic_connect_learning.png
diff --git a/app/res/drawable-mdpi/ic_connect_new_opportunity.png b/app/res/drawable-mdpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-mdpi/ic_marker.png b/app/res/drawable-mdpi/ic_marker.png
diff --git a/app/res/drawable-mdpi/icon_chevron_left_attnpos.png b/app/res/drawable-mdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-mdpi/icon_chevron_right_attnpos.png b/app/res/drawable-mdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-mdpi/mobile_support.png b/app/res/drawable-mdpi/mobile_support.png
diff --git a/app/res/drawable-mdpi/monetary_support.png b/app/res/drawable-mdpi/monetary_support.png
diff --git a/app/res/drawable-mdpi/money.png b/app/res/drawable-mdpi/money.png
diff --git a/app/res/drawable-mdpi/money2.png b/app/res/drawable-mdpi/money2.png
diff --git a/app/res/drawable-mdpi/phone_heart.png b/app/res/drawable-mdpi/phone_heart.png
diff --git a/app/res/drawable-mdpi/report_approved.png b/app/res/drawable-mdpi/report_approved.png
diff --git a/app/res/drawable-mdpi/time.png b/app/res/drawable-mdpi/time.png
diff --git a/app/res/drawable-mdpi/watch.png b/app/res/drawable-mdpi/watch.png
diff --git a/app/res/drawable-xhdpi/arrow_right.png b/app/res/drawable-xhdpi/arrow_right.png
diff --git a/app/res/drawable-xhdpi/book.png b/app/res/drawable-xhdpi/book.png
diff --git a/app/res/drawable-xhdpi/calendar_heart.png b/app/res/drawable-xhdpi/calendar_heart.png
diff --git a/app/res/drawable-xhdpi/checklist.png b/app/res/drawable-xhdpi/checklist.png
diff --git a/app/res/drawable-xhdpi/cloud_backup.png b/app/res/drawable-xhdpi/cloud_backup.png
diff --git a/app/res/drawable-xhdpi/connect_arrow_down.png b/app/res/drawable-xhdpi/connect_arrow_down.png
diff --git a/app/res/drawable-xhdpi/connect_edittext_cancel.png b/app/res/drawable-xhdpi/connect_edittext_cancel.png
diff --git a/app/res/drawable-xhdpi/connect_ic_inventory.png b/app/res/drawable-xhdpi/connect_ic_inventory.png
diff --git a/app/res/drawable-xhdpi/ic_connect_delivery.png b/app/res/drawable-xhdpi/ic_connect_delivery.png
diff --git a/app/res/drawable-xhdpi/ic_connect_download_green.png b/app/res/drawable-xhdpi/ic_connect_download_green.png
diff --git a/app/res/drawable-xhdpi/ic_connect_expired.png b/app/res/drawable-xhdpi/ic_connect_expired.png
diff --git a/app/res/drawable-xhdpi/ic_connect_learning.png b/app/res/drawable-xhdpi/ic_connect_learning.png
diff --git a/app/res/drawable-xhdpi/ic_connect_new_opportunity.png b/app/res/drawable-xhdpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-xhdpi/ic_marker.png b/app/res/drawable-xhdpi/ic_marker.png
diff --git a/app/res/drawable-xhdpi/icon_chevron_left_attnpos.png b/app/res/drawable-xhdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-xhdpi/icon_chevron_right_attnpos.png b/app/res/drawable-xhdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-xhdpi/mobile_support.png b/app/res/drawable-xhdpi/mobile_support.png
diff --git a/app/res/drawable-xhdpi/monetary_support.png b/app/res/drawable-xhdpi/monetary_support.png
diff --git a/app/res/drawable-xhdpi/money.png b/app/res/drawable-xhdpi/money.png
diff --git a/app/res/drawable-xhdpi/money2.png b/app/res/drawable-xhdpi/money2.png
diff --git a/app/res/drawable-xhdpi/phone_heart.png b/app/res/drawable-xhdpi/phone_heart.png
diff --git a/app/res/drawable-xhdpi/report_approved.png b/app/res/drawable-xhdpi/report_approved.png
diff --git a/app/res/drawable-xhdpi/time.png b/app/res/drawable-xhdpi/time.png
diff --git a/app/res/drawable-xhdpi/watch.png b/app/res/drawable-xhdpi/watch.png
diff --git a/app/res/drawable-xxhdpi/arrow_right.png b/app/res/drawable-xxhdpi/arrow_right.png
diff --git a/app/res/drawable-xxhdpi/book.png b/app/res/drawable-xxhdpi/book.png
diff --git a/app/res/drawable-xxhdpi/calendar_heart.png b/app/res/drawable-xxhdpi/calendar_heart.png
diff --git a/app/res/drawable-xxhdpi/checklist.png b/app/res/drawable-xxhdpi/checklist.png
diff --git a/app/res/drawable-xxhdpi/cloud_backup.png b/app/res/drawable-xxhdpi/cloud_backup.png
diff --git a/app/res/drawable-xxhdpi/connect_arrow_down.png b/app/res/drawable-xxhdpi/connect_arrow_down.png
diff --git a/app/res/drawable-xxhdpi/connect_edittext_cancel.png b/app/res/drawable-xxhdpi/connect_edittext_cancel.png
diff --git a/app/res/drawable-xxhdpi/connect_ic_inventory.png b/app/res/drawable-xxhdpi/connect_ic_inventory.png
diff --git a/app/res/drawable-xxhdpi/ic_connect_delivery.png b/app/res/drawable-xxhdpi/ic_connect_delivery.png
diff --git a/app/res/drawable-xxhdpi/ic_connect_download_green.png b/app/res/drawable-xxhdpi/ic_connect_download_green.png
diff --git a/app/res/drawable-xxhdpi/ic_connect_expired.png b/app/res/drawable-xxhdpi/ic_connect_expired.png
diff --git a/app/res/drawable-xxhdpi/ic_connect_learning.png b/app/res/drawable-xxhdpi/ic_connect_learning.png
diff --git a/app/res/drawable-xxhdpi/ic_connect_new_opportunity.png b/app/res/drawable-xxhdpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-xxhdpi/ic_marker.png b/app/res/drawable-xxhdpi/ic_marker.png
diff --git a/app/res/drawable-xxhdpi/mobile_support.png b/app/res/drawable-xxhdpi/mobile_support.png
diff --git a/app/res/drawable-xxhdpi/monetary_support.png b/app/res/drawable-xxhdpi/monetary_support.png
diff --git a/app/res/drawable-xxhdpi/money.png b/app/res/drawable-xxhdpi/money.png
diff --git a/app/res/drawable-xxhdpi/money2.png b/app/res/drawable-xxhdpi/money2.png
diff --git a/app/res/drawable-xxhdpi/phone_heart.png b/app/res/drawable-xxhdpi/phone_heart.png
diff --git a/app/res/drawable-xxhdpi/report_approved.png b/app/res/drawable-xxhdpi/report_approved.png
diff --git a/app/res/drawable-xxhdpi/time.png b/app/res/drawable-xxhdpi/time.png
diff --git a/app/res/drawable-xxhdpi/watch.png b/app/res/drawable-xxhdpi/watch.png
diff --git a/app/res/drawable-xxxhdpi/arrow_right.png b/app/res/drawable-xxxhdpi/arrow_right.png
diff --git a/app/res/drawable-xxxhdpi/book.png b/app/res/drawable-xxxhdpi/book.png
diff --git a/app/res/drawable-xxxhdpi/calendar_heart.png b/app/res/drawable-xxxhdpi/calendar_heart.png
diff --git a/app/res/drawable-xxxhdpi/checklist.png b/app/res/drawable-xxxhdpi/checklist.png
diff --git a/app/res/drawable-xxxhdpi/cloud_backup.png b/app/res/drawable-xxxhdpi/cloud_backup.png
diff --git a/app/res/drawable-xxxhdpi/connect_arrow_down.png b/app/res/drawable-xxxhdpi/connect_arrow_down.png
diff --git a/app/res/drawable-xxxhdpi/connect_edittext_cancel.png b/app/res/drawable-xxxhdpi/connect_edittext_cancel.png
diff --git a/app/res/drawable-xxxhdpi/connect_ic_inventory.png b/app/res/drawable-xxxhdpi/connect_ic_inventory.png
diff --git a/app/res/drawable-xxxhdpi/ic_connect_delivery.png b/app/res/drawable-xxxhdpi/ic_connect_delivery.png
diff --git a/app/res/drawable-xxxhdpi/ic_connect_download_green.png b/app/res/drawable-xxxhdpi/ic_connect_download_green.png
diff --git a/app/res/drawable-xxxhdpi/ic_connect_expired.png b/app/res/drawable-xxxhdpi/ic_connect_expired.png
diff --git a/app/res/drawable-xxxhdpi/ic_connect_learning.png b/app/res/drawable-xxxhdpi/ic_connect_learning.png
diff --git a/app/res/drawable-xxxhdpi/ic_connect_new_opportunity.png b/app/res/drawable-xxxhdpi/ic_connect_new_opportunity.png
diff --git a/app/res/drawable-xxxhdpi/mobile_support.png b/app/res/drawable-xxxhdpi/mobile_support.png
diff --git a/app/res/drawable-xxxhdpi/monetary_support.png b/app/res/drawable-xxxhdpi/monetary_support.png
diff --git a/app/res/drawable-xxxhdpi/money.png b/app/res/drawable-xxxhdpi/money.png
diff --git a/app/res/drawable-xxxhdpi/money2.png b/app/res/drawable-xxxhdpi/money2.png
diff --git a/app/res/drawable-xxxhdpi/phone_heart.png b/app/res/drawable-xxxhdpi/phone_heart.png
diff --git a/app/res/drawable-xxxhdpi/report_approved.png b/app/res/drawable-xxxhdpi/report_approved.png
diff --git a/app/res/drawable-xxxhdpi/time.png b/app/res/drawable-xxxhdpi/time.png
diff --git a/app/res/drawable-xxxhdpi/watch.png b/app/res/drawable-xxxhdpi/watch.png
diff --git a/app/res/drawable/baseline_menu_24.xml b/app/res/drawable/baseline_menu_24.xml
@@ -0,0 +1,5 @@
+<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:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/res/drawable/baseline_save_24.xml b/app/res/drawable/baseline_save_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/res/drawable/bottom_shadow.xml b/app/res/drawable/bottom_shadow.xml
@@ -0,0 +1,11 @@
+<!-- bottom_shadow.xml -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:startColor="@color/connect_blue_color_50"
+                android:endColor="@android:color/transparent"
+                android:angle="270" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/res/drawable/cert_1.png b/app/res/drawable/cert_1.png
diff --git a/app/res/drawable/commcare_actionbar_logo.xml b/app/res/drawable/commcare_actionbar_logo.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M17.591,8.821C17.286,7.737 16.584,6.836 15.611,6.287C15.111,6.005 14.57,5.834 14.018,5.775C13.992,5.539 13.95,5.304 13.886,5.071C13.582,3.987 12.879,3.086 11.907,2.537C10.934,1.987 9.809,1.854 8.738,2.162C7.667,2.47 6.777,3.181 6.235,4.166C5.956,4.672 5.788,5.22 5.729,5.779C5.496,5.805 5.264,5.847 5.034,5.912C3.963,6.22 3.073,6.931 2.53,7.916C1.988,8.9 1.856,10.039 2.16,11.124C2.465,12.208 3.167,13.108 4.14,13.658C4.639,13.94 5.181,14.11 5.733,14.17C5.759,14.405 5.801,14.641 5.865,14.873C6.169,15.958 6.872,16.858 7.844,17.408C8.817,17.957 9.942,18.09 11.013,17.782C12.084,17.474 12.974,16.763 13.516,15.778C13.795,15.273 13.963,14.725 14.022,14.165C14.255,14.139 14.487,14.097 14.717,14.032C15.788,13.724 16.678,13.013 17.221,12.029C17.762,11.044 17.893,9.905 17.591,8.821ZM7.498,4.88C7.853,4.238 8.432,3.773 9.132,3.572C9.832,3.371 10.566,3.458 11.201,3.816C11.837,4.175 12.295,4.762 12.494,5.47C12.532,5.606 12.557,5.743 12.574,5.882C12.634,6.365 12.569,6.852 12.378,7.303C12.341,7.391 12.3,7.479 12.252,7.565C12.145,7.76 11.948,8.091 11.711,8.481C10.755,7.868 8.835,6.644 8.203,6.287C7.875,6.102 7.53,5.969 7.176,5.879C7.217,5.532 7.326,5.194 7.498,4.88ZM10.946,9.973C10.946,10.571 10.466,11.057 9.875,11.057C9.284,11.057 8.804,10.571 8.804,9.973C8.804,9.374 9.284,8.889 9.875,8.889C10.466,8.889 10.946,9.374 10.946,9.973ZM6.233,11.666C6.05,11.997 5.919,12.347 5.831,12.705C5.488,12.662 5.154,12.552 4.844,12.377C4.21,12.019 3.75,11.432 3.551,10.723C3.353,10.015 3.438,9.272 3.793,8.629C4.147,7.985 4.727,7.521 5.426,7.32C5.561,7.281 5.696,7.257 5.833,7.239C6.31,7.179 6.792,7.244 7.237,7.437C7.324,7.475 7.411,7.518 7.496,7.566C7.688,7.674 8.015,7.874 8.401,8.114C7.796,9.082 6.587,11.027 6.233,11.666ZM12.251,15.064C11.897,15.706 11.317,16.172 10.617,16.373C9.918,16.574 9.184,16.487 8.548,16.128C7.913,15.77 7.454,15.183 7.256,14.475C7.217,14.339 7.193,14.201 7.176,14.063C7.116,13.58 7.18,13.093 7.37,12.642C7.407,12.553 7.448,12.465 7.497,12.38C7.604,12.185 7.801,11.854 8.038,11.463C8.995,12.076 10.914,13.301 11.547,13.658C11.874,13.843 12.22,13.976 12.574,14.066C12.532,14.412 12.424,14.751 12.251,15.064ZM15.955,11.314C15.601,11.958 15.021,12.422 14.322,12.623C14.188,12.662 14.052,12.686 13.915,12.704C13.438,12.764 12.957,12.699 12.511,12.506C12.424,12.468 12.337,12.426 12.252,12.377C12.06,12.269 11.733,12.069 11.347,11.829C11.953,10.861 13.162,8.918 13.515,8.277C13.698,7.946 13.829,7.596 13.918,7.238C14.26,7.281 14.594,7.391 14.904,7.566C15.538,7.925 15.998,8.511 16.197,9.22C16.395,9.928 16.31,10.673 15.955,11.314Z"
+      android:pathData="M23.757,10.267C23.294,8.635 22.223,7.279 20.741,6.452C19.979,6.028 19.155,5.771 18.313,5.682C18.273,5.327 18.21,4.973 18.112,4.622C17.649,2.99 16.578,1.635 15.096,0.808C13.614,-0.019 11.9,-0.219 10.267,0.244C8.635,0.708 7.28,1.778 6.453,3.26C6.028,4.022 5.772,4.847 5.682,5.689C5.328,5.728 4.973,5.791 4.623,5.889C2.991,6.352 1.635,7.423 0.808,8.905C-0.019,10.387 -0.219,12.101 0.244,13.733C0.708,15.365 1.779,16.721 3.26,17.548C4.022,17.972 4.847,18.229 5.689,18.318C5.728,18.673 5.791,19.027 5.889,19.378C6.353,21.01 7.423,22.365 8.905,23.192C10.387,24.019 12.102,24.219 13.734,23.756C15.366,23.292 16.722,22.222 17.549,20.74C17.973,19.978 18.23,19.153 18.319,18.311C18.674,18.272 19.028,18.209 19.379,18.111C21.011,17.648 22.367,16.577 23.194,15.095C24.018,13.613 24.219,11.899 23.757,10.267ZM8.379,4.335C8.918,3.369 9.802,2.668 10.868,2.366C11.934,2.063 13.053,2.194 14.021,2.734C14.99,3.273 15.688,4.157 15.991,5.223C16.049,5.427 16.086,5.634 16.112,5.843C16.204,6.57 16.106,7.303 15.814,7.982C15.758,8.115 15.695,8.248 15.623,8.376C15.46,8.67 15.159,9.168 14.798,9.755C13.34,8.833 10.415,6.99 9.451,6.452C8.953,6.174 8.427,5.974 7.887,5.839C7.95,5.317 8.115,4.807 8.379,4.335ZM13.632,12.001C13.632,12.902 12.901,13.633 12,13.633C11.099,13.633 10.368,12.902 10.368,12.001C10.368,11.1 11.099,10.369 12,10.369C12.901,10.369 13.632,11.1 13.632,12.001ZM6.451,14.549C6.172,15.047 5.972,15.574 5.837,16.114C5.315,16.048 4.805,15.883 4.333,15.62C3.367,15.08 2.666,14.197 2.364,13.13C2.061,12.064 2.192,10.946 2.732,9.977C3.271,9.009 4.155,8.311 5.221,8.008C5.426,7.949 5.632,7.912 5.841,7.886C6.568,7.795 7.301,7.893 7.98,8.184C8.113,8.241 8.246,8.306 8.374,8.378C8.668,8.541 9.166,8.842 9.754,9.203C8.831,10.661 6.99,13.587 6.451,14.549ZM15.621,19.665C15.081,20.631 14.198,21.332 13.131,21.634C12.065,21.937 10.946,21.806 9.978,21.266C9.01,20.727 8.311,19.843 8.009,18.777C7.95,18.573 7.913,18.366 7.887,18.157C7.795,17.43 7.893,16.697 8.183,16.018C8.239,15.885 8.302,15.752 8.376,15.624C8.54,15.33 8.84,14.832 9.201,14.245C10.659,15.167 13.584,17.01 14.548,17.548C15.046,17.826 15.573,18.026 16.112,18.161C16.049,18.684 15.884,19.193 15.621,19.665ZM21.265,14.02C20.726,14.989 19.842,15.687 18.776,15.99C18.572,16.048 18.365,16.085 18.156,16.111C17.429,16.203 16.696,16.105 16.017,15.813C15.884,15.757 15.751,15.694 15.623,15.62C15.329,15.457 14.831,15.156 14.243,14.795C15.166,13.337 17.009,10.413 17.546,9.449C17.825,8.95 18.025,8.424 18.16,7.884C18.683,7.949 19.192,8.115 19.664,8.378C20.63,8.918 21.331,9.801 21.633,10.867C21.936,11.934 21.805,13.054 21.265,14.02Z"
       android:fillColor="#ffffff"/>
 </vector>
diff --git a/app/res/drawable/connect_edit_text_bg.xml b/app/res/drawable/connect_edit_text_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <padding
+        android:bottom="@dimen/content_start"
+        android:left="@dimen/content_start"
+        android:right="@dimen/content_start"
+        android:top="@dimen/content_start"/>
+    <size android:height="48dp"/>
+    <solid android:color="@color/white"/>
+    <stroke
+        android:color="@color/connect_blue_color_10"
+        android:width="1dp"/>
+    <corners android:radius="5dp"/>
+</shape>
diff --git a/app/res/drawable/connect_right_arrow.xml b/app/res/drawable/connect_right_arrow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M7,0.333L5.825,1.508L10.475,6.166H0.333V7.833H10.475L5.825,12.491L7,13.666L13.667,7L7,0.333Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/res/drawable/connect_rounded_corner_grey.xml b/app/res/drawable/connect_rounded_corner_grey.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/connect_lighter_grey" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/res/drawable/connect_rounded_corner_light_green.xml b/app/res/drawable/connect_rounded_corner_light_green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/connect_light_green" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/res/drawable/connect_rounded_corner_orange_yellow.xml b/app/res/drawable/connect_rounded_corner_orange_yellow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/connect_orange_yellow" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/res/drawable/connect_rounded_corner_teslish_blue.xml b/app/res/drawable/connect_rounded_corner_teslish_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/connect_tealish_blue_color" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/res/drawable/connect_side_icon_bg.xml b/app/res/drawable/connect_side_icon_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="@color/connect_blue_color_10"/>
+    <corners android:radius="5dp"/>
+</shape>
diff --git a/app/res/drawable/enter_code.png b/app/res/drawable/enter_code.png
diff --git a/app/res/drawable/fingerprint.png b/app/res/drawable/fingerprint.png
diff --git a/app/res/drawable/flower.png b/app/res/drawable/flower.png
diff --git a/app/res/drawable/ic_connect_action_overflow.xml b/app/res/drawable/ic_connect_action_overflow.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path
+            android:pathData="M0,0h24v24h-24z"/>
+        <path
+            android:pathData="M12,19.269C11.587,19.269 11.234,19.122 10.941,18.828C10.647,18.535 10.5,18.181 10.5,17.769C10.5,17.357 10.647,17.003 10.941,16.709C11.234,16.416 11.587,16.269 12,16.269C12.413,16.269 12.766,16.416 13.059,16.709C13.353,17.003 13.5,17.357 13.5,17.769C13.5,18.181 13.353,18.535 13.059,18.828C12.766,19.122 12.413,19.269 12,19.269ZM12,13.5C11.587,13.5 11.234,13.353 10.941,13.059C10.647,12.765 10.5,12.412 10.5,12C10.5,11.587 10.647,11.234 10.941,10.941C11.234,10.647 11.587,10.5 12,10.5C12.413,10.5 12.766,10.647 13.059,10.941C13.353,11.234 13.5,11.587 13.5,12C13.5,12.412 13.353,12.765 13.059,13.059C12.766,13.353 12.413,13.5 12,13.5ZM12,7.73C11.587,7.73 11.234,7.584 10.941,7.29C10.647,6.996 10.5,6.643 10.5,6.23C10.5,5.818 10.647,5.465 10.941,5.171C11.234,4.877 11.587,4.73 12,4.73C12.413,4.73 12.766,4.877 13.059,5.171C13.353,5.465 13.5,5.818 13.5,6.23C13.5,6.643 13.353,6.996 13.059,7.29C12.766,7.584 12.413,7.73 12,7.73Z"
+            android:fillColor="#ffffff"/>
+    </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_arrow_back.xml b/app/res/drawable/ic_connect_arrow_back.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path
+            android:pathData="M0,0h24v24h-24z"/>
+        <path
+            android:pathData="M7.373,12.75L13.069,18.446L12,19.5L4.5,12L12,4.5L13.069,5.554L7.373,11.25H19.5V12.75H7.373Z"
+            android:fillColor="#ffffff"/>
+    </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_arrow_forward.xml b/app/res/drawable/ic_connect_arrow_forward.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M12.627,8.75H0.5V7.25H12.627L6.931,1.554L8,0.5L15.5,8L8,15.5L6.931,14.446L12.627,8.75Z"
+      android:fillColor="#3A42C7"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_arrow_forward_24px.xml b/app/res/drawable/ic_connect_arrow_forward_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,3.333L8.825,4.508L13.475,9.166H3.333V10.833H13.475L8.825,15.491L10,16.666L16.667,10L10,3.333Z"
+      android:fillColor="@color/cc_brand_color"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_check_circle.xml b/app/res/drawable/ic_connect_check_circle.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M10.581,16.254L17.304,9.531L16.25,8.477L10.581,14.146L7.731,11.296L6.677,12.35L10.581,16.254ZM12.002,21.5C10.688,21.5 9.453,21.251 8.297,20.752C7.14,20.253 6.135,19.577 5.28,18.722C4.424,17.867 3.747,16.862 3.248,15.706C2.749,14.55 2.5,13.316 2.5,12.002C2.5,10.688 2.749,9.453 3.248,8.297C3.747,7.14 4.423,6.135 5.278,5.28C6.133,4.424 7.138,3.747 8.294,3.248C9.45,2.749 10.684,2.5 11.998,2.5C13.312,2.5 14.547,2.749 15.703,3.248C16.86,3.747 17.865,4.423 18.721,5.278C19.576,6.133 20.253,7.138 20.752,8.294C21.251,9.45 21.5,10.684 21.5,11.998C21.5,13.312 21.251,14.547 20.752,15.703C20.253,16.86 19.577,17.865 18.722,18.721C17.867,19.576 16.862,20.253 15.706,20.752C14.55,21.251 13.316,21.5 12.002,21.5Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_close.xml b/app/res/drawable/ic_connect_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
+      android:fillColor="#D1D5DB"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_delivery_approved.xml b/app/res/drawable/ic_connect_delivery_approved.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,16.17L4.83,12L3.41,13.41L9,19L21,7L19.59,5.59L9,16.17Z"
+      android:fillColor="#16A085"/>
+</vector>