Combined all the presenters, views, activities into one.

openMF · Jul 5, 2016 · 36c51e1 · 36c51e1
1 parent ca079b5
commit 36c51e1
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 38 deletions.
diff --git 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/...fserviceapp/home/ClientListPresenter.java → ...ceapp/presenters/ClientListPresenter.java b/...fserviceapp/home/ClientListPresenter.java → ...ceapp/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/...ceapp/home/LoanAccountsListPresenter.java → ...presenters/LoanAccountsListPresenter.java b/...ceapp/home/LoanAccountsListPresenter.java → ...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/.../selfserviceapp/login/LoginPresenter.java → ...serviceapp/presenters/LoginPresenter.java b/.../selfserviceapp/login/LoginPresenter.java → ...serviceapp/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/home/SavingAccountsListPresenter.java → ...esenters/SavingAccountsListPresenter.java b/...app/home/SavingAccountsListPresenter.java → ...esenters/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/...rviceapp/home/ClientAccountsActivity.java → ...ui/activities/ClientAccountsActivity.java b/...rviceapp/home/ClientAccountsActivity.java → ...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/...fos/selfserviceapp/home/HomeActivity.java → ...erviceapp/ui/activities/HomeActivity.java b/...fos/selfserviceapp/home/HomeActivity.java → ...erviceapp/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/...s/selfserviceapp/login/LoginActivity.java → ...rviceapp/ui/activities/LoginActivity.java b/...s/selfserviceapp/login/LoginActivity.java → ...rviceapp/ui/activities/LoginActivity.java
@@ -1,33 +1,32 @@
-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;
 import android.support.v7.widget.AppCompatButton;
 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/...lfserviceapp/home/ClientListFragment.java → ...eapp/ui/fragments/ClientListFragment.java b/...lfserviceapp/home/ClientListFragment.java → ...eapp/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/...iceapp/home/LoanAccountsListFragment.java → ...i/fragments/LoanAccountsListFragment.java b/...iceapp/home/LoanAccountsListFragment.java → ...i/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/...eapp/home/SavingAccountsListFragment.java → ...fragments/SavingAccountsListFragment.java b/...eapp/home/SavingAccountsListFragment.java → ...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/...elfserviceapp/home/ClientListMvpView.java → ...erviceapp/ui/views/ClientListMvpView.java b/...elfserviceapp/home/ClientListMvpView.java → ...erviceapp/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/...serviceapp/home/LoanAccountsListView.java → ...iceapp/ui/views/LoanAccountsListView.java b/...serviceapp/home/LoanAccountsListView.java → ...iceapp/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/...mifos/selfserviceapp/login/LoginView.java → ...os/selfserviceapp/ui/views/LoginView.java b/...mifos/selfserviceapp/login/LoginView.java → ...os/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/...rviceapp/home/SavingAccountsListView.java → ...eapp/ui/views/SavingAccountsListView.java b/...rviceapp/home/SavingAccountsListView.java → ...eapp/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;