MI | Refactoring package #6

Signed-off-by: mib-iqbal <[email protected]>
opensrp · Nov 22, 2017 · 7223e0f · 7223e0f
1 parent 3086c4d
commit 7223e0f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/opensrp-gizi/src/main/AndroidManifest.xml b/opensrp-gizi/src/main/AndroidManifest.xml
@@ -50,7 +50,7 @@
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
-        <activity android:name=".giziIbu.IbuSmartRegisterActivity"
+        <activity android:name=".activity.IbuSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"

diff --git a/...izi/giziIbu/IbuSmartRegisterActivity.java → ...zi/activity/IbuSmartRegisterActivity.java b/...izi/giziIbu/IbuSmartRegisterActivity.java → ...zi/activity/IbuSmartRegisterActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -13,7 +13,6 @@
 
 import org.smartregister.domain.form.FieldOverrides;
 import org.smartregister.domain.form.FormSubmission;
-import org.smartregister.gizi.activity.LoginActivity;
 import org.smartregister.gizi.R;
 import org.smartregister.gizi.fragment.GiziIbuSmartRegisterFragment;
 import org.smartregister.gizi.pageradapter.BaseRegisterActivityPagerAdapter;
@@ -32,8 +31,7 @@
 import org.json.JSONObject;
 
 import org.smartregister.enketo.view.fragment.DisplayFormFragment;
-import org.smartregister.view.fragment.SecuredNativeSmartRegisterFragment;
-import org.smartregister.view.viewpager.OpenSRPViewPager;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;

diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
@@ -2,20 +2,16 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 
 
 //import org.ei.opensrp.gizi.test.TestSmartRegisterActivity;
 import org.smartregister.gizi.R;
 import org.smartregister.gizi.activity.GiziSmartRegisterActivity;
-import org.smartregister.gizi.giziIbu.IbuSmartRegisterActivity;
+import org.smartregister.gizi.activity.IbuSmartRegisterActivity;
 import org.smartregister.view.controller.ANMController;
 import org.json.JSONObject;
 
-
-import static android.preference.PreferenceManager.getDefaultSharedPreferences;
-
 public class GiziNavigationController extends org.smartregister.view.controller.NavigationController {
     private Activity activity;
     private ANMController anmController;

diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java
@@ -3,17 +3,13 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Parcelable;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 
-import com.flurry.android.FlurryAgent;
-
 import org.smartregister.Context;
-import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.commonregistry.CommonRepository;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -23,11 +19,9 @@
 import org.smartregister.cursoradapter.SmartRegisterPaginatedCursorAdapter;
 import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
 import org.smartregister.gizi.R;
-import org.smartregister.gizi.giziIbu.IbuServiceModeOption;
-import org.smartregister.gizi.giziIbu.IbuSmartClientsProvider;
-import org.smartregister.gizi.giziIbu.IbuSmartRegisterActivity;
-import org.smartregister.gizi.giziIbu.KICommonObjectFilterOption;
-import org.smartregister.gizi.provider.ChildSmartClientsProvider;
+import org.smartregister.gizi.option.IbuServiceModeOption;
+import org.smartregister.gizi.provider.IbuSmartClientsProvider;
+import org.smartregister.gizi.activity.IbuSmartRegisterActivity;
 import org.smartregister.provider.SmartRegisterClientsProvider;
 import org.smartregister.sync.ClientProcessor;
 import org.smartregister.util.StringUtil;
@@ -42,7 +36,6 @@
 import org.smartregister.view.dialog.DialogOptionModel;
 import org.smartregister.view.dialog.EditOption;
 import org.smartregister.view.dialog.FilterOption;
-import org.smartregister.view.dialog.NameSort;
 import org.smartregister.view.dialog.ServiceModeOption;
 import org.smartregister.view.dialog.SortOption;
 import org.opensrp.api.domain.Location;
@@ -191,6 +184,7 @@ public void setupViews(View view) {
         super.setupViews(view);
         view.findViewById(R.id.btn_report_month).setVisibility(INVISIBLE);
         view.findViewById(R.id.service_mode_selection).setVisibility(View.GONE);
+        view.findViewById(R.id.register_client).setVisibility(View.GONE);
         clientsView.setVisibility(View.VISIBLE);
         clientsProgressView.setVisibility(View.INVISIBLE);
 //        list.setBackgroundColor(Color.RED);

diff --git a/...er/gizi/giziIbu/IbuServiceModeOption.java → ...ter/gizi/option/IbuServiceModeOption.java b/...er/gizi/giziIbu/IbuServiceModeOption.java → ...ter/gizi/option/IbuServiceModeOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.option;
 
 import android.view.View;
 

diff --git a/...gizi/giziIbu/IbuSmartClientsProvider.java → ...izi/provider/IbuSmartClientsProvider.java b/...gizi/giziIbu/IbuSmartClientsProvider.java → ...izi/provider/IbuSmartClientsProvider.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.provider;
 
 import android.app.Activity;
 import android.content.Context;