Add Exit Dialog #3487

hamza-vd · 2024-09-11T12:20:09Z

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #3479

Engineer Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have updated the CHANGELOG.md file for any notable changes to the codebase
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

I have verified Unit tests have been written for any new feature(s) and edge cases
I have verified any strings visible on UI components are in the strings.xml file
I have verifed the CHANGELOG.md file has any notable changes to the codebase
I have verified the solution has been implemented in a configurable and generic way for reuseable components
I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

codecov · 2024-09-11T12:37:39Z

Codecov Report

Attention: Patch coverage is 6.66667% with 14 lines in your changes missing coverage. Please review.

Project coverage is 27.2%. Comparing base (8cf03cf) to head (c04f509).

Files with missing lines	Patch %	Lines
...register/fhircore/quest/ui/main/AppMainActivity.kt	6.6%	14 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              main   #3487     +/-   ##
=========================================
- Coverage     27.2%   27.2%   -0.1%     
  Complexity     756     756             
=========================================
  Files          278     278             
  Lines        14219   14234     +15     
  Branches      2581    2582      +1     
=========================================
+ Hits          3880    3881      +1     
- Misses        9801    9815     +14     
  Partials       538     538

Flag	Coverage Δ
engine	`63.8% <ø> (ø)`
geowidget	`15.4% <ø> (ø)`
quest	`5.6% <6.6%> (+<0.1%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
...register/fhircore/quest/ui/main/AppMainActivity.kt	`5.1% <6.6%> (+0.1%)`	⬆️

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt

hamza-vd · 2024-09-12T08:28:57Z

Dialog content

# Conflicts: # android/quest/src/main/res/values/strings.xml

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt

ellykits · 2024-10-04T08:50:38Z

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt

+          if (
+            navController.currentDestination?.id?.equals(R.id.geoWidgetLauncherFragment)!! ||
+              navController.currentDestination?.id?.equals(R.id.registerFragment)!!
+          ) {


I understand this implementation is based on the assumption that the entry point to the app can either be the map or register. However, a user can redirect to a register screen from the profile using the onSubmitQuestionnaire actions. Would it be possible to check if there is no more entry in the navController back stack instead to prompt this dialog?

Condition updated

ellykits

Looks good, see my comment.

* Add date service to rules engine facts map (#3519) * Add summary mode (#3500) Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor PDF config properties in QuestionnaireConfig (#3498) * Refactor to use PdfConfig Initially using QuestionnaireConfig for simplicity. * Process multi QRs in HtmlPopulator * Add new tag to check if Questionnaire has been submitted * Remove subjectType since subjectReference is used * Fix test and spotless * Address review * spotless * Cleanup * spotless * Fix test --------- Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix error validation highlighting not working when submit button is clicked bug (#3525) * Change progress bar color to blue (#3428) * update in-progress color on the map view. (#3529) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add medication sort custom search param (#3534) * Add medication sort custom search param * Run spotlessApply * Fix failing time based test * Pld docs adjustment (#3540) * sync typo * correct heading title * update header definition for p2p * upgrade packages * Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526) * Don't show no results dialogue on map when locations selected on multiselect. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing tests. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add Exit Dialog (#3487) * Add exit dialog * Fix a typo * Show Dialog only when Map or Register is visible * PR feedback changes * Fix failing check * Remove incorrect test * Refactor dialog condition logic --------- Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Refactor working with bitmap images Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * Configure submit anyway button (#3535) * Update the Burundi EUSM flavor (#3553) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * - Update the flavor naming - Update the documentation * - Update the flavors section of the documentation to clarify on the naming convention * Bum p up data capture version (#3547) * Map search bug fixes (#3516) * - Updating the infinite scroll paging - Updating the behaviour after clearing search bar on the maps * - spotless apply * - Fix breaking tests on geo widget module * - Fix tests * - Run spotless * - Import `LazyPagingItems` * - Adding tests * - Update the APK naming * Ignore test to be refactored later Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Run spotless * Update kujaku version. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix loading related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke>

* Include listRepositoryResourceDataMap to nested list widgets Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix loading related resources data for List widget Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor loading bitmap images (#3546) * Add date service to rules engine facts map (#3519) * Add summary mode (#3500) Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor PDF config properties in QuestionnaireConfig (#3498) * Refactor to use PdfConfig Initially using QuestionnaireConfig for simplicity. * Process multi QRs in HtmlPopulator * Add new tag to check if Questionnaire has been submitted * Remove subjectType since subjectReference is used * Fix test and spotless * Address review * spotless * Cleanup * spotless * Fix test --------- Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix error validation highlighting not working when submit button is clicked bug (#3525) * Change progress bar color to blue (#3428) * update in-progress color on the map view. (#3529) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add medication sort custom search param (#3534) * Add medication sort custom search param * Run spotlessApply * Fix failing time based test * Pld docs adjustment (#3540) * sync typo * correct heading title * update header definition for p2p * upgrade packages * Update Geowidget to only show the Set Location dialog if no Locations to sync by have been selected (#3526) * Don't show no results dialogue on map when locations selected on multiselect. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing tests. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Add Exit Dialog (#3487) * Add exit dialog * Fix a typo * Show Dialog only when Map or Register is visible * PR feedback changes * Fix failing check * Remove incorrect test * Refactor dialog condition logic --------- Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> * Refactor working with bitmap images Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Add the EUSM Burundi flavour and Rename the existing EUSM flavour (#3548) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * Configure submit anyway button (#3535) * Update the Burundi EUSM flavor (#3553) * - Add the EUSM Burundi flavour - Rename the exisiting EUSM flavour * - Update the app naming * - update the flavour naming * - Update the flavor naming - Update the documentation * - Update the flavors section of the documentation to clarify on the naming convention * Bum p up data capture version (#3547) * Map search bug fixes (#3516) * - Updating the infinite scroll paging - Updating the behaviour after clearing search bar on the maps * - spotless apply * - Fix breaking tests on geo widget module * - Fix tests * - Run spotless * - Import `LazyPagingItems` * - Adding tests * - Update the APK naming * Ignore test to be refactored later Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * - Run spotless * Update kujaku version. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix loading related resources Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix failing UI tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Interpolate conditionalFhirPathExpressions in listResource (#3538) To pass in evaluated rule variables Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix apply stack tint. Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Apply opacity on view properties. (#3564) Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> * Fix duplication of List view item Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Signed-off-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: Rkareko <47570855+Rkareko@users.noreply.github.com> Co-authored-by: FikriMilano <fikrimilano1@gmail.com> Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com> Co-authored-by: Peter Lubell-Doughtie <peter@ona.io> Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com> Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com> Co-authored-by: Lentumunai-Mark <lentumunai.mark@students.jkuat.ac.ke> Co-authored-by: L≡ZRS <12814349+LZRS@users.noreply.github.com>

Add exit dialog

16adf1c

hamza-vd requested a review from ellykits September 11, 2024 12:20

hamza-vd changed the title ~~Add exit dialog~~ Add Exit Dialog Sep 11, 2024

hamza-vd marked this pull request as draft September 11, 2024 12:22

hamza-vd assigned hamza-vd and unassigned hamza-vd Sep 11, 2024

Fix a typo

623987c

ellykits requested changes Sep 12, 2024

View reviewed changes

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt Outdated Show resolved Hide resolved

hamza-vd added 2 commits September 12, 2024 17:24

Merge branch 'main' into issue-3479

d5d9b74

Merge branch 'main' into issue-3479

a4697bb

hamza-vd marked this pull request as ready for review September 16, 2024 06:34

hamza-vd and others added 6 commits September 16, 2024 14:48

Show Dialog only when Map or Register is visible

53cd81e

Merge branch 'main' into issue-3479

f87f8dc

Merge branch 'main' into issue-3479

8ddf318

Merge branch 'refs/heads/main' into issue-3479

d589963

# Conflicts: # android/quest/src/main/res/values/strings.xml

Merge branch 'main' into issue-3479

24ae15e

Merge branch 'main' into issue-3479

104670a

ndegwamartin reviewed Sep 30, 2024

View reviewed changes

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt Outdated Show resolved Hide resolved

hamza-vd and others added 4 commits October 1, 2024 09:39

Merge branch 'main' into issue-3479

810b79a

PR feedback changes

64cc323

Merge branch 'main' into issue-3479

aa04880

Fix failing check

a6ad5f8

hamza-vd requested review from ndegwamartin and ellykits October 3, 2024 08:24

Remove incorrect test

352aee9

ellykits reviewed Oct 4, 2024

View reviewed changes

Refactor dialog condition logic

52207bf

Merge branch 'main' into issue-3479

c04f509

ellykits approved these changes Oct 7, 2024

View reviewed changes

ellykits merged commit e9bc0de into main Oct 7, 2024
4 of 5 checks passed

ellykits deleted the issue-3479 branch October 7, 2024 13:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Exit Dialog #3487

Add Exit Dialog #3487

hamza-vd commented Sep 11, 2024 •

edited

Loading

codecov bot commented Sep 11, 2024 •

edited

Loading

hamza-vd commented Sep 12, 2024

ellykits Oct 4, 2024

hamza-vd Oct 4, 2024

ellykits left a comment

Add Exit Dialog #3487

Add Exit Dialog #3487

Conversation

hamza-vd commented Sep 11, 2024 • edited Loading

codecov bot commented Sep 11, 2024 • edited Loading

Codecov Report

hamza-vd commented Sep 12, 2024

ellykits Oct 4, 2024

Choose a reason for hiding this comment

hamza-vd Oct 4, 2024

Choose a reason for hiding this comment

ellykits left a comment

Choose a reason for hiding this comment

hamza-vd commented Sep 11, 2024 •

edited

Loading

codecov bot commented Sep 11, 2024 •

edited

Loading