Moving MVP logic into a common module

thiagokimo · Oct 18, 2015 · e0b3ac6 · e0b3ac6
1 parent b078999
commit e0b3ac6
Show file tree

Hide file tree

Showing 59 changed files with 187 additions and 558 deletions.
diff --git a/.../base/domain/callback/SilentCallback.java → .../base/domain/callback/SilentCallback.java b/.../base/domain/callback/SilentCallback.java → .../base/domain/callback/SilentCallback.java
diff --git a/...domain/usecase/LoadCollectionUseCase.java → ...domain/usecase/LoadCollectionUseCase.java b/...domain/usecase/LoadCollectionUseCase.java → ...domain/usecase/LoadCollectionUseCase.java
diff --git a/base-mvp/build.gradle b/base-mvp/build.gradle
@@ -19,5 +19,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile project(':base-domain')
 }
diff --git a/...resenter/LoadDataCollectionPresenter.java → ...resenter/LoadDataCollectionPresenter.java b/...resenter/LoadDataCollectionPresenter.java → ...resenter/LoadDataCollectionPresenter.java
@@ -12,6 +12,7 @@
 import io.kimo.base.presentation.mvp.Model;
 import io.kimo.base.presentation.mvp.view.LoadDataCollectionView;
 
+
 public class LoadDataCollectionPresenter<E extends Entity, M extends Model> extends BasePresenter<LoadDataCollectionView<M>> {
 
     protected Executor executor;

diff --git a/...presentation/mvp/view/CollectionView.java → ...presentation/mvp/view/CollectionView.java b/...presentation/mvp/view/CollectionView.java → ...presentation/mvp/view/CollectionView.java
diff --git a/...tion/mvp/view/LoadDataCollectionView.java → ...tion/mvp/view/LoadDataCollectionView.java b/...tion/mvp/view/LoadDataCollectionView.java → ...tion/mvp/view/LoadDataCollectionView.java
diff --git a/...e/presentation/mvp/view/LoadDataView.java → ...e/presentation/mvp/view/LoadDataView.java b/...e/presentation/mvp/view/LoadDataView.java → ...e/presentation/mvp/view/LoadDataView.java
diff --git a/base/src/main/java/io/kimo/base/presentation/BaseApp.java b/base/src/main/java/io/kimo/base/presentation/BaseApp.java
diff --git a/example-base-v4/build.gradle b/example-base-v4/build.gradle
@@ -22,6 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':base-v4')
-    compile project(':example-domain')
+    compile project(':example-mvp')
     compile 'com.squareup.picasso:picasso:2.5.2'
 }
diff --git a/example-base-v4/src/main/AndroidManifest.xml b/example-base-v4/src/main/AndroidManifest.xml
@@ -5,21 +5,20 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".ExampleApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".activity.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activity.ExampleDetailActivity" />
+        <activity android:name=".activity.ExampleDetailActivity" />
     </application>
 
 </manifest>
diff --git a/example-base-v4/src/main/java/io/kimo/base/v4/example/ExampleApp.java b/example-base-v4/src/main/java/io/kimo/base/v4/example/ExampleApp.java
diff --git a/...le/ui/activity/ExampleDetailActivity.java → ...ample/activity/ExampleDetailActivity.java b/...le/ui/activity/ExampleDetailActivity.java → ...ample/activity/ExampleDetailActivity.java
@@ -1,14 +1,15 @@
-package io.kimo.base.v4.example.ui.activity;
+package io.kimo.base.v4.example.activity;
+
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
+import io.kimo.base.mvp.example.mapper.ExampleMapper;
+import io.kimo.base.mvp.example.model.ExampleModel;
 import io.kimo.base.v4.example.R;
-import io.kimo.base.v4.example.mapper.ExampleMapper;
-import io.kimo.base.v4.example.mvp.model.ExampleModel;
-import io.kimo.base.v4.example.ui.fragment.ExampleDetailFragment;
+import io.kimo.base.v4.example.fragment.ExampleDetailFragment;
 import io.kimo.base.v4.presentation.ui.BaseFragmentActivity;
 
 public class ExampleDetailActivity extends BaseFragmentActivity {

diff --git a/.../v4/example/ui/activity/MainActivity.java → ...ase/v4/example/activity/MainActivity.java b/.../v4/example/ui/activity/MainActivity.java → ...ase/v4/example/activity/MainActivity.java
@@ -1,9 +1,9 @@
-package io.kimo.base.v4.example.ui.activity;
+package io.kimo.base.v4.example.activity;
 
 import android.support.v4.app.Fragment;
 
 import io.kimo.base.v4.example.R;
-import io.kimo.base.v4.example.ui.fragment.ExampleListFragment;
+import io.kimo.base.v4.example.fragment.ExampleListFragment;
 import io.kimo.base.v4.presentation.ui.BaseFragmentActivity;
 
 public class MainActivity extends BaseFragmentActivity {

diff --git a/...xample/ui/adapter/ExampleListAdapter.java → ...4/example/adapter/ExampleListAdapter.java b/...xample/ui/adapter/ExampleListAdapter.java → ...4/example/adapter/ExampleListAdapter.java
@@ -1,4 +1,4 @@
-package io.kimo.base.v4.example.ui.adapter;
+package io.kimo.base.v4.example.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,8 +10,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.kimo.base.mvp.example.model.ExampleModel;
 import io.kimo.base.v4.example.R;
-import io.kimo.base.v4.example.mvp.model.ExampleModel;
+
 
 
 public class ExampleListAdapter extends BaseAdapter {

diff --git a/...le/ui/fragment/ExampleDetailFragment.java → ...ample/fragment/ExampleDetailFragment.java b/...le/ui/fragment/ExampleDetailFragment.java → ...ample/fragment/ExampleDetailFragment.java
@@ -1,4 +1,4 @@
-package io.kimo.base.v4.example.ui.fragment;
+package io.kimo.base.v4.example.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -9,11 +9,11 @@
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.Picasso;
 
+import io.kimo.base.mvp.example.mapper.ExampleMapper;
+import io.kimo.base.mvp.example.model.ExampleModel;
+import io.kimo.base.mvp.example.presenter.ExampleDetailPresenter;
+import io.kimo.base.mvp.example.view.ExampleDetailView;
 import io.kimo.base.v4.example.R;
-import io.kimo.base.v4.example.mapper.ExampleMapper;
-import io.kimo.base.v4.example.mvp.model.ExampleModel;
-import io.kimo.base.v4.example.mvp.presenter.ExampleDetailPresenter;
-import io.kimo.base.v4.example.mvp.view.ExampleDetailView;
 import io.kimo.base.v4.presentation.mvp.BaseView;
 
 

diff --git a/...mple/ui/fragment/ExampleListFragment.java → ...example/fragment/ExampleListFragment.java b/...mple/ui/fragment/ExampleListFragment.java → ...example/fragment/ExampleListFragment.java
@@ -1,4 +1,4 @@
-package io.kimo.base.v4.example.ui.fragment;
+package io.kimo.base.v4.example.fragment;
 
 import android.content.Context;
 import android.view.View;
@@ -10,12 +10,12 @@
 
 import java.util.List;
 
+import io.kimo.base.mvp.example.model.ExampleModel;
+import io.kimo.base.mvp.example.presenter.ExampleListPresenter;
+import io.kimo.base.mvp.example.view.ExampleListView;
 import io.kimo.base.v4.example.R;
-import io.kimo.base.v4.example.mvp.model.ExampleModel;
-import io.kimo.base.v4.example.mvp.presenter.ExampleListPresenter;
-import io.kimo.base.v4.example.mvp.view.ExampleListView;
-import io.kimo.base.v4.example.ui.activity.ExampleDetailActivity;
-import io.kimo.base.v4.example.ui.adapter.ExampleListAdapter;
+import io.kimo.base.v4.example.activity.ExampleDetailActivity;
+import io.kimo.base.v4.example.adapter.ExampleListAdapter;
 import io.kimo.base.v4.presentation.mvp.BaseView;
 
 

diff --git a/example-base-v4/src/main/java/io/kimo/base/v4/example/mapper/ExampleMapper.java b/example-base-v4/src/main/java/io/kimo/base/v4/example/mapper/ExampleMapper.java
diff --git a/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/model/ExampleModel.java b/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/model/ExampleModel.java
diff --git a/...e-base-v4/src/main/java/io/kimo/base/v4/example/mvp/presenter/ExampleDetailPresenter.java b/...e-base-v4/src/main/java/io/kimo/base/v4/example/mvp/presenter/ExampleDetailPresenter.java
diff --git a/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/view/ExampleDetailView.java b/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/view/ExampleDetailView.java
diff --git a/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/view/ExampleListView.java b/example-base-v4/src/main/java/io/kimo/base/v4/example/mvp/view/ExampleListView.java
diff --git a/example-base-v7/build.gradle b/example-base-v7/build.gradle
@@ -22,6 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':base-v7')
-    compile project(':example-domain')
+    compile project(':example-mvp')
     compile 'com.squareup.picasso:picasso:2.5.2'
 }
diff --git a/example-base-v7/src/main/AndroidManifest.xml b/example-base-v7/src/main/AndroidManifest.xml
@@ -5,21 +5,20 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".ExampleApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".activity.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activity.ExampleDetailActivity" />
+        <activity android:name=".activity.ExampleDetailActivity" />
     </application>
 
 </manifest>
diff --git a/...o/base/v7/example/ui/ExampleActivity.java → ...kimo/base/v7/example/ExampleActivity.java b/...o/base/v7/example/ui/ExampleActivity.java → ...kimo/base/v7/example/ExampleActivity.java
@@ -1,9 +1,8 @@
-package io.kimo.base.v7.example.ui;
+package io.kimo.base.v7.example;
 
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 
-import io.kimo.base.v7.example.R;
 import io.kimo.base.v7.presentation.ui.BaseAppCompatActivity;
 
 public abstract class ExampleActivity extends BaseAppCompatActivity{

diff --git a/example-base-v7/src/main/java/io/kimo/base/v7/example/ExampleApp.java b/example-base-v7/src/main/java/io/kimo/base/v7/example/ExampleApp.java
diff --git a/...le/ui/activity/ExampleDetailActivity.java → ...ample/activity/ExampleDetailActivity.java b/...le/ui/activity/ExampleDetailActivity.java → ...ample/activity/ExampleDetailActivity.java
@@ -1,16 +1,17 @@
-package io.kimo.base.v7.example.ui.activity;
+package io.kimo.base.v7.example.activity;
 
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
+import io.kimo.base.mvp.example.mapper.ExampleMapper;
+import io.kimo.base.mvp.example.model.ExampleModel;
+import io.kimo.base.v7.example.ExampleActivity;
 import io.kimo.base.v7.example.R;
-import io.kimo.base.v7.example.mapper.ExampleMapper;
-import io.kimo.base.v7.example.mvp.model.ExampleModel;
-import io.kimo.base.v7.example.ui.ExampleActivity;
-import io.kimo.base.v7.example.ui.fragment.ExampleDetailFragment;
+import io.kimo.base.v7.example.fragment.ExampleDetailFragment;
+
 
 public class ExampleDetailActivity extends ExampleActivity {