dimagi · OrangeAndGreen · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 9, 2024
diff --git a/README.md b/README.md
@@ -4,6 +4,12 @@ CommCare is an easily customizable, open source mobile platform that supports fr
 
 This repository represents the Android version of CommCare. It depends on the [CommCare Core](https://github.com/dimagi/commcare-core) repository, which contains the XForm engine and case/lookup table implementations.
 
+## End-to-End Development
+
+CommCare Android is a mobile CommCare Platform client runtime, and requires a backend environment for full end-to-end usage and to test platform development.
+
+If you don't have an access to another backend, or if you will be doing full platform development, after completing this setup you can follow [the end-to-end development guide](https://github.com/dimagi/commcare-hq/blob/master/local_dev_guide.rst) which explains how to establish a local environment for CommCare's full client/server software. 
+
 ## Setup
 
 To set up an Android dev environment for commcare-android, do the following:
@@ -34,7 +40,6 @@ git clone https://github.com/dimagi/commcare-core.git
 - Click "OK" to use the Gradle wrapper
 - Wait while Android Studio spins its wheels
 - Download any build dependencies that the SDK Manager tells you you need.
-- Disable _Instant Run_ found in Settings > Build, Execution, Deployment > Instant Run. (It does not play well with multidexing, which we have enabled, or with some of the processes we have set up for Google Services)
 
 ## Building
 

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
@@ -169,7 +169,9 @@ form.entry.incomplete.save.success=Form saved as incomplete
 form.entry.save.error=Sorry, form save failed. Please contact CommCare Support to look into the issue.
 form.entry.save.invalid.unicode=Could not save '${0}' text in form.
 form.entry.finish.button=FINISH
+form.entry.exit.button=EXIT
 form.entry.restart.after.expiration=You were logged out due to session expiration. The form you were in the middle of has been saved and resumed.
+form.entry.restart.after.session.pause=CommCare was closed and the form you were in the middle of has been saved and resumed.
 
 login.attempt.badcred=Username or password are incorrect. Please try again.
 
@@ -899,8 +901,8 @@ repeat.dialog.go.back=Go Back
 repeat.dialog.leave=Do Not Add
 repeat.dialog.exit=Do Not Add. I'm Finished.
 repeat.dialog.add=Add Group
-repeat.dialog.add.another=Add another "${0}" group?
-repeat.dialog.add.new=Add a new "${0}" group?
+repeat.dialog.add.another=Add another ${0}?
+repeat.dialog.add.new=Add a new ${0}?
 lookup.table.missing.error=Unable to find lookup table "${0}". Make sure it exists and this user has access to it.
 
 ethiopian_months=Mäskäräm,T’ïk’ïmt,Hïdar,Tahsas,T’ïr,Yäkatit,Mägabit,Miyaziya,Gïnbot,Säne,Hämle,Nähäse,P’agume

diff --git a/app/build.gradle b/app/build.gradle
@@ -70,7 +70,11 @@ dependencies {
     implementation fileTree(include: '*.jar', exclude: 'regexp-me.jar', dir: 'libs')
     implementation(name: 'htmlspanner-custom', ext: 'aar')
     implementation 'com.github.dimagi:zebra-print-android:v1.3'
-    implementation 'com.simprints:LibSimprints:1.0.12'
+    implementation (name: 'LibSimprints-1.0.12', ext: 'aar')
+    implementation (name: 'mapbox-android-accounts-0.2.0', ext: 'aar')
+    implementation (name: 'realm-android-library-4.1.1', ext: 'aar')
+    implementation (name: 'volley-1.1.0', ext: 'aar')
+    implementation (name: 'storage-2.1.0', ext: 'aar')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -79,7 +83,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.72'
-    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    implementation 'com.google.android.gms:play-services-maps:19.0.0'
     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'
@@ -104,7 +108,7 @@ 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 'com.duolingo.open:rtl-viewpager:2.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'
     }
@@ -119,6 +123,10 @@ dependencies {
 
     implementation('io.ona.kujaku:library:0.9.0') {
         exclude module: 'xpp3'
+        exclude module: 'volley'
+        exclude module: 'storage'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'io.realm'
     }
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
@@ -257,6 +265,7 @@ android {
 
     buildFeatures {
         buildConfig true
+        dataBinding true
     }
 
     defaultConfig {

diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt b/app/instrumentation-tests/src/org/commcare/androidTests/DateWidgetsTests.kt
@@ -29,7 +29,6 @@ import kotlin.math.absoluteValue
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
-@BrowserstackTests
 class DateWidgetsTests : BaseTest() {
     companion object {
         const val CCZ_NAME = "date_widgets_tests.ccz"
@@ -162,4 +161,4 @@ class DateWidgetsTests : BaseTest() {
         val newDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(date)
         return newDate
     }
-}
+}
diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt b/app/instrumentation-tests/src/org/commcare/androidTests/DialogTests.kt
@@ -2,6 +2,7 @@ package org.commcare.androidTests
 
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -44,15 +45,16 @@ class DialogTests: BaseTest() {
         onView(withId(R.id.nav_btn_next))
                 .perform(click())
 
-        withText("Add a new \"Error on add\" group?").isDisplayed()
+        onView(withId(R.id.choice_dialog_panel_2)).check(matches(withText("Add a new Error on add?")))
 
         InstrumentationUtility.rotateLeft()
         //TODO Expect dialog to not persist due to a activity lifecycle bug in our dialog framework.
-        withText("Add a new \"Error on add\" group?").doesNotExist()
+        withText(R.id.choice_dialog_panel_2).doesNotExist()
+
         InstrumentationUtility.rotatePortrait()
         onView(withId(R.id.nav_btn_next))
                 .perform(click())
-        onView(withText("ADD GROUP"))
+        onView(withId(R.id.choice_dialog_panel_2))
                 .perform(click())
 
         checkDialogExistence_withRotation("Error Occurred")

diff --git a/app/libs/LibSimprints-1.0.12.aar b/app/libs/LibSimprints-1.0.12.aar
diff --git a/app/libs/mapbox-android-accounts-0.2.0.aar b/app/libs/mapbox-android-accounts-0.2.0.aar
diff --git a/app/libs/realm-android-library-4.1.1.aar b/app/libs/realm-android-library-4.1.1.aar
diff --git a/app/libs/rtl-viewpager-2.0.0.aar b/app/libs/rtl-viewpager-2.0.0.aar
diff --git a/app/libs/storage-2.1.0.aar b/app/libs/storage-2.1.0.aar
diff --git a/app/libs/volley-1.1.0.aar b/app/libs/volley-1.1.0.aar
diff --git a/app/proguard-multidex.pro b/app/proguard-multidex.pro
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-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-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-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-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-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/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/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/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/connect_dark_blue_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>
diff --git a/app/res/drawable/ic_connect_delivery_check_circle.xml b/app/res/drawable/ic_connect_delivery_check_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="13dp"
+    android:height="13dp"
+    android:viewportWidth="13"
+    android:viewportHeight="13">
+  <path
+      android:pathData="M5.387,9.169L9.869,4.687L9.167,3.985L5.387,7.764L3.487,5.864L2.785,6.567L5.387,9.169ZM6.334,12.667C5.458,12.667 4.635,12.5 3.864,12.168C3.094,11.836 2.423,11.384 1.853,10.814C1.283,10.245 0.831,9.574 0.499,8.804C0.166,8.034 0,7.21 0,6.334C0,5.458 0.166,4.635 0.499,3.864C0.831,3.094 1.282,2.423 1.852,1.853C2.422,1.283 3.092,0.831 3.863,0.499C4.633,0.166 5.456,0 6.332,0C7.208,0 8.032,0.166 8.802,0.499C9.573,0.831 10.244,1.282 10.814,1.852C11.384,2.422 11.835,3.092 12.168,3.863C12.5,4.633 12.667,5.456 12.667,6.332C12.667,7.208 12.5,8.032 12.168,8.802C11.836,9.573 11.384,10.244 10.814,10.814C10.245,11.384 9.574,11.835 8.804,12.168C8.034,12.5 7.21,12.667 6.334,12.667ZM6.333,11.667C7.822,11.667 9.083,11.15 10.117,10.117C11.15,9.083 11.667,7.822 11.667,6.333C11.667,4.844 11.15,3.583 10.117,2.55C9.083,1.517 7.822,1 6.333,1C4.844,1 3.583,1.517 2.55,2.55C1.517,3.583 1,4.844 1,6.333C1,7.822 1.517,9.083 2.55,10.117C3.583,11.15 4.844,11.667 6.333,11.667Z"
+      android:fillColor="#3A42C7"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_delivery_pending.xml b/app/res/drawable/ic_connect_delivery_pending.xml
@@ -0,0 +1,10 @@
+<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="M11.99,2C6.47,2 2,6.48 2,12C2,17.52 6.47,22 11.99,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 11.99,2ZM12,20C7.58,20 4,16.42 4,12C4,7.58 7.58,4 12,4C16.42,4 20,7.58 20,12C20,16.42 16.42,20 12,20ZM11,13.07L16.49,16.36L17.51,14.64L13,11.93V6.42H11V13.07Z"
+      android:fillColor="#9CA3AF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_delivery_progress.png b/app/res/drawable/ic_connect_delivery_progress.png
diff --git a/app/res/drawable/ic_connect_delivery_rejected.xml b/app/res/drawable/ic_connect_delivery_rejected.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="#EA6944"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_directory_sync.xml b/app/res/drawable/ic_connect_directory_sync.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <group>
+    <clip-path
+        android:pathData="M0,0h20v20h-20z"/>
+    <path
+        android:pathData="M4.667,14.458C4.139,13.833 3.736,13.139 3.458,12.375C3.181,11.611 3.042,10.819 3.042,10C3.042,8.014 3.785,6.357 5.271,5.031C6.757,3.705 8.514,3.042 10.542,3.042V1.916L13.271,3.958L10.542,6V4.875C9.014,4.875 7.688,5.361 6.563,6.333C5.438,7.305 4.875,8.528 4.875,10C4.875,10.625 4.983,11.222 5.198,11.792C5.413,12.361 5.722,12.882 6.125,13.354L4.667,14.458ZM9.458,18.083L6.729,16.042L9.458,14V15.125C10.986,15.125 12.313,14.639 13.438,13.667C14.563,12.694 15.125,11.472 15.125,10C15.125,9.375 15.017,8.774 14.802,8.198C14.587,7.621 14.278,7.097 13.875,6.625L15.333,5.521C15.861,6.146 16.264,6.84 16.542,7.604C16.819,8.368 16.958,9.167 16.958,10C16.958,11.986 16.215,13.642 14.729,14.969C13.243,16.295 11.486,16.958 9.458,16.958V18.083Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_job_logo.png b/app/res/drawable/ic_connect_job_logo.png
diff --git a/app/res/drawable/ic_connect_pager_indicator.xml b/app/res/drawable/ic_connect_pager_indicator.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <item android:gravity="center">
+        <shape>
+            <size
+                android:width="40dp"
+                android:height="4dp" />
+
+            <corners
+                android:topLeftRadius="5dp"
+                android:topRightRadius="5dp" />
+
+            <solid android:color="#FF0000" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/res/drawable/ic_connect_payment_earned.xml b/app/res/drawable/ic_connect_payment_earned.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="42dp"
+    android:height="42dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M6.702,18.577L13.96,20.631L19.929,18.781C19.878,18.554 19.772,18.38 19.611,18.259C19.451,18.138 19.27,18.077 19.067,18.077H14.17C13.734,18.077 13.363,18.06 13.058,18.027C12.753,17.994 12.439,17.921 12.117,17.808L9.86,17.062L10.304,15.592L12.329,16.296C12.631,16.399 12.981,16.469 13.377,16.506C13.773,16.543 14.337,16.567 15.067,16.577C15.067,16.33 15.012,16.116 14.9,15.937C14.788,15.757 14.642,15.636 14.46,15.573L8.658,13.442C8.638,13.436 8.621,13.431 8.605,13.428C8.589,13.425 8.571,13.423 8.552,13.423H6.702V18.577ZM1.702,21.5V11.923H8.54C8.646,11.923 8.752,11.935 8.859,11.958C8.967,11.981 9.067,12.008 9.16,12.039L14.986,14.185C15.44,14.353 15.817,14.65 16.117,15.076C16.417,15.502 16.567,16.003 16.567,16.577H19.067C19.785,16.577 20.37,16.809 20.822,17.272C21.274,17.736 21.5,18.337 21.5,19.077V19.885L14.009,22.212L6.702,20.127V21.5H1.702ZM3.202,20H5.202V13.423H3.202V20Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M16.5,9.5m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>