From 5e4e14eb1ae1f32902937548b62c6a985feca982 Mon Sep 17 00:00:00 2001
From: Benjamin Mwalimu <dubdabasoduba@gmail.com>
Date: Mon, 2 Dec 2019 13:18:51 +0300
Subject: [PATCH 1/3] Update theme name

---
 .../src/main/AndroidManifest.xml              |  2 +-
 .../layout/native_form_activity_json_form.xml |  2 +-
 .../application/TestApplication.java          |  2 +-
 gradle.properties                             |  2 +-
 sample/src/main/AndroidManifest.xml           |  2 +-
 sample/src/main/res/layout/content_main.xml   | 20 +++++++++----------
 sample/src/main/res/values/styles.xml         |  1 +
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/android-json-form-wizard/src/main/AndroidManifest.xml b/android-json-form-wizard/src/main/AndroidManifest.xml
index 4ae33aa53..e9c6e8764 100644
--- a/android-json-form-wizard/src/main/AndroidManifest.xml
+++ b/android-json-form-wizard/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:supportsRtl="true"
-        android:theme="@style/NativeFormsAppTheme">
+        android:theme="@style/AppTheme">
 
         <activity
             android:name=".activities.JsonFormBarcodeScanActivity"
diff --git a/android-json-form-wizard/src/main/res/layout/native_form_activity_json_form.xml b/android-json-form-wizard/src/main/res/layout/native_form_activity_json_form.xml
index f5f3f6069..55ed143d6 100644
--- a/android-json-form-wizard/src/main/res/layout/native_form_activity_json_form.xml
+++ b/android-json-form-wizard/src/main/res/layout/native_form_activity_json_form.xml
@@ -3,7 +3,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
     android:background="@color/white"
-    android:theme="@style/NativeFormsAppTheme">
+    android:theme="@style/AppTheme">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/tb_top"
diff --git a/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java b/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
index 102009a26..c11da5124 100644
--- a/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
+++ b/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
@@ -7,7 +7,7 @@
 public class TestApplication extends Application {
     @Override
     public void onCreate() {
-        setTheme(R.style.NativeFormsAppTheme);
+        setTheme(R.style.AppTheme);
         super.onCreate();
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index c62c6bc6c..ea58535c5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.6.65-SNAPSHOT
+VERSION_NAME=1.6.66-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index b1643b6ff..f302460c9 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/NativeFormsAppTheme">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/sample/src/main/res/layout/content_main.xml b/sample/src/main/res/layout/content_main.xml
index f972fa702..903469c4d 100644
--- a/sample/src/main/res/layout/content_main.xml
+++ b/sample/src/main/res/layout/content_main.xml
@@ -23,7 +23,7 @@
             android:layout_gravity="center"
             android:text="BIRTH REGISTER"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/wizard_form"
@@ -33,7 +33,7 @@
             android:layout_gravity="center"
             android:text="WIZARD (MULTI-STEP FORM)"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/rules_engine_skip_logic"
@@ -42,7 +42,7 @@
             android:layout_gravity="center"
             android:text="RULES ENGINE LOGIC"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/numbers_selector_widget"
@@ -52,7 +52,7 @@
             android:layout_gravity="center"
             android:text="CONSTRAINTS"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/generic_dialog_button"
@@ -61,7 +61,7 @@
             android:layout_gravity="center"
             android:text="GENERIC POPUP"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/validation_form_button"
@@ -71,7 +71,7 @@
             android:layout_gravity="center"
             android:text="FORM VALIDATION"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/native_form_basic"
@@ -80,7 +80,7 @@
             android:layout_gravity="center"
             android:text="Basic Form"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/expansion_panel_button"
@@ -90,7 +90,7 @@
             android:layout_gravity="center"
             android:text="Expansion Panel"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/repeating_group_button"
@@ -99,7 +99,7 @@
             android:layout_gravity="center"
             android:text="Repeating Group"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
         <Button
             android:id="@+id/multiselect_list"
@@ -109,7 +109,7 @@
             android:layout_gravity="center"
             android:text="MultiSelect List"
             android:textColor="@android:color/white"
-            android:theme="@style/NativeFormsAppTheme" />
+            android:theme="@style/AppTheme" />
 
     </LinearLayout>
 </RelativeLayout>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 0cd8cc763..b2db094ae 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -13,4 +13,5 @@
     <style name="NativeFormsAppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
     <style name="NativeFormsAppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
+    <style name="AppTheme" parent="NativeFormsAppTheme"/>
 </resources>

From de2c498ebd9aa9ba3d1630bc40e0c56925add857 Mon Sep 17 00:00:00 2001
From: Benjamin Mwalimu <dubdabasoduba@gmail.com>
Date: Mon, 2 Dec 2019 13:27:21 +0300
Subject: [PATCH 2/3] Add new theme

---
 android-json-form-wizard/src/main/res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android-json-form-wizard/src/main/res/values/styles.xml b/android-json-form-wizard/src/main/res/values/styles.xml
index c0a33979e..2596a4e05 100644
--- a/android-json-form-wizard/src/main/res/values/styles.xml
+++ b/android-json-form-wizard/src/main/res/values/styles.xml
@@ -60,4 +60,5 @@
         <!--   <item name="android:windowEnterAnimation">@anim/slide_up</item>
            <item name="android:windowExitAnimation">@anim/slide_down</item>-->
     </style>
+    <style name="AppTheme" parent="NativeFormsAppTheme"/>
 </resources>

From 69a844e1a9cb3c009e52517a4dcd4b089ece0d91 Mon Sep 17 00:00:00 2001
From: Benjamin Mwalimu <dubdabasoduba@gmail.com>
Date: Thu, 5 Dec 2019 11:46:35 +0300
Subject: [PATCH 3/3] Add the theme setting to the json activity before the
 base on create is called

---
 android-json-form-wizard/src/main/AndroidManifest.xml       | 3 +--
 .../com/vijay/jsonwizard/activities/JsonFormActivity.java   | 6 ++++++
 .../java/com/jsonwizard/activities/BaseActivityTest.java    | 2 +-
 .../com/jsonwizard/activities/JsonFormActivityTest.java     | 4 ----
 .../java/com/jsonwizard/application/TestApplication.java    | 2 +-
 sample/src/main/AndroidManifest.xml                         | 3 +--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/android-json-form-wizard/src/main/AndroidManifest.xml b/android-json-form-wizard/src/main/AndroidManifest.xml
index e9c6e8764..c0d135ef2 100644
--- a/android-json-form-wizard/src/main/AndroidManifest.xml
+++ b/android-json-form-wizard/src/main/AndroidManifest.xml
@@ -18,8 +18,7 @@
         android:clearTaskOnLaunch="true"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:supportsRtl="true">
 
         <activity
             android:name=".activities.JsonFormBarcodeScanActivity"
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java
index 8cd7f8707..f76cc0134 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java
@@ -133,6 +133,12 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(R.style.AppTheme);
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     public synchronized JSONObject getStep(String name) {
         synchronized (getmJSONObject()) {
diff --git a/android-json-form-wizard/src/test/java/com/jsonwizard/activities/BaseActivityTest.java b/android-json-form-wizard/src/test/java/com/jsonwizard/activities/BaseActivityTest.java
index 8e2a1e595..13cec2fe5 100644
--- a/android-json-form-wizard/src/test/java/com/jsonwizard/activities/BaseActivityTest.java
+++ b/android-json-form-wizard/src/test/java/com/jsonwizard/activities/BaseActivityTest.java
@@ -9,7 +9,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = {Build.VERSION_CODES.O_MR1}, application = TestApplication.class)
+@Config(sdk = {Build.VERSION_CODES.P}, application = TestApplication.class)
 public abstract class BaseActivityTest {
     public static final String DUMMY_TEST_STRING = "DUMMY TEST STRING";
     public static final String DUMMY_JSON_FORM_STRING = "{\r\n  \"count\": \"1\",\r\n  \"encounter_type\": \"Birth Registration\",\r\n  \"mother\": {\r\n    \"encounter_type\": \"New Woman Registration\"\r\n  },\r\n  \"entity_id\": \"\",\r\n  \"relational_id\": \"\",\r\n  \"metadata\": {\r\n    \"start\": {\r\n      \"openmrs_entity_parent\": \"\",\r\n      \"openmrs_entity\": \"concept\",\r\n      \"openmrs_data_type\": \"start\",\r\n      \"openmrs_entity_id\": \"163137AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"\r\n    }\r\n  },\r\n  \"step1\": {\r\n    \"title\": \"Birth Registration\",\r\n    \"fields\": [\r\n      {\r\n        \"key\": \"Child_Photo\",\r\n        \"openmrs_entity_parent\": \"\",\r\n        \"openmrs_entity\": \"\",\r\n        \"openmrs_entity_id\": \"\",\r\n        \"type\": \"choose_image\",\r\n        \"uploadButtonText\": \"Take a photo of the child\"\r\n      },\r\n      {\r\n        \"key\": \"gps\",\r\n        \"openmrs_entity_parent\": \"usual_residence\",\r\n        \"openmrs_entity\": \"person_address\",\r\n        \"openmrs_entity_id\": \"geopoint\",\r\n        \"openmrs_data_type\": \"text\",\r\n        \"type\": \"gps\"\r\n      },\r\n      {\r\n        \"key\": \"Home_Facility\",\r\n        \"openmrs_entity_parent\": \"\",\r\n        \"openmrs_entity\": \"\",\r\n        \"openmrs_entity_id\": \"\",\r\n        \"openmrs_data_type\": \"text\",\r\n        \"type\": \"tree\",\r\n        \"hint\": \"Child's home health facility *\",\r\n        \"tree\": [],\r\n        \"v_required\": {\r\n          \"value\": true,\r\n          \"err\": \"Please enter the child's home facility\"\r\n        }\r\n      }\r\n    ]\r\n  }\r\n}";
diff --git a/android-json-form-wizard/src/test/java/com/jsonwizard/activities/JsonFormActivityTest.java b/android-json-form-wizard/src/test/java/com/jsonwizard/activities/JsonFormActivityTest.java
index 3a187fcf2..6a2a2ebba 100644
--- a/android-json-form-wizard/src/test/java/com/jsonwizard/activities/JsonFormActivityTest.java
+++ b/android-json-form-wizard/src/test/java/com/jsonwizard/activities/JsonFormActivityTest.java
@@ -15,7 +15,6 @@
 import org.robolectric.android.controller.ActivityController;
 
 public class JsonFormActivityTest extends BaseActivityTest {
-
     private JsonFormActivity activity;
     private ActivityController<JsonFormActivity> controller;
 
@@ -28,14 +27,11 @@ public void setUp() {
         activity = controller.get();
 
         Assert.assertNotNull(activity);
-
-
     }
 
     @Test
     public void testSetConfirmationTitleUpdatesConfirmationTitleCorrectly() {
         Assert.assertNotNull(activity.getConfirmCloseTitle());
-
         //default message
         Assert.assertEquals(RuntimeEnvironment.application.getString(R.string.confirm_form_close), activity.getConfirmCloseTitle());
         activity.setConfirmCloseTitle(DUMMY_TEST_STRING);
diff --git a/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java b/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
index c11da5124..a1dcd4ff3 100644
--- a/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
+++ b/android-json-form-wizard/src/test/java/com/jsonwizard/application/TestApplication.java
@@ -7,7 +7,7 @@
 public class TestApplication extends Application {
     @Override
     public void onCreate() {
-        setTheme(R.style.AppTheme);
         super.onCreate();
+        setTheme(R.style.Theme_AppCompat);
     }
 }
\ No newline at end of file
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f302460c9..603a78353 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -10,8 +10,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:supportsRtl="true">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"