From 36c51e17d8ebfdd316192e2f4c9af829e2a16fba Mon Sep 17 00:00:00 2001
From: Vishwajeet Srivastava <vishwajeets912@gmail.com>
Date: Tue, 5 Jul 2016 12:52:15 +0530
Subject: [PATCH] Combined all the presenters, views, activities into one.

---
 app/src/main/AndroidManifest.xml                         | 6 +++---
 .../{home => presenters}/ClientListPresenter.java        | 4 ++--
 .../{home => presenters}/LoanAccountsListPresenter.java  | 8 +++-----
 .../{login => presenters}/LoginPresenter.java            | 6 +++---
 .../SavingAccountsListPresenter.java                     | 7 +++----
 .../{home => ui/activities}/ClientAccountsActivity.java  | 4 +++-
 .../{home => ui/activities}/HomeActivity.java            | 3 ++-
 .../{login => ui/activities}/LoginActivity.java          | 9 ++++-----
 .../{home => ui/fragments}/ClientListFragment.java       | 5 ++++-
 .../{home => ui/fragments}/LoanAccountsListFragment.java | 7 +++----
 .../fragments}/SavingAccountsListFragment.java           | 5 +++--
 .../{home => ui/views}/ClientListMvpView.java            | 2 +-
 .../{home => ui/views}/LoanAccountsListView.java         | 2 +-
 .../selfserviceapp/{login => ui/views}/LoginView.java    | 5 +----
 .../{home => ui/views}/SavingAccountsListView.java       | 2 +-
 15 files changed, 37 insertions(+), 38 deletions(-)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => presenters}/ClientListPresenter.java (91%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => presenters}/LoanAccountsListPresenter.java (81%)
 rename app/src/main/java/org/mifos/selfserviceapp/{login => presenters}/LoginPresenter.java (91%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => presenters}/SavingAccountsListPresenter.java (85%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/activities}/ClientAccountsActivity.java (88%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/activities}/HomeActivity.java (98%)
 rename app/src/main/java/org/mifos/selfserviceapp/{login => ui/activities}/LoginActivity.java (95%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/fragments}/ClientListFragment.java (95%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/fragments}/LoanAccountsListFragment.java (95%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/fragments}/SavingAccountsListFragment.java (96%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/views}/ClientListMvpView.java (90%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/views}/LoanAccountsListView.java (90%)
 rename app/src/main/java/org/mifos/selfserviceapp/{login => ui/views}/LoginView.java (72%)
 rename app/src/main/java/org/mifos/selfserviceapp/{home => ui/views}/SavingAccountsListView.java (90%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6fea96192..79ba97c5a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/MaterialAppTheme">
         <activity
-            android:name=".login.LoginActivity"
+            android:name=".ui.activities.LoginActivity"
             android:label="@string/login"
             android:screenOrientation="portrait">
         <intent-filter>
@@ -20,11 +20,11 @@
         </intent-filter>
         </activity>
         <activity
-            android:name=".home.HomeActivity"
+            android:name=".ui.activities.HomeActivity"
             android:label="@string/home"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".home.ClientAccountsActivity"
+            android:name=".ui.activities.ClientAccountsActivity"
             android:label="@string/client_accounts"
             android:screenOrientation="portrait" />
     </application>
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListPresenter.java b/app/src/main/java/org/mifos/selfserviceapp/presenters/ClientListPresenter.java
similarity index 91%
rename from app/src/main/java/org/mifos/selfserviceapp/home/ClientListPresenter.java
rename to app/src/main/java/org/mifos/selfserviceapp/presenters/ClientListPresenter.java
index 22505f4e2..8e39fca22 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListPresenter.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/presenters/ClientListPresenter.java
@@ -1,11 +1,11 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.presenters;
 
 import android.util.Log;
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.api.DataManager;
 import org.mifos.selfserviceapp.data.Client;
-import org.mifos.selfserviceapp.presenters.BasePresenter;
+import org.mifos.selfserviceapp.ui.views.ClientListMvpView;
 
 import retrofit2.Call;
 import retrofit2.Callback;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListPresenter.java b/app/src/main/java/org/mifos/selfserviceapp/presenters/LoanAccountsListPresenter.java
similarity index 81%
rename from app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListPresenter.java
rename to app/src/main/java/org/mifos/selfserviceapp/presenters/LoanAccountsListPresenter.java
index 8ec67ab9c..c2d0f8236 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListPresenter.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/presenters/LoanAccountsListPresenter.java
@@ -1,13 +1,11 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.presenters;
 
 import android.util.Log;
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.api.DataManager;
-import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.data.accounts.LoanAccount;
-import org.mifos.selfserviceapp.data.accounts.SavingAccount;
-import org.mifos.selfserviceapp.presenters.BasePresenter;
+import org.mifos.selfserviceapp.ui.views.LoanAccountsListView;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -21,7 +19,7 @@
 public class LoanAccountsListPresenter extends BasePresenter<LoanAccountsListView>{
     DataManager mDataManager;
 
-    protected LoanAccountsListPresenter(DataManager dataManager) {
+    public LoanAccountsListPresenter(DataManager dataManager) {
         mDataManager = dataManager;
     }
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/login/LoginPresenter.java b/app/src/main/java/org/mifos/selfserviceapp/presenters/LoginPresenter.java
similarity index 91%
rename from app/src/main/java/org/mifos/selfserviceapp/login/LoginPresenter.java
rename to app/src/main/java/org/mifos/selfserviceapp/presenters/LoginPresenter.java
index 1249e2108..bc0d30363 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/login/LoginPresenter.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/presenters/LoginPresenter.java
@@ -1,11 +1,11 @@
-package org.mifos.selfserviceapp.login;
+package org.mifos.selfserviceapp.presenters;
 
 import android.util.Log;
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.data.User;
 import org.mifos.selfserviceapp.api.DataManager;
-import org.mifos.selfserviceapp.presenters.BasePresenter;
+import org.mifos.selfserviceapp.ui.views.LoginView;
 import org.mifos.selfserviceapp.utils.PrefManager;
 
 import retrofit2.Call;
@@ -21,7 +21,7 @@ public class LoginPresenter extends BasePresenter<LoginView> {
     DataManager mDataManager;
     PrefManager prefManager;
 
-    protected LoginPresenter(DataManager dataManager) {
+    public LoginPresenter(DataManager dataManager) {
        mDataManager = dataManager;
     }
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListPresenter.java b/app/src/main/java/org/mifos/selfserviceapp/presenters/SavingAccountsListPresenter.java
similarity index 85%
rename from app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListPresenter.java
rename to app/src/main/java/org/mifos/selfserviceapp/presenters/SavingAccountsListPresenter.java
index f1ca50d3f..ac4fbb675 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListPresenter.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/presenters/SavingAccountsListPresenter.java
@@ -1,12 +1,11 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.presenters;
 
 import android.util.Log;
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.api.DataManager;
-import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.data.accounts.SavingAccount;
-import org.mifos.selfserviceapp.presenters.BasePresenter;
+import org.mifos.selfserviceapp.ui.views.SavingAccountsListView;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -19,7 +18,7 @@
 public class SavingAccountsListPresenter extends BasePresenter<SavingAccountsListView>{
     DataManager mDataManager;
 
-    protected SavingAccountsListPresenter(DataManager dataManager) {
+    public SavingAccountsListPresenter(DataManager dataManager) {
         mDataManager = dataManager;
     }
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/ClientAccountsActivity.java b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/ClientAccountsActivity.java
similarity index 88%
rename from app/src/main/java/org/mifos/selfserviceapp/home/ClientAccountsActivity.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/activities/ClientAccountsActivity.java
index dc0c58fb7..2358fb4d9 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/ClientAccountsActivity.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/ClientAccountsActivity.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.activities;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
@@ -7,6 +7,8 @@
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.adapters.ViewPagerAdapter;
+import org.mifos.selfserviceapp.ui.fragments.LoanAccountsListFragment;
+import org.mifos.selfserviceapp.ui.fragments.SavingAccountsListFragment;
 import org.mifos.selfserviceapp.utils.Constants;
 
 import butterknife.BindView;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/HomeActivity.java b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/HomeActivity.java
similarity index 98%
rename from app/src/main/java/org/mifos/selfserviceapp/home/HomeActivity.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/activities/HomeActivity.java
index e5c4492b4..ed19bf2b9 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/HomeActivity.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/HomeActivity.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -19,6 +19,7 @@
 import org.mifos.selfserviceapp.api.DataManager;
 import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.utils.Constants;
+import org.mifos.selfserviceapp.ui.fragments.ClientListFragment;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/login/LoginActivity.java b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/LoginActivity.java
similarity index 95%
rename from app/src/main/java/org/mifos/selfserviceapp/login/LoginActivity.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/activities/LoginActivity.java
index 374a85101..97c0b5427 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/login/LoginActivity.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/activities/LoginActivity.java
@@ -1,8 +1,7 @@
-package org.mifos.selfserviceapp.login;
+package org.mifos.selfserviceapp.ui.activities;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 
 import android.support.v7.app.AppCompatActivity;
@@ -10,24 +9,24 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import org.mifos.selfserviceapp.data.User;
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.api.BaseApiManager;
 import org.mifos.selfserviceapp.api.DataManager;
 import org.mifos.selfserviceapp.home.HomeActivity;
+import org.mifos.selfserviceapp.presenters.LoginPresenter;
+import org.mifos.selfserviceapp.ui.views.LoginView;
 import org.mifos.selfserviceapp.utils.PrefManager;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import retrofit2.Response;
 
 /**
  * @author Vishwajeet
  * @since 05/06/16
  */
 
-public class LoginActivity extends AppCompatActivity implements LoginView{
+public class LoginActivity extends AppCompatActivity implements LoginView {
 
     private LoginPresenter mLoginPresenter;
     private DataManager mDataManager;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListFragment.java b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/ClientListFragment.java
similarity index 95%
rename from app/src/main/java/org/mifos/selfserviceapp/home/ClientListFragment.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/fragments/ClientListFragment.java
index ff8ea0271..77a57b8aa 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListFragment.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/ClientListFragment.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.fragments;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -17,6 +17,9 @@
 import org.mifos.selfserviceapp.api.BaseApiManager;
 import org.mifos.selfserviceapp.api.DataManager;
 import org.mifos.selfserviceapp.data.Client;
+import org.mifos.selfserviceapp.presenters.ClientListPresenter;
+import org.mifos.selfserviceapp.ui.views.ClientListMvpView;
+import org.mifos.selfserviceapp.ui.activities.ClientAccountsActivity;
 import org.mifos.selfserviceapp.utils.Constants;
 import org.mifos.selfserviceapp.utils.RecyclerItemClickListener;
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListFragment.java b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/LoanAccountsListFragment.java
similarity index 95%
rename from app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListFragment.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/fragments/LoanAccountsListFragment.java
index 1d94157a6..732758112 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListFragment.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/LoanAccountsListFragment.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.fragments;
 
 import android.app.ProgressDialog;
 import android.os.Bundle;
@@ -12,12 +12,11 @@
 
 import org.mifos.selfserviceapp.R;
 import org.mifos.selfserviceapp.adapters.LoanAccountsListAdapter;
-import org.mifos.selfserviceapp.adapters.SavingAccountsListAdapter;
 import org.mifos.selfserviceapp.api.BaseApiManager;
 import org.mifos.selfserviceapp.api.DataManager;
-import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.data.accounts.LoanAccount;
-import org.mifos.selfserviceapp.data.accounts.SavingAccount;
+import org.mifos.selfserviceapp.presenters.LoanAccountsListPresenter;
+import org.mifos.selfserviceapp.ui.views.LoanAccountsListView;
 import org.mifos.selfserviceapp.utils.Constants;
 import org.mifos.selfserviceapp.utils.RecyclerItemClickListener;
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListFragment.java b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/SavingAccountsListFragment.java
similarity index 96%
rename from app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListFragment.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/fragments/SavingAccountsListFragment.java
index b8a307c42..952f845b4 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListFragment.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/fragments/SavingAccountsListFragment.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.fragments;
 
 import android.app.ProgressDialog;
 import android.os.Bundle;
@@ -14,8 +14,9 @@
 import org.mifos.selfserviceapp.adapters.SavingAccountsListAdapter;
 import org.mifos.selfserviceapp.api.BaseApiManager;
 import org.mifos.selfserviceapp.api.DataManager;
-import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.data.accounts.SavingAccount;
+import org.mifos.selfserviceapp.presenters.SavingAccountsListPresenter;
+import org.mifos.selfserviceapp.ui.views.SavingAccountsListView;
 import org.mifos.selfserviceapp.utils.Constants;
 import org.mifos.selfserviceapp.utils.RecyclerItemClickListener;
 
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListMvpView.java b/app/src/main/java/org/mifos/selfserviceapp/ui/views/ClientListMvpView.java
similarity index 90%
rename from app/src/main/java/org/mifos/selfserviceapp/home/ClientListMvpView.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/views/ClientListMvpView.java
index 975b0f38a..139c48f68 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/ClientListMvpView.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/views/ClientListMvpView.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.views;
 
 import org.mifos.selfserviceapp.data.Client;
 import org.mifos.selfserviceapp.ui.views.base.MVPView;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListView.java b/app/src/main/java/org/mifos/selfserviceapp/ui/views/LoanAccountsListView.java
similarity index 90%
rename from app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListView.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/views/LoanAccountsListView.java
index 734d95a9f..2b9c479fa 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/LoanAccountsListView.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/views/LoanAccountsListView.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.views;
 
 import org.mifos.selfserviceapp.data.accounts.LoanAccount;
 import org.mifos.selfserviceapp.ui.views.base.MVPView;
diff --git a/app/src/main/java/org/mifos/selfserviceapp/login/LoginView.java b/app/src/main/java/org/mifos/selfserviceapp/ui/views/LoginView.java
similarity index 72%
rename from app/src/main/java/org/mifos/selfserviceapp/login/LoginView.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/views/LoginView.java
index b9fb572b4..9224bf015 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/login/LoginView.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/views/LoginView.java
@@ -1,10 +1,7 @@
-package org.mifos.selfserviceapp.login;
+package org.mifos.selfserviceapp.ui.views;
 
-import org.mifos.selfserviceapp.data.User;
 import org.mifos.selfserviceapp.ui.views.base.MVPView;
 
-import retrofit2.Response;
-
 /**
  * @author Vishwajeet
  * @since 05/06/16
diff --git a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListView.java b/app/src/main/java/org/mifos/selfserviceapp/ui/views/SavingAccountsListView.java
similarity index 90%
rename from app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListView.java
rename to app/src/main/java/org/mifos/selfserviceapp/ui/views/SavingAccountsListView.java
index f2dd45496..63db89f66 100644
--- a/app/src/main/java/org/mifos/selfserviceapp/home/SavingAccountsListView.java
+++ b/app/src/main/java/org/mifos/selfserviceapp/ui/views/SavingAccountsListView.java
@@ -1,4 +1,4 @@
-package org.mifos.selfserviceapp.home;
+package org.mifos.selfserviceapp.ui.views;
 
 import org.mifos.selfserviceapp.data.accounts.SavingAccount;
 import org.mifos.selfserviceapp.ui.views.base.MVPView;