Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7f721be
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
73c4111
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
531d911
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
dc0e227
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
4981ac0
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
c4053de
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
40842a7
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
7a9ce85
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
25d7f1e
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
bcac9bf
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 26, 2025
8b61d08
Fixed merge conflict with master.
conroy-ricketts Dec 29, 2025
23da255
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
ae117be
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
0119f6a
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
975cf37
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
85e0920
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
f19124a
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
712fd1c
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
f1f4d2d
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
4d776b1
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 29, 2025
2f91bc4
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 30, 2025
37530e3
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 30, 2025
eb13ff2
CCCT-2002 Opportunity Card Redesign
conroy-ricketts Dec 30, 2025
e572dae
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
conroy-ricketts Jan 5, 2026
6e40c54
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
conroy-ricketts Jan 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app/res/drawable/ic_connect_warning.xml
Original file line number Diff line number Diff line change
@@ -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="M1.555,17.083L10,2.5L18.445,17.083H1.555ZM3.708,15.833H16.292L10,5L3.708,15.833ZM10,14.84C10.191,14.84 10.351,14.775 10.48,14.646C10.609,14.517 10.673,14.357 10.673,14.167C10.673,13.976 10.609,13.816 10.48,13.687C10.351,13.558 10.191,13.493 10,13.493C9.809,13.493 9.649,13.558 9.52,13.687C9.391,13.816 9.327,13.976 9.327,14.167C9.327,14.357 9.391,14.517 9.52,14.646C9.649,14.775 9.809,14.84 10,14.84ZM9.375,12.66H10.625V8.494H9.375V12.66Z"
android:fillColor="#1F2937"/>
</group>
</vector>
16 changes: 14 additions & 2 deletions app/res/layout-land/home_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,27 @@
android:paddingTop="35dp"
android:paddingEnd="15dp">

<ImageView
android:id="@+id/ivConnectMessageWarningIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_connect_warning"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:paddingEnd="10dp"/>

<TextView
android:id="@+id/tvConnectMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:text="@string/connect_job_tile_daily_limit_description"
android:textColor="@color/connect_warning_color"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
android:textSize="@dimen/text_small"
app:layout_constraintStart_toEndOf="@id/ivConnectMessageWarningIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"/>

Expand Down
21 changes: 17 additions & 4 deletions app/res/layout/fragment_connect_delivery_progress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#e1e0e0"
android:background="@color/connect_background_color"
android:fillViewport="true">

<LinearLayout
Expand All @@ -14,7 +14,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#fff"
android:background="@color/connect_background_color"
android:orientation="vertical">

<ImageView
Expand Down Expand Up @@ -107,6 +107,7 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="-35dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="15dp"
app:cardBackgroundColor="@color/connect_light_orange_color"
app:cardCornerRadius="15dp"
app:cardElevation="10dp">
Expand All @@ -120,16 +121,28 @@
android:paddingTop="35dp"
android:paddingEnd="15dp">

<ImageView
android:id="@+id/ivConnectMessageWarningIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_connect_warning"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:paddingEnd="10dp"/>

<TextView
android:id="@+id/tvConnectMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:text="@string/connect_job_tile_daily_limit_description"
android:textColor="@color/connect_warning_color"
android:textSize="14sp"
android:textSize="@dimen/text_small"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/ivConnectMessageWarningIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
Expand Down
2 changes: 1 addition & 1 deletion app/res/layout/fragment_connect_learning_progress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
android:text="@string/connect_learn_warning_ended"
android:textAlignment="center"
android:textColor="@color/red"
android:visibility="visible" />
android:visibility="gone" />

<com.google.android.material.button.MaterialButton
android:id="@+id/connect_learning_review_button"
Expand Down
16 changes: 14 additions & 2 deletions app/res/layout/home_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,28 @@
android:layout_marginBottom="15dp"
android:paddingEnd="15dp">

<ImageView
android:id="@+id/ivConnectMessageWarningIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_connect_warning"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:paddingEnd="10dp"/>

<TextView
android:id="@+id/tvConnectMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/connect_job_tile_daily_limit_description"
android:layout_marginEnd="10dp"
android:textColor="@color/connect_warning_color"
android:textSize="14sp"
android:textSize="@dimen/text_small"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/ivConnectMessageWarningIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
87 changes: 68 additions & 19 deletions app/res/layout/view_job_card.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,37 @@
android:id="@+id/tv_job_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Infant Child Vaccination By Rama"
tools:text="Infant Child Vaccination By Rama"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"/>
android:textStyle="bold" />

<TextView
android:id="@+id/tv_job_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Check vaccine status"
tools:text="Check vaccine status"
android:textColor="@color/connect_grey"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_job_title"
android:textStyle="bold"/>
app:layout_constraintTop_toBottomOf="@id/tv_job_title"
android:textStyle="bold" />

<TextView
android:id="@+id/connect_job_end_date_sub_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
tools:text="Complete Project by 01/31/2024"
android:textColor="@color/connect_subtext_color"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_job_title" />

<TextView
android:id="@+id/tv_view_more"
Expand All @@ -46,9 +58,47 @@
android:textColor="@color/connect_dark_blue_color"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_job_description"
android:textStyle="bold"/>
app:layout_constraintTop_toBottomOf="@id/tv_job_description"
android:textStyle="bold" />

<com.google.android.material.button.MaterialButton
android:id="@+id/mb_view_info"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="120dp"
android:minHeight="0dp"
android:padding="5dp"
android:layout_marginTop="20dp"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:backgroundTint="@color/connect_light_grey"
android:text="@string/connect_job_info_view_info"
android:textColor="@color/connect_blue_color"
android:textSize="@dimen/text_small"
android:textAllCaps="false"
android:visibility="gone"
app:cornerRadius="20dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_job_description"
app:strokeColor="@color/connect_blue_color" />

<com.google.android.material.button.MaterialButton
android:id="@+id/mb_resume"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="120dp"
android:minHeight="0dp"
android:padding="5dp"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:backgroundTint="@color/connect_blue_color"
android:text="@string/connect_job_info_view_resume"
android:textColor="@color/white"
android:textSize="@dimen/text_small"
android:textAllCaps="false"
android:visibility="gone"
app:cornerRadius="20dp"
app:layout_constraintStart_toEndOf="@id/mb_view_info"
app:layout_constraintTop_toBottomOf="@id/tv_job_description" />

<TextView
android:id="@+id/tvDailyVisitTitle"
Expand All @@ -58,38 +108,37 @@
android:textColor="@color/connect_grey"
android:textSize="12sp"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@+id/tv_job_description"
app:layout_constraintTop_toBottomOf="@id/tv_job_description"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible"
android:textStyle="bold"/>
android:textStyle="bold" />

<TextView
android:id="@+id/tv_job_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="8:00 AM - 5:00 PM"
tools:text="8:00 AM - 5:00 PM"
android:textColor="@color/connect_dark_blue_color"
android:textSize="16sp"
android:layout_marginStart="5dp"
android:gravity="right"
app:layout_constraintStart_toEndOf="@+id/tv_view_more"
android:gravity="end"
app:layout_constraintStart_toEndOf="@id/tv_view_more"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvDailyVisitTitle"
android:textStyle="bold"/>

app:layout_constraintTop_toBottomOf="@id/tvDailyVisitTitle"
android:textStyle="bold" />

<TextView
android:id="@+id/connect_job_end_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="right"
android:text="Complete Project by 01/31/2024"
android:gravity="end"
tools:text="Complete Project by 01/31/2024"
android:textColor="@color/connect_subtext_color"
android:textSize="12sp"
android:layout_marginStart="5dp"
app:layout_constraintStart_toEndOf="@+id/tv_view_more"
app:layout_constraintStart_toEndOf="@id/tv_view_more"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_job_time" />
app:layout_constraintTop_toBottomOf="@id/tv_job_time" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
3 changes: 3 additions & 0 deletions app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@
<string name="connect_learn_need_assessment_title">Formación pendiente</string>
<string name="connect_learn_failed_title">Error en la formación</string>
<string name="connect_learn_complete_by">Proyecto completado por %s</string>
<string name="connect_job_ended">La tarea finalizó el %s</string>
<string name="connect_learn_title">Progreso del aprendizaje</string>
<string name="connect_learn_status">Has completado %d de %d lecciones.\nCompleta el aprendizaje para obtener tu certificado.</string>
<string name="connect_learn_not_started">No has completado ninguna lección. Comienza a aprender para obtener tu certificado.</string>
Expand Down Expand Up @@ -389,6 +390,8 @@
<string name="connect_job_info_start_visit">Comenzar visita</string>
<string name="connect_job_info_download_delivery">Descargar Entrega</string>
<string name="connect_job_info_download">Descargar</string>
<string name="connect_job_info_view_info">Ver información</string>
<string name="connect_job_info_view_resume">Reanudar</string>
<string name="connect_progress">Progreso</string>
<string name="connect_payment">Pago</string>
<string name="connect_delivery_progress_description">No has completado ninguna lección. Comienza tu aprendizaje para obtener tu certificado.</string>
Expand Down
3 changes: 3 additions & 0 deletions app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ License.
<string name="connect_learn_need_assessment_title">Formation en attente</string>
<string name="connect_learn_failed_title">Échec de la formation</string>
<string name="connect_learn_complete_by">Projet terminé par %s</string>
<string name="connect_job_ended">Tâche terminée le %s</string>
<string name="connect_learn_error_starting">Impossible de commencer l\'apprentissage, veuillez contacter l\'administrateur de l\'opportunité.</string>
<string name="connect_learn_title">Progrès d\'apprentissage</string>
<string name="connect_learn_status">Vous avez terminé %d des %d leçons.\nTerminez l\'apprentissage pour obtenir votre certificat.</string>
Expand Down Expand Up @@ -387,6 +388,8 @@ License.
<string name="connect_job_info_start_visit">Commencer la visite</string>
<string name="connect_job_info_download_delivery">Télécharger Livraison</string>
<string name="connect_job_info_download">Télécharger</string>
<string name="connect_job_info_view_info">Voir les informations</string>
<string name="connect_job_info_view_resume">Reprendre</string>
<string name="connect_progress">Progrès</string>
<string name="connect_payment">Paiement</string>
<string name="connect_delivery_progress_description">Vous n\'avez terminé aucune leçon. Commencez votre apprentissage pour obtenir votre certificat.</string>
Expand Down
3 changes: 3 additions & 0 deletions app/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ License.
<string name="connect_learn_need_assessment_title">प्रशिक्षण लंबित</string>
<string name="connect_learn_failed_title">प्रशिक्षण विफल</string>
<string name="connect_learn_complete_by">%s द्वारा परियोजना पूरी की गई</string>
<string name="connect_job_ended">कार्य %s को समाप्त हुआ</string>
<string name="connect_learn_title">सीखने की प्रगति</string>
<string name="connect_learn_status">आपने %d में से %d पाठ पूरे कर लिए हैं।\nअपना प्रमाण पत्र प्राप्त करने के लिए सीखना पूरा करें।</string>
<string name="connect_learn_not_started">आपने कोई पाठ पूरा नहीं किया है। अपना प्रमाण पत्र प्राप्त करने के लिए सीखना शुरू करें।</string>
Expand Down Expand Up @@ -386,6 +387,8 @@ License.
<string name="connect_job_info_start_visit">विज़िट शुरू करें</string>
<string name="connect_job_info_download_delivery">वितरण डाउनलोड करें</string>
<string name="connect_job_info_download">डाउनलोड करें</string>
<string name="connect_job_info_view_info">जानकारी देखें</string>
<string name="connect_job_info_view_resume">फिर से शुरू करें</string>
<string name="connect_progress">प्रगति</string>
<string name="connect_payment">भुगतान</string>
<string name="connect_delivery_progress_description">आपने कोई पाठ पूरा नहीं किया है। अपना प्रमाण पत्र प्राप्त करने के लिए अपना सीखना शुरू करें।</string>
Expand Down
3 changes: 3 additions & 0 deletions app/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
<string name="personalid_tooltip_location_success_message">Naudojame vietos duomenis, kad užtikrintume saugų šios programėlės naudojimą.\n\n<a href="https://www.dimagi.com/terms/latest/privacy/">Spustelėkite čia, jei norite gauti daugiau informacijos.</a></string>

<string name="network_forbidden_error">Prieiga uždrausta. Jei problema išlieka, susisiekite su klientų aptarnavimo tarnyba.</string>
<string name="connect_job_ended">Užduotis baigėsi %s</string>
<string name="connect_job_info_view_info">Žiūrėti informaciją</string>
<string name="connect_job_info_view_resume">Tęsti</string>

<string name="connect_in_progress">Vykdoma</string>
<string name="connect_new_opportunities">Naujos galimybės</string>
Expand Down
Loading