Skip to content

Commit 8c34551

Browse files
committed
Rename presentation package to app.
1 parent b9a90c9 commit 8c34551

38 files changed

+121
-122
lines changed

app/src/androidTest/java/com/fernandocejas/android10/sample/test/exception/ErrorMessageFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import android.test.AndroidTestCase;
1919
import com.fernandocejas.android10.sample.data.exception.NetworkConnectionException;
2020
import com.fernandocejas.android10.sample.data.exception.UserNotFoundException;
21-
import com.fernandocejas.android10.sample.presentation.R;
22-
import com.fernandocejas.android10.sample.presentation.exception.ErrorMessageFactory;
21+
import com.fernandocejas.android10.sample.app.R;
22+
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
2323

2424
import static org.hamcrest.CoreMatchers.equalTo;
2525
import static org.hamcrest.CoreMatchers.is;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/mapper/UserModelDataMapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package com.fernandocejas.android10.sample.test.mapper;
1717

1818
import com.fernandocejas.android10.sample.domain.User;
19-
import com.fernandocejas.android10.sample.presentation.mapper.UserModelDataMapper;
20-
import com.fernandocejas.android10.sample.presentation.model.UserModel;
19+
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
20+
import com.fernandocejas.android10.sample.app.model.UserModel;
2121
import java.util.ArrayList;
2222
import java.util.Collection;
2323
import java.util.List;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserDetailsPresenterTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import android.content.Context;
1919
import android.test.AndroidTestCase;
2020
import com.fernandocejas.android10.sample.domain.interactor.GetUserDetails;
21-
import com.fernandocejas.android10.sample.presentation.mapper.UserModelDataMapper;
22-
import com.fernandocejas.android10.sample.presentation.presenter.UserDetailsPresenter;
23-
import com.fernandocejas.android10.sample.presentation.view.UserDetailsView;
21+
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
22+
import com.fernandocejas.android10.sample.app.presenter.UserDetailsPresenter;
23+
import com.fernandocejas.android10.sample.app.view.UserDetailsView;
2424
import org.mockito.Mock;
2525
import org.mockito.MockitoAnnotations;
2626
import rx.Subscriber;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserListPresenterTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import android.content.Context;
1919
import android.test.AndroidTestCase;
2020
import com.fernandocejas.android10.sample.domain.interactor.GetUserList;
21-
import com.fernandocejas.android10.sample.presentation.mapper.UserModelDataMapper;
22-
import com.fernandocejas.android10.sample.presentation.presenter.UserListPresenter;
23-
import com.fernandocejas.android10.sample.presentation.view.UserListView;
21+
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
22+
import com.fernandocejas.android10.sample.app.presenter.UserListPresenter;
23+
import com.fernandocejas.android10.sample.app.view.UserListView;
2424
import org.mockito.Mock;
2525
import org.mockito.MockitoAnnotations;
2626
import rx.Subscriber;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserDetailsActivityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import android.app.Fragment;
1919
import android.content.Intent;
2020
import android.test.ActivityInstrumentationTestCase2;
21-
import com.fernandocejas.android10.sample.presentation.R;
22-
import com.fernandocejas.android10.sample.presentation.view.activity.UserDetailsActivity;
21+
import com.fernandocejas.android10.sample.app.R;
22+
import com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity;
2323

2424
import static android.support.test.espresso.Espresso.onView;
2525
import static android.support.test.espresso.assertion.ViewAssertions.matches;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserListActivityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import android.app.Fragment;
1919
import android.content.Intent;
2020
import android.test.ActivityInstrumentationTestCase2;
21-
import com.fernandocejas.android10.sample.presentation.R;
22-
import com.fernandocejas.android10.sample.presentation.view.activity.UserListActivity;
21+
import com.fernandocejas.android10.sample.app.R;
22+
import com.fernandocejas.android10.sample.app.view.activity.UserListActivity;
2323

2424
import static org.hamcrest.CoreMatchers.is;
2525
import static org.hamcrest.CoreMatchers.notNullValue;

app/src/main/AndroidManifest.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.fernandocejas.android10.sample.presentation">
3+
package="com.fernandocejas.android10.sample.app">
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77

88
<application
99
android:allowBackup="true"
10-
android:name=".AndroidApplication"
10+
android:name="com.fernandocejas.android10.sample.app.AndroidApplication"
1111
android:icon="@drawable/ic_launcher"
1212
android:label="@string/app_name"
1313
android:theme="@style/AppTheme">
1414

1515
<activity
16-
android:name=".view.activity.MainActivity"
16+
android:name="com.fernandocejas.android10.sample.app.view.activity.MainActivity"
1717
android:label="@string/app_name">
1818
<intent-filter>
1919
<action android:name="android.intent.action.MAIN" />
@@ -22,12 +22,12 @@
2222
</activity>
2323

2424
<activity
25-
android:name=".view.activity.UserListActivity"
25+
android:name="com.fernandocejas.android10.sample.app.view.activity.UserListActivity"
2626
android:label="@string/activity_title_user_list">
2727
</activity>
2828

2929
<activity
30-
android:name=".view.activity.UserDetailsActivity"
30+
android:name="com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity"
3131
android:label="@string/activity_title_user_details">
3232
</activity>
3333
</application>

app/src/main/java/com/fernandocejas/android10/sample/presentation/AndroidApplication.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/AndroidApplication.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation;
16+
package com.fernandocejas.android10.sample.app;
1717

1818
import android.app.Application;
19-
import com.fernandocejas.android10.sample.presentation.internal.di.components.ApplicationComponent;
20-
import com.fernandocejas.android10.sample.presentation.internal.di.components.DaggerApplicationComponent;
21-
import com.fernandocejas.android10.sample.presentation.internal.di.modules.ApplicationModule;
19+
import com.fernandocejas.android10.sample.app.internal.di.components.ApplicationComponent;
20+
import com.fernandocejas.android10.sample.app.internal.di.components.DaggerApplicationComponent;
21+
import com.fernandocejas.android10.sample.app.internal.di.modules.ApplicationModule;
2222
import com.squareup.leakcanary.LeakCanary;
2323

2424
/**

app/src/main/java/com/fernandocejas/android10/sample/presentation/UIThread.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/UIThread.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation;
16+
package com.fernandocejas.android10.sample.app;
1717

1818
import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
1919
import javax.inject.Inject;
+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.exception;
16+
package com.fernandocejas.android10.sample.app.exception;
1717

1818
import android.content.Context;
1919
import com.fernandocejas.android10.sample.data.exception.NetworkConnectionException;
2020
import com.fernandocejas.android10.sample.data.exception.UserNotFoundException;
21-
import com.fernandocejas.android10.sample.presentation.R;
21+
import com.fernandocejas.android10.sample.app.R;
2222

2323
/**
2424
* Factory used to create error messages from an Exception as a condition.
+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di;
16+
package com.fernandocejas.android10.sample.app.internal.di;
1717

1818
/**
1919
* Interface representing a contract for clients that contains a component for dependency injection.
+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di;
16+
package com.fernandocejas.android10.sample.app.internal.di;
1717

1818
import java.lang.annotation.Retention;
1919
import javax.inject.Scope;
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.components;
16+
package com.fernandocejas.android10.sample.app.internal.di.components;
1717

1818
import android.app.Activity;
19-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
20-
import com.fernandocejas.android10.sample.presentation.internal.di.modules.ActivityModule;
19+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
20+
import com.fernandocejas.android10.sample.app.internal.di.modules.ActivityModule;
2121
import dagger.Component;
2222

2323
/**
2424
* A base component upon which fragment's components may depend.
2525
* Activity-level components should extend this component.
2626
*
2727
* Subtypes of ActivityComponent should be decorated with annotation:
28-
* {@link com.fernandocejas.android10.sample.presentation.internal.di.PerActivity}
28+
* {@link com.fernandocejas.android10.sample.app.internal.di.PerActivity}
2929
*/
3030
@PerActivity
3131
@Component(dependencies = ApplicationComponent.class, modules = ActivityModule.class)
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.components;
16+
package com.fernandocejas.android10.sample.app.internal.di.components;
1717

1818
import android.content.Context;
1919
import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
2020
import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
2121
import com.fernandocejas.android10.sample.domain.repository.UserRepository;
22-
import com.fernandocejas.android10.sample.presentation.internal.di.modules.ApplicationModule;
23-
import com.fernandocejas.android10.sample.presentation.view.activity.BaseActivity;
22+
import com.fernandocejas.android10.sample.app.internal.di.modules.ApplicationModule;
23+
import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
2424
import dagger.Component;
2525
import javax.inject.Singleton;
2626

Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.components;
16+
package com.fernandocejas.android10.sample.app.internal.di.components;
1717

18-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
19-
import com.fernandocejas.android10.sample.presentation.internal.di.modules.ActivityModule;
20-
import com.fernandocejas.android10.sample.presentation.internal.di.modules.UserModule;
21-
import com.fernandocejas.android10.sample.presentation.view.fragment.UserDetailsFragment;
22-
import com.fernandocejas.android10.sample.presentation.view.fragment.UserListFragment;
18+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
19+
import com.fernandocejas.android10.sample.app.internal.di.modules.ActivityModule;
20+
import com.fernandocejas.android10.sample.app.internal.di.modules.UserModule;
21+
import com.fernandocejas.android10.sample.app.view.fragment.UserDetailsFragment;
22+
import com.fernandocejas.android10.sample.app.view.fragment.UserListFragment;
2323
import dagger.Component;
2424

2525
/**
26-
* A scope {@link com.fernandocejas.android10.sample.presentation.internal.di.PerActivity} component.
26+
* A scope {@link com.fernandocejas.android10.sample.app.internal.di.PerActivity} component.
2727
* Injects user specific Fragments.
2828
*/
2929
@PerActivity
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.modules;
16+
package com.fernandocejas.android10.sample.app.internal.di.modules;
1717

1818
import android.app.Activity;
19-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
19+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
2020
import dagger.Module;
2121
import dagger.Provides;
2222

Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.modules;
16+
package com.fernandocejas.android10.sample.app.internal.di.modules;
1717

1818
import android.content.Context;
1919
import com.fernandocejas.android10.sample.data.cache.UserCache;
@@ -23,9 +23,8 @@
2323
import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
2424
import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
2525
import com.fernandocejas.android10.sample.domain.repository.UserRepository;
26-
import com.fernandocejas.android10.sample.presentation.AndroidApplication;
27-
import com.fernandocejas.android10.sample.presentation.UIThread;
28-
import com.fernandocejas.android10.sample.presentation.navigation.Navigator;
26+
import com.fernandocejas.android10.sample.app.AndroidApplication;
27+
import com.fernandocejas.android10.sample.app.UIThread;
2928
import dagger.Module;
3029
import dagger.Provides;
3130
import javax.inject.Singleton;
+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.internal.di.modules;
16+
package com.fernandocejas.android10.sample.app.internal.di.modules;
1717

1818
import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
1919
import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
2020
import com.fernandocejas.android10.sample.domain.interactor.GetUserDetails;
2121
import com.fernandocejas.android10.sample.domain.interactor.GetUserList;
2222
import com.fernandocejas.android10.sample.domain.interactor.UseCase;
2323
import com.fernandocejas.android10.sample.domain.repository.UserRepository;
24-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
24+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
2525
import dagger.Module;
2626
import dagger.Provides;
2727
import javax.inject.Named;
@@ -50,4 +50,4 @@ public UserModule(int userId) {
5050
PostExecutionThread postExecutionThread) {
5151
return new GetUserDetails(userId, userRepository, threadExecutor, postExecutionThread);
5252
}
53-
}
53+
}
+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.mapper;
16+
package com.fernandocejas.android10.sample.app.mapper;
1717

1818
import com.fernandocejas.android10.sample.domain.User;
19-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
20-
import com.fernandocejas.android10.sample.presentation.model.UserModel;
19+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
20+
import com.fernandocejas.android10.sample.app.model.UserModel;
2121
import java.util.ArrayList;
2222
import java.util.Collection;
2323
import java.util.Collections;

app/src/main/java/com/fernandocejas/android10/sample/presentation/model/UserModel.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/model/UserModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.model;
16+
package com.fernandocejas.android10.sample.app.model;
1717

1818
/**
1919
* Class that represents a user in the presentation layer.
+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.navigation;
16+
package com.fernandocejas.android10.sample.app.navigation;
1717

1818
import android.content.Context;
1919
import android.content.Intent;
20-
import com.fernandocejas.android10.sample.presentation.view.activity.UserDetailsActivity;
21-
import com.fernandocejas.android10.sample.presentation.view.activity.UserListActivity;
20+
import com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity;
21+
import com.fernandocejas.android10.sample.app.view.activity.UserListActivity;
2222
import javax.inject.Inject;
2323
import javax.inject.Singleton;
2424

app/src/main/java/com/fernandocejas/android10/sample/presentation/presenter/Presenter.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/presenter/Presenter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.presenter;
16+
package com.fernandocejas.android10.sample.app.presenter;
1717

1818
/**
1919
* Interface representing a Presenter in a model view presenter (MVP) pattern.
+6-6
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.presenter;
16+
package com.fernandocejas.android10.sample.app.presenter;
1717

1818
import android.support.annotation.NonNull;
1919
import com.fernandocejas.android10.sample.domain.User;
2020
import com.fernandocejas.android10.sample.domain.exception.DefaultErrorBundle;
2121
import com.fernandocejas.android10.sample.domain.exception.ErrorBundle;
2222
import com.fernandocejas.android10.sample.domain.interactor.DefaultSubscriber;
2323
import com.fernandocejas.android10.sample.domain.interactor.UseCase;
24-
import com.fernandocejas.android10.sample.presentation.exception.ErrorMessageFactory;
25-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
26-
import com.fernandocejas.android10.sample.presentation.mapper.UserModelDataMapper;
27-
import com.fernandocejas.android10.sample.presentation.model.UserModel;
28-
import com.fernandocejas.android10.sample.presentation.view.UserDetailsView;
24+
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
25+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
26+
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
27+
import com.fernandocejas.android10.sample.app.model.UserModel;
28+
import com.fernandocejas.android10.sample.app.view.UserDetailsView;
2929
import com.fernandocejas.frodo.annotation.RxLogSubscriber;
3030
import javax.inject.Inject;
3131
import javax.inject.Named;
+6-6
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.presentation.presenter;
16+
package com.fernandocejas.android10.sample.app.presenter;
1717

1818
import android.support.annotation.NonNull;
1919
import com.fernandocejas.android10.sample.domain.User;
2020
import com.fernandocejas.android10.sample.domain.exception.DefaultErrorBundle;
2121
import com.fernandocejas.android10.sample.domain.exception.ErrorBundle;
2222
import com.fernandocejas.android10.sample.domain.interactor.DefaultSubscriber;
2323
import com.fernandocejas.android10.sample.domain.interactor.UseCase;
24-
import com.fernandocejas.android10.sample.presentation.exception.ErrorMessageFactory;
25-
import com.fernandocejas.android10.sample.presentation.internal.di.PerActivity;
26-
import com.fernandocejas.android10.sample.presentation.mapper.UserModelDataMapper;
27-
import com.fernandocejas.android10.sample.presentation.model.UserModel;
28-
import com.fernandocejas.android10.sample.presentation.view.UserListView;
24+
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
25+
import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
26+
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
27+
import com.fernandocejas.android10.sample.app.model.UserModel;
28+
import com.fernandocejas.android10.sample.app.view.UserListView;
2929
import java.util.Collection;
3030
import java.util.List;
3131
import javax.inject.Inject;

0 commit comments

Comments
 (0)