Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d9da455
Merge remote-tracking branch 'refs/remotes/origin/master' into CCCT-1…
jaypanchal-13 Sep 25, 2025
a3b2cbf
Merge remote-tracking branch 'refs/remotes/origin/master' into CCCT-1…
jaypanchal-13 Sep 25, 2025
75cd3ce
Merge branch 'refs/heads/pn-model-changes' into CCCT-1625-ui-api-pn-h…
jaypanchal-13 Oct 1, 2025
f566219
Merge remote-tracking branch 'refs/remotes/origin/pn-model-changes' i…
jaypanchal-13 Oct 1, 2025
1abad07
Merge remote-tracking branch 'origin/pn-model-changes' into CCCT-1625…
jaypanchal-13 Oct 1, 2025
2074f15
Merge branch 'refs/heads/pn-model-changes' into CCCT-1625-ui-api-pn-h…
jaypanchal-13 Oct 6, 2025
ce328e7
Merge branch 'refs/heads/pn-model-changes' into CCCT-1625-ui-api-pn-h…
jaypanchal-13 Oct 6, 2025
e0112a2
Merge remote-tracking branch 'refs/remotes/origin/master' into CCCT-1…
jaypanchal-13 Oct 7, 2025
12a4a28
ui for pn
jaypanchal-13 Oct 7, 2025
e14419f
coderabbit comment address
jaypanchal-13 Oct 9, 2025
211347c
addressed failed build
jaypanchal-13 Oct 13, 2025
b400a37
Merge remote-tracking branch 'origin/master' into CCCT-1625-ui-api-pn…
jaypanchal-13 Oct 13, 2025
1c38060
addressed comments
jaypanchal-13 Oct 13, 2025
3bbd5d3
minor db changes
jaypanchal-13 Oct 14, 2025
2d31066
removed versioned model from test
jaypanchal-13 Oct 15, 2025
363d7bc
Merge branch 'master' into CCCT-1625-ui-api-pn-history
jaypanchal-13 Oct 15, 2025
fc37575
Created separate helper for push notification api call
Jignesh-dimagi Oct 15, 2025
59c0d18
Merge branch 'CCCT-1625-ui-api-pn-history' of https://github.com/dima…
Jignesh-dimagi Oct 15, 2025
269cce5
Rebase with branch
Jignesh-dimagi Oct 15, 2025
d588dc4
bug solved for update notification api
Jignesh-dimagi Oct 16, 2025
bda0649
Comments resolved
jaypanchal-13 Oct 16, 2025
ebac9f7
updated delivery icon
jaypanchal-13 Oct 17, 2025
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
17 changes: 17 additions & 0 deletions app/res/drawable/ic_dollar_payment_pn.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="38"
android:viewportHeight="38">

<group>

<clip-path android:pathData="M0,0h38v38h-38z" />

<path
android:fillColor="#1C1B1F"
android:pathData="M17.879,29.779H20.041V27.861C21.27,27.694 22.382,27.233 23.377,26.476C24.373,25.721 24.871,24.574 24.871,23.038C24.871,21.929 24.544,20.949 23.89,20.096C23.236,19.244 21.96,18.475 20.06,17.788C18.395,17.22 17.29,16.728 16.744,16.312C16.198,15.895 15.925,15.314 15.925,14.567C15.925,13.82 16.204,13.213 16.764,12.746C17.323,12.279 18.095,12.046 19.079,12.046C19.903,12.046 20.568,12.24 21.073,12.629C21.579,13.017 21.968,13.505 22.24,14.092L24.194,13.306C23.864,12.464 23.324,11.743 22.576,11.143C21.828,10.543 21.01,10.208 20.121,10.139V8.221H17.958V10.139C16.609,10.399 15.572,10.947 14.849,11.782C14.125,12.618 13.763,13.546 13.763,14.567C13.763,15.756 14.123,16.713 14.844,17.438C15.564,18.163 16.739,18.817 18.367,19.402C20.049,20.019 21.199,20.573 21.815,21.063C22.431,21.553 22.739,22.211 22.739,23.038C22.739,24.03 22.381,24.751 21.664,25.201C20.948,25.65 20.139,25.875 19.237,25.875C18.346,25.875 17.549,25.607 16.846,25.072C16.142,24.536 15.602,23.752 15.224,22.721L13.221,23.537C13.631,24.712 14.22,25.646 14.988,26.338C15.757,27.03 16.72,27.511 17.879,27.782V29.779ZM19,34.042C16.921,34.042 14.967,33.646 13.137,32.856C11.307,32.065 9.715,30.993 8.361,29.639C7.007,28.285 5.935,26.693 5.144,24.863C4.354,23.033 3.958,21.079 3.958,19C3.958,16.921 4.354,14.967 5.144,13.137C5.935,11.307 7.007,9.715 8.361,8.361C9.715,7.007 11.307,5.935 13.137,5.144C14.967,4.354 16.921,3.958 19,3.958C21.079,3.958 23.033,4.354 24.863,5.144C26.693,5.935 28.285,7.007 29.639,8.361C30.993,9.715 32.065,11.307 32.856,13.137C33.646,14.967 34.042,16.921 34.042,19C34.042,21.079 33.646,23.033 32.856,24.863C32.065,26.693 30.993,28.285 29.639,29.639C28.285,30.993 26.693,32.065 24.863,32.856C23.033,33.646 21.079,34.042 19,34.042ZM19,31.667C22.536,31.667 25.531,30.44 27.985,27.986C30.44,25.531 31.667,22.536 31.667,19C31.667,15.464 30.44,12.469 27.985,10.015C25.531,7.56 22.536,6.333 19,6.333C15.464,6.333 12.469,7.56 10.015,10.015C7.56,12.469 6.333,15.464 6.333,19C6.333,22.536 7.56,25.531 10.015,27.986C12.469,30.44 15.464,31.667 19,31.667Z" />

</group>

</vector>
33 changes: 30 additions & 3 deletions app/res/layout/activity_push_notification.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.commcare.activities.PushNotificationActivity">

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvNotifications"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/item_push_notification" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvNoNotifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp"
android:gravity="center_horizontal"
android:text="@string/pn_no_notification_found"
android:textColor="@color/black"
android:textSize="20sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
67 changes: 67 additions & 0 deletions app/res/layout/item_push_notification.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/clMain"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivNotification"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/nav_drawer_message_icon" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvNotification"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="20dp"
android:textColor="@color/black"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/ivNotification"
app:layout_constraintEnd_toStartOf="@id/ivForwardArrow"
app:layout_constraintStart_toEndOf="@id/ivNotification"
app:layout_constraintTop_toTopOf="@id/ivNotification"
tools:text="You received 4 new messages. Click here to view it." />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivForwardArrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:src="@drawable/ic_connect_arrow_forward"
app:layout_constraintBottom_toBottomOf="@id/tvNotification"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvNotification" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvTime"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:alpha="0.5"
android:fontFamily="sans-serif-medium"
android:gravity="end"
android:textSize="11sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNotification" />

<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/pn_item_grey_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTime" />

</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 7 additions & 1 deletion app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@
<string name="app_with_id_not_found">La aplicación CommCare requerida no está instalada en el dispositivo</string>
<string name="audio_recording_notification">Notificación de grabación de audio</string>
<string name="user_suspended">El usuario está suspendido. Por favor, contacta al administrador.</string>
<string name="connect_job_list_api_failure">Ocurrió un error al conectar con el servidor.</string>
<string name="connect_payment_acknowledge_notification_yes">Sí</string>
<string name="connect_payment_acknowledge_notification_no">No</string>
<string name="enter_otp">Ingresa el código SMS</string>
Expand Down Expand Up @@ -487,6 +486,7 @@
<string name="personalid_work_history_no_pending_records">No hay registros pendientes en este momento</string>

<string name="personalid_notification">Notificaciones</string>
<string name="pn_no_notification_found">No se encontraron notificaciones</string>

<string name="nav_drawer_signin_register">Iniciar sesión / Registrarse</string>
<string name="nav_drawer_help">Ayuda</string>
Expand All @@ -503,4 +503,10 @@
<string name="setup_refresh_opportunities_no_jobs">No se encontraron oportunidades</string>
<string name="setup_refresh_opportunities_with_jobs">Nuevas oportunidades encontradas, haz clic en Oportunidades para obtener más información.</string>
<string name="personalid_not_login_from_fcm_error">Inicie sesión en PersonalId para ver los detalles.</string>

<string name="just_now">Ahora mismo</string>
<string name="minutes_ago">Hace %1$d minutos</string>
<string name="hours_ago">Hace %1$d horas</string>
<string name="yesterday">Ayer %1$s</string>

</resources>
7 changes: 7 additions & 0 deletions app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ License.
<string name="personalid_work_history_no_pending_records">Il n\'y a aucun enregistrement en attente pour le moment</string>

<string name="personalid_notification">Notifications</string>
<string name="pn_no_notification_found">Aucune notification trouvée</string>

<string name="nav_drawer_signin_register">Se connecter / S’inscrire</string>
<string name="nav_drawer_help">Aide</string>
Expand All @@ -505,4 +506,10 @@ License.
<string name="setup_refresh_opportunities_no_jobs">Aucune opportunité trouvée</string>
<string name="setup_refresh_opportunities_with_jobs">Nouvelles opportunités trouvées, cliquez sur Opportunités pour en savoir plus.</string>
<string name="personalid_not_login_from_fcm_error">Veuillez vous connecter à PersonalId pour voir les détails</string>

<string name="just_now">À l\'instant</string>
<string name="minutes_ago">Il y a %1$d minutes</string>
<string name="hours_ago">Il y a %1$d heures</string>
<string name="yesterday">Hier %1$s</string>

</resources>
8 changes: 7 additions & 1 deletion app/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ License.
<string name="app_with_id_not_found">आवश्यक CommCare एप्लिकेशन डिवाइस पर इंस्टॉल नहीं है</string>
<string name="audio_recording_notification">ऑडियो रिकॉर्डिंग अधिसूचना</string>
<string name="user_suspended">उपयोगकर्ता निलंबित है। कृपया व्यवस्थापक से संपर्क करें।</string>
<string name="connect_job_list_api_failure">सर्वर से कनेक्ट करते समय एक त्रुटि हुई।</string>
<string name="connect_payment_acknowledge_notification_yes">हाँ</string>
<string name="connect_payment_acknowledge_notification_no">नहीं</string>
<string name="enter_otp">SMS कोड दर्ज करें</string>
Expand Down Expand Up @@ -483,6 +482,7 @@ License.
<string name="personalid_work_history_level_12_month_active">12 महीने की\nगतिविधि</string>

<string name="personalid_notification">सूचनाएं</string>
<string name="pn_no_notification_found">कोई सूचना नहीं मिली</string>

<string name="personalid_work_history_no_pending_records">इस समय कोई लंबित रिकॉर्ड नहीं हैं</string>

Expand All @@ -501,4 +501,10 @@ License.
<string name="setup_refresh_opportunities_no_jobs">कोई अवसर नहीं मिला</string>
<string name="setup_refresh_opportunities_with_jobs">नए अवसर मिले, अधिक जानने के लिए अवसर पर क्लिक करें।</string>
<string name="personalid_not_login_from_fcm_error">कृपया विवरण देखने के लिए PersonalId पर लॉगिन करें</string>

<string name="just_now">अभी-अभी</string>
<string name="minutes_ago">"%1$d मिनट पहले"</string>
<string name="hours_ago">"%1$d घंटे पहले"</string>
<string name="yesterday">कल %1$s</string>

</resources>
6 changes: 6 additions & 0 deletions app/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,10 @@
<string name="connect_fetch_learning_progress_error">Nepavyko gauti mokymosi eigos</string>
<string name="connect_fetch_delivery_progress_error">Nepavyko gauti pristatymo eigos</string>
<string name="personalid_not_login_from_fcm_error">Norėdami peržiūrėti išsamią informaciją, prisijunkite prie „PersonalId“.</string>

<string name="just_now">Ką tik</string>
<string name="minutes_ago">Prieš %1$d min.</string>
<string name="hours_ago">Prieš %1$d val.</string>
<string name="yesterday">Vakar %1$s</string>

</resources>
6 changes: 6 additions & 0 deletions app/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,10 @@
<string name="connect_fetch_learning_progress_error">Kunne ikke hente læringsfremdriften</string>
<string name="connect_fetch_delivery_progress_error">Kunne ikke hente leveringsfremdriften</string>
<string name="personalid_not_login_from_fcm_error">Vennligst logg inn på PersonalId for å se detaljene</string>

<string name="just_now">Akkurat nå</string>
<string name="minutes_ago">For %1$d minutter siden</string>
<string name="hours_ago">For %1$d timer siden</string>
<string name="yesterday">I går %1$s</string>

</resources>
7 changes: 7 additions & 0 deletions app/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@
<string name="personalid_work_history_no_pending_records">Não há registros pendentes no momento</string>

<string name="personalid_notification">Notificações</string>
<string name="pn_no_notification_found">Nenhuma notificação encontrada</string>

<string name="nav_drawer_signin_register">Entrar / Registrar-se</string>
<string name="nav_drawer_help">Ajuda</string>
Expand All @@ -511,4 +512,10 @@
<string name="setup_refresh_opportunities_no_jobs">Nenhuma oportunidade encontrada</string>
<string name="setup_refresh_opportunities_with_jobs">Novas oportunidades encontradas, clique em Oportunidades para saber mais.</string>
<string name="personalid_not_login_from_fcm_error">Faça login no PersonalId para ver os detalhes</string>

<string name="just_now">Agora mesmo</string>
<string name="minutes_ago">Há %1$d minutos</string>
<string name="hours_ago">Há %1$d horas</string>
<string name="yesterday">Ontem %1$s</string>

</resources>
7 changes: 7 additions & 0 deletions app/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@
<string name="personalid_work_history_no_pending_records">Hakuna rekodi zinazosubiri kwa sasa</string>

<string name="personalid_notification">Arifa</string>
<string name="pn_no_notification_found">Hakuna arifa zilizopatikana</string>

<string name="nav_drawer_signin_register">Ingia / Jisajili</string>
<string name="nav_drawer_help">Msaada</string>
Expand All @@ -511,4 +512,10 @@
<string name="setup_refresh_opportunities_no_jobs">Hakuna fursa zilizopatikana</string>
<string name="setup_refresh_opportunities_with_jobs">Fursa mpya zimepatikana, bofya Fursa kujifunza zaidi.</string>
<string name="personalid_not_login_from_fcm_error">Tafadhali ingia kwenye Kitambulisho cha Kibinafsi ili kuona maelezo</string>

<string name="just_now">Muda mfupi uliopita</string>
<string name="minutes_ago">Dakika %1$d zilizopita</string>
<string name="hours_ago">Saa %1$d zilizopita</string>
<string name="yesterday">Jana %1$s</string>

</resources>
6 changes: 6 additions & 0 deletions app/res/values-ti/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@
<string name="personalid_work_history_level_12_month_active">12 ኣዋርሕ\nተግባር</string>

<string name="personalid_notification">መፍለጥታትን</string>
<string name="pn_no_notification_found">ዝኾነ መፍለጢ ኣይተረኽበን</string>

<string name="personalid_work_history_no_pending_records">There are no pending records at the moment</string>

Expand All @@ -494,4 +495,9 @@
<string name="nav_drawer_close">መንቀሳቐሲ ድርዕስ ዝግ</string>
<string name="personalid_not_login_from_fcm_error">ዝርዝር ንምርኣይ ናብ PersonalId እቶ</string>

<string name="just_now">ሕጂ ሕጂ</string>
<string name="minutes_ago">ቅድሚ %1$d ደቓይቕ</string>
<string name="hours_ago">ቅድሚ %1$d ሰዓታት</string>
<string name="yesterday">ትማሊ %1$s</string>

</resources>
1 change: 1 addition & 0 deletions app/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
<color name="personal_id_work_history_grey_pending">#F3F4F6</color>
<color name="personal_id_work_history_yellow_pending">#C67E13</color>
<color name="personal_id_work_history_yellow_pending_bg">#FFF4CD</color>
<color name="pn_item_grey_color">#E9E9E9</color>


<color name="ic_backup">#14006C</color>
Expand Down
6 changes: 6 additions & 0 deletions app/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,7 @@
<string name="personalid_work_history_no_pending_records">There are no pending records at the moment</string>

<string name="personalid_notification">Notifications</string>
<string name="pn_no_notification_found">No notifications found</string>

<string name="play_service_update_error">Please make sure Google Play services is supported on the device and is up to date.</string>
<string name="nav_drawer_open">Open navigation drawer</string>
Expand All @@ -683,4 +684,9 @@
<string name="setup_refresh_opportunities_with_jobs">New opportunities found, click on Opportunities to learn more.</string>

<string name="personalid_not_login_from_fcm_error">Please login to PersonalId to view the details</string>

<string name="just_now">Just now</string>
<string name="minutes_ago">%1$d minutes ago</string>
<string name="hours_ago">%1$d hours ago</string>
<string name="yesterday">Yesterday %1$s</string>
</resources>
Loading
Loading