fix view name

JsonChao · May 18, 2018 · 8361cb3 · 8361cb3
1 parent cfb7fdd
commit 8361cb3
Show file tree

Hide file tree

Showing 39 changed files with 134 additions and 128 deletions.
diff --git a/App Architectrue.puml b/App Architectrue.puml
@@ -9,34 +9,34 @@ skinparam activityBorderColor #ef5345
 skinparam activityFontName Impact
 
 rectangle View #lightGreen
-rectangle MvpView #white
-rectangle MvpPresenter #white
+rectangle AbstractView #white
+rectangle AbstractPresenter #white
 rectangle Presenter #lightGreen
-rectangle AppDataManager #lightGreen
-rectangle ApiHelper #white
-rectangle AppApiHelper #lightGreen
+rectangle DataManager #lightGreen
+rectangle HttpHelper #white
+rectangle HttpHelperImpl #lightGreen
 rectangle PreferenceHelper #white
-rectangle AppPreferenceHelper #lightGreen
+rectangle PreferenceHelperImpl #lightGreen
 rectangle DbHelper #white
-rectangle AppDbHelper #lightGreen
-
-View -- MvpView
-View -r-> MvpPresenter
-MvpPresenter -l-> View
-MvpPresenter -- Presenter
-Presenter -l-> MvpView
-MvpView -r-> Presenter
-Presenter -r-> AppDataManager
-AppDataManager -l-> Presenter
-AppDataManager -r-> PreferenceHelper
-PreferenceHelper -l-> AppDataManager
-PreferenceHelper -r- AppPreferenceHelper
-AppDataManager -u-> ApiHelper
-ApiHelper -d-> AppDataManager
-ApiHelper -u-> AppApiHelper
-AppDataManager -d-> DbHelper
-DbHelper -u-> AppDataManager
-DbHelper -d-> AppDbHelper
+rectangle DBHelperImpl #lightGreen
+
+View -- AbstractView
+View -r-> AbstractPresenter
+AbstractPresenter -l-> View
+AbstractPresenter -- Presenter
+Presenter -l-> AbstractView
+AbstractView -r-> Presenter
+Presenter -r-> DataManager
+DataManager -l-> Presenter
+DataManager -r-> PreferenceHelper
+PreferenceHelper -l-> DataManager
+PreferenceHelper -r- PreferenceHelperImpl
+DataManager -u-> HttpHelper
+HttpHelper -d-> DataManager
+HttpHelper -u- HttpHelperImpl
+DataManager -d-> DbHelper
+DbHelper -u-> DataManager
+DbHelper -d- DBHelperImpl
 
 
 

diff --git a/app/src/main/java/json/chao/com/wanandroid/base/activity/BaseActivity.java b/app/src/main/java/json/chao/com/wanandroid/base/activity/BaseActivity.java
@@ -11,9 +11,8 @@
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.support.HasSupportFragmentInjector;
-import json.chao.com.wanandroid.R;
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.utils.CommonUtils;
 
 /**
@@ -25,7 +24,7 @@
 
 public abstract class BaseActivity<T extends AbstractPresenter> extends AbstractSimpleActivity implements
         HasSupportFragmentInjector,
-        BaseView {
+        AbstractView {
 
     @Inject
     DispatchingAndroidInjector<Fragment> mFragmentDispatchingAndroidInjector;

diff --git a/...d/base/activity/AbstractRootActivity.java → ...droid/base/activity/BaseRootActivity.java b/...d/base/activity/AbstractRootActivity.java → ...droid/base/activity/BaseRootActivity.java
@@ -15,7 +15,7 @@
  * @date 2018/3/30
  */
 
-public abstract class AbstractRootActivity<T extends BasePresenter> extends BaseActivity<T> {
+public abstract class BaseRootActivity<T extends BasePresenter> extends BaseActivity<T> {
 
     private static final int NORMAL_STATE = 0;
     private static final int LOADING_STATE = 1;

diff --git a/app/src/main/java/json/chao/com/wanandroid/base/fragment/BaseDialogFragment.java b/app/src/main/java/json/chao/com/wanandroid/base/fragment/BaseDialogFragment.java
@@ -6,9 +6,8 @@
 import javax.inject.Inject;
 
 import dagger.android.support.AndroidSupportInjection;
-import json.chao.com.wanandroid.R;
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.utils.CommonUtils;
 
 /**
@@ -19,7 +18,7 @@
  */
 
 public abstract class BaseDialogFragment<T extends AbstractPresenter> extends AbstractSimpleDialogFragment
-        implements BaseView {
+        implements AbstractView {
 
     @Inject
     protected T mPresenter;

diff --git a/app/src/main/java/json/chao/com/wanandroid/base/fragment/BaseFragment.java b/app/src/main/java/json/chao/com/wanandroid/base/fragment/BaseFragment.java
@@ -8,9 +8,8 @@
 import javax.inject.Inject;
 
 import dagger.android.support.AndroidSupportInjection;
-import json.chao.com.wanandroid.R;
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.utils.CommonUtils;
 
 /**
@@ -21,7 +20,7 @@
  */
 
 public abstract class BaseFragment<T extends AbstractPresenter> extends AbstractSimpleFragment
-        implements BaseView {
+        implements AbstractView {
 
     @Inject
     protected T mPresenter;

diff --git a/...d/base/fragment/AbstractRootFragment.java → ...droid/base/fragment/BaseRootFragment.java b/...d/base/fragment/AbstractRootFragment.java → ...droid/base/fragment/BaseRootFragment.java
@@ -15,7 +15,7 @@
  * @date 2018/3/30
  */
 
-public abstract class AbstractRootFragment<T extends BasePresenter> extends BaseFragment<T> {
+public abstract class BaseRootFragment<T extends BasePresenter> extends BaseFragment<T> {
 
     private static final int NORMAL_STATE = 0;
     private static final int LOADING_STATE = 1;

diff --git a/app/src/main/java/json/chao/com/wanandroid/base/presenter/AbstractPresenter.java b/app/src/main/java/json/chao/com/wanandroid/base/presenter/AbstractPresenter.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.base.presenter;
 
 import io.reactivex.disposables.Disposable;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 
 /**
  * Presenter 基类
@@ -10,7 +10,7 @@
  * @date 2017/11/27
  */
 
-public interface AbstractPresenter<T extends BaseView> {
+public interface AbstractPresenter<T extends AbstractView> {
 
     /**
      * 注入View

diff --git a/app/src/main/java/json/chao/com/wanandroid/base/presenter/BasePresenter.java b/app/src/main/java/json/chao/com/wanandroid/base/presenter/BasePresenter.java
@@ -2,7 +2,7 @@
 
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.DataManager;
 
 /**
@@ -13,7 +13,7 @@
  * @date 2017/11/28
  */
 
-public class BasePresenter<T extends BaseView> implements AbstractPresenter<T> {
+public class BasePresenter<T extends AbstractView> implements AbstractPresenter<T> {
 
     protected T mView;
     private CompositeDisposable compositeDisposable;

diff --git a/...ao/com/wanandroid/base/view/BaseView.java → ...om/wanandroid/base/view/AbstractView.java b/...ao/com/wanandroid/base/view/BaseView.java → ...om/wanandroid/base/view/AbstractView.java
@@ -8,7 +8,7 @@
  * @date 2017/11/27
  */
 
-public interface BaseView {
+public interface AbstractView {
 
     /**
      * Use night mode

diff --git a/...src/main/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyContract.java b/...src/main/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyContract.java
@@ -3,8 +3,8 @@
 import java.util.List;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.hierarchy.KnowledgeHierarchyData;
-import json.chao.com.wanandroid.base.view.BaseView;
 
 /**
  * @author quchao
@@ -13,7 +13,7 @@
 
 public interface KnowledgeHierarchyContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show Knowledge Hierarchy Data

diff --git a/...in/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyDetailContract.java b/...in/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyDetailContract.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.contract.hierarchy;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 
 /**
  * @author quchao
@@ -10,7 +10,7 @@
 
 public interface KnowledgeHierarchyDetailContract  {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show switch project

diff --git a/...main/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyListContract.java b/...main/java/json/chao/com/wanandroid/contract/hierarchy/KnowledgeHierarchyListContract.java
@@ -1,8 +1,8 @@
 package json.chao.com.wanandroid.contract.hierarchy;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleData;
-import json.chao.com.wanandroid.base.view.BaseView;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleListData;
 
 /**
@@ -12,7 +12,7 @@
 
 public interface KnowledgeHierarchyListContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show Knowledge Hierarchy Detail Data

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/ArticleDetailContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/ArticleDetailContract.java
@@ -3,7 +3,7 @@
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleListData;
 
 /**
@@ -13,7 +13,7 @@
 
 public interface ArticleDetailContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show collect article data

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/CollectContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/CollectContract.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.contract.main;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleData;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleListData;
 
@@ -12,7 +12,7 @@
 
 public interface CollectContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show collect list

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/LoginContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/LoginContract.java
@@ -2,7 +2,7 @@
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
 import json.chao.com.wanandroid.core.bean.main.login.LoginData;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 
 /**
  * @author quchao
@@ -11,7 +11,7 @@
 
 public interface LoginContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show login data

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/MainContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/MainContract.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.contract.main;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 
 /**
  * @author quchao
@@ -10,7 +10,7 @@
 
 public interface MainContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show switch project

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/RegisterContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/RegisterContract.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.contract.main;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.main.login.LoginData;
 
 /**
@@ -10,7 +10,7 @@
  */
 public interface RegisterContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show register data

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/SearchContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/SearchContract.java
@@ -4,7 +4,7 @@
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
 import json.chao.com.wanandroid.core.bean.main.search.TopSearchData;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.dao.HistoryData;
 
 /**
@@ -14,7 +14,7 @@
 
 public interface SearchContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show history data

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/SearchListContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/SearchListContract.java
@@ -2,7 +2,7 @@
 
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleData;
 import json.chao.com.wanandroid.core.bean.main.collect.FeedArticleListData;
 
@@ -13,7 +13,7 @@
 
 public interface SearchListContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
         /**
          * Show search list

diff --git a/app/src/main/java/json/chao/com/wanandroid/contract/main/SettingContract.java b/app/src/main/java/json/chao/com/wanandroid/contract/main/SettingContract.java
@@ -1,7 +1,7 @@
 package json.chao.com.wanandroid.contract.main;
 
 import json.chao.com.wanandroid.base.presenter.AbstractPresenter;
-import json.chao.com.wanandroid.base.view.BaseView;
+import json.chao.com.wanandroid.base.view.AbstractView;
 
 /**
  * @author quchao
@@ -10,7 +10,7 @@
 
 public interface SettingContract {
 
-    interface View extends BaseView {
+    interface View extends AbstractView {
 
 
     }