Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android 10 support #607

Draft
wants to merge 121 commits into
base: develop
Choose a base branch
from
Draft

Android 10 support #607

wants to merge 121 commits into from

Conversation

dubdabasoduba
Copy link
Member

No description provided.

dubdabasoduba and others added 30 commits March 27, 2020 13:02
add contact no to globals when quick check is opened from register
fix required field counts
build.gradle Outdated
}
//jacocoFull {
// excludeProject ":sample", ":opensrp-client-anc"
//}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove unwanted/dead code.

@dubdabasoduba dubdabasoduba marked this pull request as draft March 8, 2022 18:42
@dubdabasoduba dubdabasoduba changed the base branch from master to develop May 20, 2022 11:41
Hamza Ahmed Khan and others added 2 commits June 30, 2022 14:46
# Conflicts:
#	.gitignore
#	build.gradle
#	gradle.properties
#	opensrp-anc/build.gradle
#	opensrp-anc/src/main/assets/config/attention-flags.yml
#	opensrp-anc/src/main/assets/config/contact-globals.yml
#	opensrp-anc/src/main/assets/config/contact-summary.yml
#	opensrp-anc/src/main/assets/config/profile-overview.yml
#	opensrp-anc/src/main/assets/config/profile_tab_previous_contact_tests.yml
#	opensrp-anc/src/main/assets/ec_client_fields.json
#	opensrp-anc/src/main/assets/json.form/anc_close.json
#	opensrp-anc/src/main/assets/json.form/anc_counselling_treatment.json
#	opensrp-anc/src/main/assets/json.form/anc_profile.json
#	opensrp-anc/src/main/assets/json.form/anc_quick_check.json
#	opensrp-anc/src/main/assets/json.form/anc_register.json
#	opensrp-anc/src/main/assets/rule/ct_relevance_rules.yml
#	opensrp-anc/src/main/assets/rule/profile_relevance_rules.yml
#	opensrp-anc/src/main/java/org/smartregister/anc/library/AncLibrary.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactJsonFormActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactSummarySendActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/EditJsonFormActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/activity/PreviousContactsDetailsActivity.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ContactWizardJsonFormFragment.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/MeFragment.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileOverviewFragment.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/listener/ContactTaskDisplayClickListener.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/model/BaseContactModel.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/model/ContactSummaryModel.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/model/ContactVisit.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/model/RegisterModel.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/provider/AdvancedSearchProvider.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/repository/RegisterQueryProvider.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/sync/BaseAncClientProcessorForJava.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/task/BackPressedPersistPartialTask.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java
#	opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java
#	opensrp-anc/src/main/res/values/strings.xml
#	opensrp-anc/src/main/resources/anc_close.properties
#	opensrp-anc/src/main/resources/anc_counselling_treatment.properties
#	opensrp-anc/src/main/resources/anc_counselling_treatment_pt.properties
#	opensrp-anc/src/main/resources/anc_quick_check.properties
#	opensrp-anc/src/main/resources/anc_register.properties
#	opensrp-anc/src/main/resources/anc_symptoms_follow_up.properties
#	opensrp-anc/src/main/resources/pelvic_exam_sub_form.properties
#	opensrp-anc/src/main/resources/tests_blood_haemoglobin_sub_form.properties
#	opensrp-anc/src/main/resources/tests_hepatitis_b_sub_form.properties
#	opensrp-anc/src/main/resources/tests_hiv_sub_form.properties
#	opensrp-anc/src/main/resources/tests_urine_sub_form.properties
#	opensrp-anc/src/main/resources/tests_urine_sub_form_pt.properties
#	opensrp-anc/src/test/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivityTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/activity/ContactSummaryFinishActivityTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/activity/ProfileActivityTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/fragment/ContactWizardJsonFormFragmentTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/fragment/ProfileContactsFragmentTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/fragment/ProfileOverviewFragmentTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/fragment/ProfileTasksFragmentTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/helper/ImageRenderHelperTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/interactor/RegisterInteractorTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/job/TestAncJobCreator.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/model/RegisterModelTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/util/ANCJsonFormUtilsTest.java
#	opensrp-anc/src/test/java/org/smartregister/anc/library/util/UtilsTest.java
#	reference-app/build.gradle
#	reference-app/src/main/AndroidManifest.xml
#	reference-app/src/main/assets/app.properties
#	reference-app/src/main/java/org/smartregister/anc/application/AncApplication.java
#	reference-app/src/main/java/org/smartregister/anc/application/AncSyncConfiguration.java
#	reference-app/src/main/java/org/smartregister/anc/interactor/LoginInteractor.java
#	reference-app/src/main/java/org/smartregister/anc/job/AncJobCreator.java
#	reference-app/src/main/java/org/smartregister/anc/repository/AncRepository.java
#	reference-app/src/test/java/org/smartregister/anc/presenter/LoginPresenterTest.java
#	sample/.gitignore
#	sample/build.gradle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants