dimagi · OrangeAndGreen · Jul 31, 2025 · Jul 16, 2025 · Jul 16, 2025 · Jul 16, 2025
diff --git a/app/res/layout/dialog_payment_confirmation.xml b/app/res/layout/dialog_payment_confirmation.xml
@@ -1,88 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="20dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    android:orientation="vertical"
+    android:padding="10dp">
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:background="@color/white"
         android:layout_height="wrap_content"
-        android:padding="16dp">
-
-        <ImageView
-            android:id="@+id/img_payment_status"
-            android:layout_width="33dp"
-            android:layout_height="33dp"
-            android:src="@drawable/ic_connect_payment_status_transferred"
-            android:contentDescription="@null"
-            android:importantForAccessibility="no"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:cardCornerRadius="20dp"
+        android:padding="10dp">
 
-        <TextView
-            android:id="@+id/tv_payment_confirmation_title"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:background="@color/white"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:textColor="@color/grey_dark"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="@+id/img_payment_status"
-            app:layout_constraintStart_toEndOf="@+id/img_payment_status"
-            app:layout_constraintTop_toTopOf="@+id/img_payment_status"
-            tools:text="@string/connect_payment_confirm_transferred"
-            android:textStyle="bold"/>
+            android:padding="16dp">
 
-        <TextView
-            android:id="@+id/tv_payment_amount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/black"
-            android:textSize="26sp"
-            app:layout_constraintStart_toStartOf="@+id/tv_payment_confirmation_title"
-            app:layout_constraintTop_toBottomOf="@+id/tv_payment_confirmation_title"
-            android:textStyle="bold"/>
+            <ImageView
+                android:id="@+id/img_payment_status"
+                android:layout_width="33dp"
+                android:layout_height="33dp"
+                android:src="@drawable/ic_connect_payment_status_transferred"
+                android:contentDescription="@null"
+                android:importantForAccessibility="no"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_payment_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textColor="@color/grey_dark"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="@+id/tv_payment_confirmation_title"
-            app:layout_constraintTop_toBottomOf="@+id/tv_payment_amount" />
+            <TextView
+                android:id="@+id/tv_payment_confirmation_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:textColor="@color/grey_dark"
+                android:textSize="16sp"
+                app:layout_constraintBottom_toBottomOf="@+id/img_payment_status"
+                app:layout_constraintStart_toEndOf="@+id/img_payment_status"
+                app:layout_constraintTop_toTopOf="@+id/img_payment_status"
+                tools:text="@string/connect_payment_confirm_transferred"
+                android:textStyle="bold"/>
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="15dp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_payment_date">
+            <TextView
+                android:id="@+id/tv_payment_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/black"
+                android:textSize="26sp"
+                app:layout_constraintStart_toStartOf="@+id/tv_payment_confirmation_title"
+                app:layout_constraintTop_toBottomOf="@+id/tv_payment_confirmation_title"
+                android:textStyle="bold"/>
 
-            <com.google.android.material.button.MaterialButton
-                style="@style/NegativeButtonStyle"
-                android:id="@+id/ri_no"
+            <TextView
+                android:id="@+id/tv_payment_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:text="@string/connect_payment_dialog_no"
-                 />
+                android:layout_marginTop="4dp"
+                android:textColor="@color/grey_dark"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="@+id/tv_payment_confirmation_title"
+                app:layout_constraintTop_toBottomOf="@+id/tv_payment_amount" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/ri_yes"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/connect_payment_dialog_yes"
-                android:textColor="@color/white"
-                />
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="15dp"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_payment_date">
+
+                <com.google.android.material.button.MaterialButton
+                    style="@style/NegativeButtonStyle"
+                    android:id="@+id/ri_no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/connect_payment_dialog_no"
+                     />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/ri_yes"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/connect_payment_dialog_yes"
+                    android:textColor="@color/white"
+                    />
 
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
+            </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</LinearLayout>
diff --git a/app/res/layout/fragment_connect_learning_progress.xml b/app/res/layout/fragment_connect_learning_progress.xml
@@ -211,7 +211,7 @@
                     android:layout_marginTop="16dp"
                     android:text="@string/connect_learn_certificate"
                     android:textAlignment="center"
-                    android:textColor="@color/connect_aquva" />
+                    android:textColor="@color/connect_aqua" />
 
                 <TextView
                     android:id="@+id/connect_learn_cert_subject"

diff --git a/app/res/layout/fragment_connect_progress_delivery.xml b/app/res/layout/fragment_connect_progress_delivery.xml
@@ -90,6 +90,9 @@
                             android:layout_marginBottom="20dp"
                             android:indeterminateOnly="false"
                             android:progressDrawable="@drawable/progress_ring"
+                            app:strokeWidth="15dp"
+                            app:progressColor="@color/connect_aqua"
+                            app:progressBackgroundColor="@color/connect_blackist_dark_blue_color"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/res/values-es/strings.xml b/app/res/values-es/strings.xml
@@ -334,6 +334,7 @@
     <string name="connect_progress_warning_daily_max_reached_single">Has alcanzado el número máximo de visitas de hoy. Es posible que no obtengas progreso por trabajo adicional.</string>
     <string name="connect_progress_warning_max_reached_multi">Has alcanzado el número máximo de visitas para %s.</string>
     <string name="connect_progress_warning_daily_max_reached_multi">Has alcanzado tu límite diario de %s.</string>
+    <string name="connect_download_learn">Descargar la aplicación Aprender</string>
     <string name="connect_downloading_learn">Descargando la aplicación Aprender</string>
     <string name="connect_downloading_delivery">Descargando la aplicación de Entrega</string>
     <string name="connect_results_summary_earned">Ganado</string>

diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml
@@ -333,6 +333,7 @@ License.
     <string name="connect_progress_warning_daily_max_reached_single">Vous avez atteint le nombre maximal de visites pour aujourd\'hui. Vous ne pourrez peut-être plus accéder aux tâches suivantes.</string>
     <string name="connect_progress_warning_max_reached_multi">Vous avez atteint le nombre maximum de visites pour %s.</string>
     <string name="connect_progress_warning_daily_max_reached_multi">Vous avez atteint votre limite quotidienne de %s.</string>
+    <string name="connect_download_learn">Téléchargez l\'application Apprendre</string>
     <string name="connect_downloading_learn">Téléchargement de l\'application Learn</string>
     <string name="connect_downloading_delivery">Téléchargement de l\'application de livraison</string>
     <string name="connect_results_summary_earned">Gagné</string>

diff --git a/app/res/values-hi/strings.xml b/app/res/values-hi/strings.xml
@@ -332,6 +332,7 @@ License.
     <string name="connect_progress_warning_daily_max_reached_single">आप आज के लिए अधिकतम विज़िट संख्या तक पहुँच चुके हैं। हो सकता है कि आप आगे कोई कार्य एक्सेस न कर पाएँ।</string>
     <string name="connect_progress_warning_max_reached_multi">आप %s के लिए अधिकतम विज़िट तक पहुँच गए हैं।</string>
     <string name="connect_progress_warning_daily_max_reached_multi">आप %s के लिए अपनी दैनिक सीमा तक पहुँच गए हैं।</string>
+    <string name="connect_download_learn">लर्न ऐप डाउनलोड करें</string>
     <string name="connect_downloading_learn">Learn ऐप डाउनलोड हो रहा है</string>
     <string name="connect_downloading_delivery">वितरण ऐप डाउनलोड हो रहा है</string>
     <string name="connect_results_summary_earned">अर्जित</string>

diff --git a/app/res/values-pt/strings.xml b/app/res/values-pt/strings.xml
@@ -343,6 +343,7 @@
     <string name="connect_progress_warning_daily_max_reached_single">Atingiu o número máximo de visitas para hoje. Talvez não consiga aceder a mais tarefas.</string>
     <string name="connect_progress_warning_max_reached_multi">Você atingiu o número máximo de visitas para %s. </string>
     <string name="connect_progress_warning_daily_max_reached_multi">Atingiu o seu limite diário para %s.</string>
+    <string name="connect_download_learn">Baixe o Aplicativo Aprenda</string>
     <string name="connect_downloading_learn">Descarregamento da aplicação Learn</string>
     <string name="connect_downloading_delivery">Baixando o aplicativo de entrega</string>
     <string name="connect_results_summary_earned">Ganhos</string>

diff --git a/app/res/values-sw/strings.xml b/app/res/values-sw/strings.xml
@@ -336,6 +336,7 @@
     <string name="connect_progress_warning_daily_max_reached_single">Umefikia idadi yako ya juu zaidi ya kutembelewa leo. Huenda usiweze kufikia majukumu yoyote zaidi.</string>
     <string name="connect_progress_warning_max_reached_multi">Umefikia idadi ya juu zaidi ya kutembelewa kwa %s.</string>
     <string name="connect_progress_warning_daily_max_reached_multi">Umefikia kikomo chako cha kila siku kwa %s.</string>
+    <string name="connect_download_learn">Pakua Programu ya Jifunze</string>
     <string name="connect_downloading_learn">Inapakua Programu ya Jifunze</string>
     <string name="connect_downloading_delivery">Inapakua Programu ya Uwasilishaji</string>
     <string name="connect_results_summary_earned">Imelipwa</string>

diff --git a/app/res/values-ti/strings.xml b/app/res/values-ti/strings.xml
@@ -327,6 +327,7 @@
     <string name="connect_progress_warning_daily_max_reached_single">ንሎሚ ዝለዓለ ቁፅሪ ምብፃሕ በፂሕኩም ኣለኹም። ንተወሳኺ ስራሕ ዝኾነ ምዕባለ ኣይትረክብን ኢኻ።</string>
     <string name="connect_progress_warning_max_reached_multi">ን %s ዝለዓለ ቁፅሪ ምብፃሕ በፂሕካ ኣለኻ። </string>
     <string name="connect_progress_warning_daily_max_reached_multi">ንመዓልታዊ ገደብ %s በፂሕካ ኣለኻ።</string>
+    <string name="connect_download_learn">Download ተማሃሩ ኣፕ</string>
     <string name="connect_downloading_learn">ምውራድ ( Downloading ) ናይ ትምህርቲ ኣፕ ( App )</string>
     <string name="connect_downloading_delivery">ናይ ምብፃሕ ኣፕ ( App ) ምውራድ</string>
     <string name="connect_results_summary_earned">ዝረኸበ</string>

diff --git a/app/res/values/attrs.xml b/app/res/values/attrs.xml
@@ -136,4 +136,10 @@
         <attr name="face_marker_color" format="color" />
         <attr name="countdown_text_size" format="dimension" />
     </declare-styleable>
+
+    <declare-styleable name="CircleProgressBar">
+        <attr name="progressColor" format="color" />
+        <attr name="progressBackgroundColor" format="color" />
+        <attr name="strokeWidth" format="dimension" />
+    </declare-styleable>
 </resources>
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
@@ -193,7 +193,7 @@
     <color name="connect_grey">#9A9A9A</color>
     <color name="connect_divider_color">#E5E7EB</color>
     <color name="connect_background_color">#f7f9fa</color>
-    <color name="connect_aquva">#88BEE1</color>
+    <color name="connect_aqua">#88BEE1</color>
     <color name="connect_green">#16A085</color>
     <color name="connect_light_green">#E6F5E5</color>
     <color name="connect_red">#EA6944</color>

diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -442,6 +442,7 @@
     <string name="connect_progress_warning_daily_max_reached_single">You have reached the maximum number of visits for today. You may not earn any progress for additional work.</string>
     <string name="connect_progress_warning_max_reached_multi">You have reached the maximum number of visits for %s. </string>
     <string name="connect_progress_warning_daily_max_reached_multi">You have reached your daily limit for %s.</string>
+    <string name="connect_download_learn">Download Learn App</string>
     <string name="connect_downloading_learn">Downloading Learn App</string>
     <string name="connect_downloading_delivery">Downloading Delivery App</string>
     <string name="connect_results_summary_all">All</string>

diff --git a/app/src/org/commcare/CommCareApplication.java b/app/src/org/commcare/CommCareApplication.java
@@ -34,7 +34,6 @@
 import org.commcare.android.logging.ForceCloseLogEntry;
 import org.commcare.android.logging.ForceCloseLogger;
 import org.commcare.android.logging.ReportingUtils;
-import org.commcare.connect.ConnectJobHelper;
 import org.commcare.connect.database.ConnectUserDatabaseUtil;
 import org.commcare.core.graph.util.GraphUtil;
 import org.commcare.core.interfaces.HttpResponseProcessor;
@@ -211,6 +210,8 @@ public class CommCareApplication extends Application implements LifecycleEventOb
 
     private boolean backgroundSyncSafe;
 
+    private int connectJobIdForAnalytics = -1;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -442,13 +443,16 @@ synchronized public FirebaseAnalytics getAnalyticsInstance() {
             analyticsInstance.setUserProperty("user_cid", user.getUserId());
         }
 
-        ConnectJobRecord activeJob = ConnectJobHelper.INSTANCE.getActiveJob();
-        if (activeJob != null) {
-            analyticsInstance.setUserProperty("ccc_job_id", String.valueOf(activeJob.getJobId()));
+        if (connectJobIdForAnalytics > 0) {
+            analyticsInstance.setUserProperty("ccc_job_id", String.valueOf(connectJobIdForAnalytics));
         }
         return analyticsInstance;
     }
 
+    public void setConnectJobIdForAnalytics(@Nullable ConnectJobRecord job) {
+        connectJobIdForAnalytics = job != null ? job.getJobId() : -1;
+    }
+
     public int[] getCommCareVersion() {
         String[] components = BuildConfig.VERSION_NAME.split("\\.");
         int[] versions = new int[]{0, 0, 0};

diff --git a/app/src/org/commcare/activities/DispatchActivity.java b/app/src/org/commcare/activities/DispatchActivity.java
@@ -11,8 +11,10 @@
 import org.commcare.AppUtils;
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
+import org.commcare.android.database.connect.models.ConnectJobRecord;
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.android.database.user.models.SessionStateDescriptor;
+import org.commcare.connect.ConnectJobHelper;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.dalvik.R;
 import org.commcare.preferences.DeveloperPreferences;
@@ -206,7 +208,8 @@ private void dispatch() {
                     ConnectNavHelper.INSTANCE.goToConnectJobsList(this);
                 } else if(redirectToConnectOpportunityInfo) {
                     redirectToConnectOpportunityInfo = false;
-                    ConnectNavHelper.INSTANCE.goToActiveInfoForJob(this, true);
+                    ConnectJobRecord job = ConnectJobHelper.INSTANCE.getJobForSeatedApp(this);
+                    ConnectNavHelper.INSTANCE.goToActiveInfoForJob(this, job, true);
                 } else {
                     launchHomeScreen();
                 }