Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a7926cc
Solved smaller screens UI issues
Mar 11, 2025
563b676
Fixed registerReceiver call to include extra flag only when API level…
OrangeAndGreen Mar 12, 2025
5589445
Additional logging for failed HQ token auth in ConnectID-managed apps.
OrangeAndGreen Mar 12, 2025
12faaa8
Added menu overrides to learn and deliver progress pages to handle th…
OrangeAndGreen Mar 12, 2025
8c7af9a
Logging non-fatal exception when the user is shown an empty push noti…
OrangeAndGreen Mar 12, 2025
3bdfffd
Merge pull request #2986 from dimagi/dv/log_empty_notification
OrangeAndGreen Mar 13, 2025
3078ade
Retrieving seatedAppId retrieval inside function that checks for toke…
OrangeAndGreen Mar 13, 2025
e546eb5
Merge branch 'connect_qa' into dv/log_hq_token_auth_failure
OrangeAndGreen Mar 13, 2025
489b81a
Merge pull request #2983 from dimagi/dv/deactivation_crash
OrangeAndGreen Mar 13, 2025
7624441
Using MenuProvider (instead of deprecated override) to handle sync bu…
OrangeAndGreen Mar 13, 2025
283500b
Merge branch 'connect_qa' into dv/log_hq_token_auth_failure
OrangeAndGreen Mar 13, 2025
ce1189a
Improved delivery progress view state adapter to not hold static refe…
OrangeAndGreen Mar 13, 2025
39c62d2
Added code to trust the local status when we download jobs and local …
OrangeAndGreen Mar 14, 2025
06bf7d5
Merge pull request #2984 from dimagi/dv/log_hq_token_auth_failure
OrangeAndGreen Mar 14, 2025
c332af2
Merge pull request #2985 from dimagi/dv/learn_deliver_sync_menu
OrangeAndGreen Mar 14, 2025
f5663df
Merge branch 'connect_qa' of https://github.com/dimagi/commcare-andro…
OrangeAndGreen Mar 14, 2025
06fe132
Merge branch 'connect_qa' into jignesh/fix/ccct-829
OrangeAndGreen Mar 14, 2025
7d9276c
Merge pull request #2989 from dimagi/dv/delivery_progress_ui_fix
OrangeAndGreen Mar 14, 2025
58ba01c
Merge pull request #2980 from dimagi/jignesh/fix/ccct-829
OrangeAndGreen Mar 14, 2025
934d93f
Merge pull request #2990 from dimagi/dv/job_status_fix
OrangeAndGreen Mar 15, 2025
5d887c2
Merge branch 'dv/connect_initial' into connect_qa
OrangeAndGreen Mar 15, 2025
5fcbbb1
Added Swahili translations.
OrangeAndGreen Mar 21, 2025
2a9cae4
Restored lost handling for corrupt payment when parsing API return.
OrangeAndGreen Mar 21, 2025
89a5da2
- fixed some issues on pull
pm-dimagi Mar 26, 2025
a2791bb
- reverted to back commit, fixed issue
pm-dimagi Mar 27, 2025
83b234d
-fix recovery continue button issue
pm-dimagi Mar 28, 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
14 changes: 9 additions & 5 deletions app/res/layout/fragment_connect_delivery_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,23 @@
android:background="@color/connect_darker_blue_color"
android:padding="16dp">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginRight="2dp"
app:layout_constraintEnd_toStartOf="@+id/connect_delivery_button"
app:layout_constraintTop_toTopOf="parent">

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
android:id="@+id/connect_delivery_action_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:text="@string/connect_job_info_start_visit"
android:textColor="@color/white"
android:textSize="16sp"
Expand All @@ -178,12 +181,13 @@
android:id="@+id/connect_delivery_action_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/connect_delivery_action_title"
android:text="@string/connect_job_info_download_delivery"
android:textAlignment="center"
android:textColor="@color/grey"
android:textSize="14sp" />

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<com.google.android.material.button.MaterialButton
android:id="@+id/connect_delivery_button"
Expand Down
379 changes: 196 additions & 183 deletions app/res/layout/fragment_signup.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<string name="form_scan_finished">Escaneo del formulario completado</string>
<string name="access_error">"Error mientras accediendo a %s: "</string>
<string name="manifest_server_error">Respuesta del manifiesto no reporta una version de OpenRosa -- servidor malo?</string>
<string name="root_element_error">Elemento root no es &amp;lt;manifiesto\&gt; -- fue %s</string>
<string name="root_element_error">Elemento root no es &lt;manifest\&gt; -- fue %s</string>
<string name="root_namespace_error">El elemento de root Namespace esta incorrecto: %s</string>
<string name="manifest_tag_error">Al manifiesto %s le fatan una o mas etiquetas: filename, hash, or downloadUrl</string>
<string name="form_download_progress">%1$s. Obteniendo los archivos: %2$s of %3$s</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ License.
<string name="form_scan_finished">Recherche terminée</string>
<string name="access_error">"Erreur lors de l\'accès à %s: "</string>
<string name="manifest_server_error">Réponse Manifest ne fourni pas une version OpenRosa — Serveur défaillant?</string>
<string name="root_element_error">L\'élément à la racine n\'est pas &amp;lt;manifest\&gt; — c\'était %s</string>
<string name="root_element_error">L\'élément à la racine n\'est pas &lt;manifest\&gt; — c\'était %s</string>
<string name="root_namespace_error">" L\'élément Root de Namespace est incorrect: %s"</string>
<string name="manifest_tag_error">L\'entrée Manifest %s manqué un ou plus tags: nom de fichier, hash, ou telécharger Url</string>
<string name="form_download_progress">%1$s. Obtention de fichiers multimédia : %2$s de %3$s</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<string name="form_scan_finished">Formų paieška baigta</string>
<string name="access_error">"Klaida bandant pasiekti %s: "</string>
<string name="manifest_server_error">Manifesto atsakymas nepraneša OpenRosa versijos -- blogas serveris?</string>
<string name="root_element_error">Šakninis elementas nėra &amp;lt;manifest\&gt; -- buvo %s</string>
<string name="root_element_error">Šakninis elementas nėra &lt;manifest\&gt; -- buvo %s</string>
<string name="root_namespace_error">Šakninio elemento vardų erdvė neteisinga: %s</string>
<string name="manifest_tag_error">Manifesto įvestyje %s trūksta vienos ar keleto žymų: filename, hash, arba downloadUrl</string>
<string name="form_download_progress">%1$s. Siunčiami medijos failai: %2$s iš %3$s</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<string name="form_scan_finished">Form scanning completed</string>
<string name="access_error">"Error while accessing %s: "</string>
<string name="manifest_server_error">Manifest reply does not report an OpenRosa version -- bad server?</string>
<string name="root_element_error">Root element is not &amp;lt;manifest\&gt; -- was %s</string>
<string name="root_element_error">Root element is not &lt;manifest\&gt; -- was %s</string>
<string name="root_namespace_error">Root element Namespace is incorrect: %s</string>
<string name="manifest_tag_error">Manifest entry %s is missing one or more tags: filename, hash, or downloadUrl</string>
<string name="form_download_progress">%1$s. Getting media files: %2$s of %3$s</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<string name="form_scan_finished">Completa a varredura de formulários</string>
<string name="access_error">Erro enquanto acessa %s: ""</string>
<string name="manifest_server_error">Manifestar uma resposta quando não ha uma versão do Open Rosa -- servidor ruin?</string>
<string name="root_element_error">Elemento raiz não é &lt;manifest\> -- foi %s</string>
<string name="root_element_error">Elemento raiz não é &lt;manifest\&gt; -- foi %s</string>
<string name="root_namespace_error">Root element Namespace incorreto: %s</string>
<string name="manifest_tag_error">Manifesto %s entrada está faltando uma ou mais tags: arquivo, hash, ou downloadURL</string>
<string name="form_download_progress">%1$s. Acessando arquivos de mídia: %2$s de %3$s</string>
Expand Down
Loading