WD|Rename main module activity #4.

opensrp · Nov 8, 2017 · 127d62d · 127d62d
1 parent f03f259
commit 127d62d
Show file tree

Hide file tree

Showing 14 changed files with 1,743 additions and 36 deletions.
diff --git a/opensrp-bidan/src/main/AndroidManifest.xml b/opensrp-bidan/src/main/AndroidManifest.xml
@@ -120,27 +120,27 @@
             android:screenOrientation="landscape"
             android:theme="@style/BidanAppTheme"
             />
-        <activity android:name=".activity.NativeKISmartRegisterActivity"
+        <activity android:name=".activity.KISmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.NativeKIAnakSmartRegisterActivity"
+        <activity android:name=".activity.KIAnakSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.NativeKIANCSmartRegisterActivity"
+        <activity android:name=".activity.KIANCSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.NativeKIPNCSmartRegisterActivity"
+        <activity android:name=".activity.KIPNCSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.NativeKBSmartRegisterActivity"
+        <activity android:name=".activity.KBSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"

diff --git a/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/BidanHomeActivity.java b/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/BidanHomeActivity.java
@@ -52,8 +52,6 @@ public class BidanHomeActivity extends SecuredActivity {
 
     SimpleDateFormat timer = new SimpleDateFormat("hh:mm:ss");
 
-
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/...tivity/NativeKBSmartRegisterActivity.java → ...dan/activity/KBSmartRegisterActivity.java b/...tivity/NativeKBSmartRegisterActivity.java → ...dan/activity/KBSmartRegisterActivity.java
@@ -6,7 +6,7 @@
  * Created by sid-tech on 11/7/17.
  */
 
-public class NativeKBSmartRegisterActivity extends BaseRegisterActivity {
+public class KBSmartRegisterActivity extends BaseRegisterActivity {
 
     @Override
     protected DefaultOptionsProvider getDefaultOptionsProvider() {

diff --git a/...ity/NativeKIPNCSmartRegisterActivity.java → .../activity/KIANCSmartRegisterActivity.java b/...ity/NativeKIPNCSmartRegisterActivity.java → .../activity/KIANCSmartRegisterActivity.java
@@ -7,7 +7,7 @@
  * Created by sid-tech on 11/7/17.
  */
 
-public class NativeKIPNCSmartRegisterActivity extends BaseRegisterActivity{
+public class KIANCSmartRegisterActivity extends BaseRegisterActivity {
     @Override
     protected DefaultOptionsProvider getDefaultOptionsProvider() {
         return null;

diff --git a/...ity/NativeKIANCSmartRegisterActivity.java → ...activity/KIAnakSmartRegisterActivity.java b/...ity/NativeKIANCSmartRegisterActivity.java → ...activity/KIAnakSmartRegisterActivity.java
@@ -7,7 +7,7 @@
  * Created by sid-tech on 11/7/17.
  */
 
-public class NativeKIANCSmartRegisterActivity extends BaseRegisterActivity {
+public class KIAnakSmartRegisterActivity extends BaseRegisterActivity {
     @Override
     protected DefaultOptionsProvider getDefaultOptionsProvider() {
         return null;

diff --git a/...ty/NativeKIAnakSmartRegisterActivity.java → .../activity/KIPNCSmartRegisterActivity.java b/...ty/NativeKIAnakSmartRegisterActivity.java → .../activity/KIPNCSmartRegisterActivity.java
@@ -7,7 +7,7 @@
  * Created by sid-tech on 11/7/17.
  */
 
-public class NativeKIAnakSmartRegisterActivity extends BaseRegisterActivity {
+public class KIPNCSmartRegisterActivity extends BaseRegisterActivity{
     @Override
     protected DefaultOptionsProvider getDefaultOptionsProvider() {
         return null;

diff --git a/...tivity/NativeKISmartRegisterActivity.java → ...dan/activity/KISmartRegisterActivity.java b/...tivity/NativeKISmartRegisterActivity.java → ...dan/activity/KISmartRegisterActivity.java
@@ -29,7 +29,7 @@
  * Created by sid-tech on 11/7/17.
  */
 
-public class NativeKISmartRegisterActivity extends BaseRegisterActivity {
+public class KISmartRegisterActivity extends BaseRegisterActivity {
 
     @Bind(R.id.view_pager)
     protected OpenSRPViewPager mPager;

diff --git a/opensrp-bidan/src/main/java/org/smartregister/bidan/controller/NavigationControllerINA.java b/opensrp-bidan/src/main/java/org/smartregister/bidan/controller/NavigationControllerINA.java
@@ -7,11 +7,11 @@
 
 import org.json.JSONObject;
 import org.smartregister.Context;
-import org.smartregister.bidan.activity.NativeKBSmartRegisterActivity;
-import org.smartregister.bidan.activity.NativeKIANCSmartRegisterActivity;
-import org.smartregister.bidan.activity.NativeKIAnakSmartRegisterActivity;
-import org.smartregister.bidan.activity.NativeKIPNCSmartRegisterActivity;
-import org.smartregister.bidan.activity.NativeKISmartRegisterActivity;
+import org.smartregister.bidan.activity.KBSmartRegisterActivity;
+import org.smartregister.bidan.activity.KIANCSmartRegisterActivity;
+import org.smartregister.bidan.activity.KIAnakSmartRegisterActivity;
+import org.smartregister.bidan.activity.KIPNCSmartRegisterActivity;
+import org.smartregister.bidan.activity.KISmartRegisterActivity;
 import org.smartregister.view.controller.ANMController;
 import org.smartregister.view.controller.NavigationController;
 
@@ -35,7 +35,7 @@ public NavigationControllerINA(Activity activity, ANMController anmController,Co
 
     @Override
     public void startECSmartRegistry() {
-        activity.startActivity(new Intent(activity, NativeKISmartRegisterActivity.class));
+        activity.startActivity(new Intent(activity, KISmartRegisterActivity.class));
         SharedPreferences sharedPreferences = getDefaultSharedPreferences(this.activity);
 
         if(sharedPreferences.getBoolean("firstlauch",true)) {
@@ -45,22 +45,22 @@ public void startECSmartRegistry() {
 
     @Override
     public void startFPSmartRegistry() {
-        activity.startActivity(new Intent(activity, NativeKBSmartRegisterActivity.class));
+        activity.startActivity(new Intent(activity, KBSmartRegisterActivity.class));
     }
 
     @Override
     public void startANCSmartRegistry() {
-        activity.startActivity(new Intent(activity, NativeKIANCSmartRegisterActivity.class));
+        activity.startActivity(new Intent(activity, KIANCSmartRegisterActivity.class));
     }
 
     @Override
     public void startPNCSmartRegistry() {
-        activity.startActivity(new Intent(activity, NativeKIPNCSmartRegisterActivity.class));
+        activity.startActivity(new Intent(activity, KIPNCSmartRegisterActivity.class));
     }
 
     @Override
     public void startChildSmartRegistry() {
-        activity.startActivity(new Intent(activity, NativeKIAnakSmartRegisterActivity.class));
+        activity.startActivity(new Intent(activity, KIAnakSmartRegisterActivity.class));
     }
 
     @Override