Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor project structure to one single module #103

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Pull out packages view, presenter, interactor and data.
android10 committed Sep 19, 2016

Verified

This commit was signed with the committer’s verified signature.
gadomski Pete Gadomski
commit 8c0a7ae61a3cf8876e986c43e924b306a7f376c2
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
android:theme="@style/AppTheme">

<activity
android:name=".core.view.activity.MainActivity"
android:name=".view.activity.MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
import com.fernandocejas.android10.sample.app.users.UserRepository;
import com.fernandocejas.android10.sample.app.core.di.modules.ApplicationModule;
import com.fernandocejas.android10.sample.app.core.view.activity.BaseActivity;
import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
import dagger.Component;
import javax.inject.Singleton;

Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
import com.fernandocejas.android10.sample.app.users.GetUserDetails;
import com.fernandocejas.android10.sample.app.users.GetUserList;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import com.fernandocejas.android10.sample.app.interactor.UseCase;
import com.fernandocejas.android10.sample.app.users.UserRepository;
import com.fernandocejas.android10.sample.app.core.di.PerActivity;
import dagger.Module;
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.fernandocejas.android10.sample.app.core.interactor;
package com.fernandocejas.android10.sample.app.interactor;

/**
* Default subscriber base class to be used whenever you want default error handling.
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.fernandocejas.android10.sample.app.core.interactor;
package com.fernandocejas.android10.sample.app.interactor;

import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.fernandocejas.android10.sample.app.core.presenter;
package com.fernandocejas.android10.sample.app.presenter;

/**
* Interface representing a Presenter in a model view presenter (MVP) pattern.
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import com.fernandocejas.android10.sample.app.interactor.UseCase;
import javax.inject.Inject;
import rx.Observable;

Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import com.fernandocejas.android10.sample.app.interactor.UseCase;
import javax.inject.Inject;
import rx.Observable;

Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import com.fernandocejas.android10.sample.app.core.di.components.DaggerUserComponent;
import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
import com.fernandocejas.android10.sample.app.core.di.modules.UserModule;
import com.fernandocejas.android10.sample.app.core.view.activity.BaseActivity;
import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;

/**
* Activity that shows details of a certain user.
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@
import butterknife.OnClick;
import com.fernandocejas.android10.sample.app.R;
import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
import com.fernandocejas.android10.sample.app.core.view.component.AutoLoadImageView;
import com.fernandocejas.android10.sample.app.core.view.fragment.BaseFragment;
import com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView;
import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
import javax.inject.Inject;

/**
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@
package com.fernandocejas.android10.sample.app.users;

import android.support.annotation.NonNull;
import com.fernandocejas.android10.sample.app.core.presenter.Presenter;
import com.fernandocejas.android10.sample.app.presenter.Presenter;
import com.fernandocejas.android10.sample.app.exception.DefaultErrorBundle;
import com.fernandocejas.android10.sample.app.exception.ErrorBundle;
import com.fernandocejas.android10.sample.app.core.interactor.DefaultSubscriber;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import com.fernandocejas.android10.sample.app.interactor.DefaultSubscriber;
import com.fernandocejas.android10.sample.app.interactor.UseCase;
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
import com.fernandocejas.android10.sample.app.core.di.PerActivity;
import com.fernandocejas.frodo.annotation.RxLogSubscriber;
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
*/
package com.fernandocejas.android10.sample.app.users;

import com.fernandocejas.android10.sample.app.core.view.component.LoadDataView;
import com.fernandocejas.android10.sample.app.view.component.LoadDataView;

/**
* Interface representing a View in a model view presenter (MVP) pattern.
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.fernandocejas.android10.sample.app.core.di.HasComponent;
import com.fernandocejas.android10.sample.app.core.di.components.DaggerUserComponent;
import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
import com.fernandocejas.android10.sample.app.core.view.activity.BaseActivity;
import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;

/**
* Activity that shows a list of Users.
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
import butterknife.OnClick;
import com.fernandocejas.android10.sample.app.R;
import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
import com.fernandocejas.android10.sample.app.core.view.fragment.BaseFragment;
import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
import java.util.Collection;
import javax.inject.Inject;

Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@
package com.fernandocejas.android10.sample.app.users;

import android.support.annotation.NonNull;
import com.fernandocejas.android10.sample.app.core.presenter.Presenter;
import com.fernandocejas.android10.sample.app.presenter.Presenter;
import com.fernandocejas.android10.sample.app.exception.DefaultErrorBundle;
import com.fernandocejas.android10.sample.app.exception.ErrorBundle;
import com.fernandocejas.android10.sample.app.core.interactor.DefaultSubscriber;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import com.fernandocejas.android10.sample.app.interactor.DefaultSubscriber;
import com.fernandocejas.android10.sample.app.interactor.UseCase;
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
import com.fernandocejas.android10.sample.app.core.di.PerActivity;
import java.util.Collection;
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
*/
package com.fernandocejas.android10.sample.app.users;

import com.fernandocejas.android10.sample.app.core.view.component.LoadDataView;
import com.fernandocejas.android10.sample.app.view.component.LoadDataView;
import java.util.Collection;

/**
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fernandocejas.android10.sample.app.core.view.activity;
package com.fernandocejas.android10.sample.app.view.activity;

import android.app.Activity;
import android.app.Fragment;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fernandocejas.android10.sample.app.core.view.activity;
package com.fernandocejas.android10.sample.app.view.activity;

import android.os.Bundle;
import android.widget.Button;
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
*
* @author Fernando Cejas (the android10 coder)
*/
package com.fernandocejas.android10.sample.app.core.view.component;
package com.fernandocejas.android10.sample.app.view.component;

import android.app.Activity;
import android.content.Context;
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* Copyright (C) 2014 android10.org. All rights reserved.
* @author Fernando Cejas (the android10 coder)
*/
package com.fernandocejas.android10.sample.app.core.view.component;
package com.fernandocejas.android10.sample.app.view.component;

import android.content.Context;

Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
*
* @author Fernando Cejas (the android10 coder)
*/
package com.fernandocejas.android10.sample.app.core.view.fragment;
package com.fernandocejas.android10.sample.app.view.fragment;

import android.app.Fragment;
import android.widget.Toast;
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_user_details.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
android:orientation="vertical"
>

<com.fernandocejas.android10.sample.app.core.view.component.AutoLoadImageView
<com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_height="@dimen/iv_cover_height"
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@

import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;