From cce4f692a933c43b8e334955c0256a746410a5da Mon Sep 17 00:00:00 2001 From: Ephraim Kigamba Date: Mon, 14 Nov 2022 17:53:09 +0300 Subject: [PATCH 1/2] Revert activate card fab to visibility.gone - Fixes a bug on other child apps where the fab appears even though the feature.nfc.card.enabled is not set as true --- .../src/main/res/layout/app_bar_child_immunization.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-child/src/main/res/layout/app_bar_child_immunization.xml b/opensrp-child/src/main/res/layout/app_bar_child_immunization.xml index 2363cd65a..890c874f2 100644 --- a/opensrp-child/src/main/res/layout/app_bar_child_immunization.xml +++ b/opensrp-child/src/main/res/layout/app_bar_child_immunization.xml @@ -44,7 +44,7 @@ android:orientation="horizontal" android:paddingTop="12dp" android:paddingBottom="12dp" - android:visibility="visible"> + android:visibility="gone"> Date: Tue, 15 Nov 2022 19:08:20 +0300 Subject: [PATCH 2/2] :arrow-up: Bump to 0.10.1-SNAPSHOT - Fix failing tests --- gradle.properties | 2 +- .../child/presenter/BaseChildRegisterPresenterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8620c8f62..ed232523b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.10.0-SNAPSHOT +VERSION_NAME=0.10.1-SNAPSHOT VERSION_CODE=1 GROUP=org.smartregister POM_SETTING_DESCRIPTION=OpenSRP Client Child Library diff --git a/opensrp-child/src/test/java/org/smartregister/child/presenter/BaseChildRegisterPresenterTest.java b/opensrp-child/src/test/java/org/smartregister/child/presenter/BaseChildRegisterPresenterTest.java index 292aa23e1..feb26d0ca 100644 --- a/opensrp-child/src/test/java/org/smartregister/child/presenter/BaseChildRegisterPresenterTest.java +++ b/opensrp-child/src/test/java/org/smartregister/child/presenter/BaseChildRegisterPresenterTest.java @@ -203,7 +203,7 @@ public void testCloseChildRecordShouldCallRemoveChildFromRegisterMethod() { baseChildRegisterPresenter.closeChildRecord(jsonString); - Mockito.verify(interactorSpy, Mockito.times(1)).removeChildFromRegister(Mockito.eq(jsonString), Mockito.anyString()); + Mockito.verify(interactorSpy, Mockito.times(1)).removeChildFromRegister(Mockito.eq(jsonString), Mockito.nullable(String.class)); } @Test