rename

tata88k · May 6, 2016 · 3d9f945 · 3d9f945
1 parent 3f4504c
commit 3d9f945
Showing 13 changed files with 58 additions and 63 deletions.
diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/ExploreFragment.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/ExploreFragment.java
@@ -26,7 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
         }
-        mvcModel = new ExploreModel(new ExploreView(this));
+        model = new ExploreModel(new ExploreView(this));
     }
 
     @Override
@@ -37,21 +37,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     @Override
     public void onResume() {
         super.onResume();
-        mvcModel.setViewVisible(true);
+        model.setViewVisible(true);
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mvcModel.setRefreshing(false);
-        mvcModel.setViewVisible(false);
+        model.setRefreshing(false);
+        model.setViewVisible(false);
     }
 
     public void fetchNavigationExtra() {
-        mvcModel.fetchNavigationExtra();
+        model.fetchNavigationExtra();
     }
 
     public RecyclerAdapter<ExploreBean> getQuickAdapter() {
-        return mvcModel.getAdapter();
+        return model.getAdapter();
     }
 }
diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/MainActivity.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/MainActivity.java
@@ -15,22 +15,22 @@ public class MainActivity extends Activity<MainModel> {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        mvcModel = new MainModel(new MainView(this));
+        model = new MainModel(new MainView(this));
         /** we need to call onCreate() manually*/
-        mvcModel.onCreate();
+        model.onCreate();
     }
 
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main, menu);
-        mvcModel.setNotify(menu.findItem(R.id.action_notify));
+        model.setNotify(menu.findItem(R.id.action_notify));
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (mvcModel.onOptionsItemSelected(item)) {
+        if (model.onOptionsItemSelected(item)) {
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -39,21 +39,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onUserInteraction() {
         super.onUserInteraction();
-        mvcModel.onUserInteraction();
+        model.onUserInteraction();
     }
 
     @Override
     public void onBackPressed() {
-        if (!mvcModel.onBackPressed()) {
+        if (!model.onBackPressed()) {
             super.onBackPressed();
         }
     }
 
     public MainModel.PagerAdapter getPagerAdapter() {
-        return mvcModel.getPagerAdapter();
+        return model.getPagerAdapter();
     }
 
     public boolean hasNotify() {
-        return mvcModel.hasNotify();
+        return model.hasNotify();
     }
 }
diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/NavigationFragment.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/NavigationFragment.java
@@ -26,7 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
         }
-        mvcModel = new NavigationModel(new NavigationView(this));
+        model = new NavigationModel(new NavigationView(this));
     }
 
     @Override
@@ -42,20 +42,20 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        mvcModel.setViewVisible(true);
+        model.setViewVisible(true);
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mvcModel.setViewVisible(false);
+        model.setViewVisible(false);
     }
 
     public RecyclerAdapter<MenuBean> getQuickAdapter() {
-        return mvcModel.getAdapter();
+        return model.getAdapter();
     }
 
     public void loadMenu() {
-        mvcModel.loadMenu();
+        model.loadMenu();
     }
 }
diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/ExploreModel.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/ExploreModel.java
@@ -26,7 +26,7 @@ public class ExploreModel extends FragmentModel<ExploreView> {
 
     public ExploreModel(ExploreView fragment) {
         super(fragment);
-        adapter = new RecyclerAdapter<ExploreBean>(mvcView.getContext(), R.layout.item_explore) {
+        adapter = new RecyclerAdapter<ExploreBean>(view.getContext(), R.layout.item_explore) {
             @Override
             protected void convert(final RecyclerAdapterHelper helper, ExploreBean exploreBean) {
                 helper.setImageResource(R.id.img_explore_icon, exploreBean.getIconResId());
@@ -35,7 +35,7 @@ protected void convert(final RecyclerAdapterHelper helper, ExploreBean exploreBe
                 helper.getItemView().setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        mvcView.clickSnack(helper.getAdapterPosition());
+                        view.clickSnack(helper.getAdapterPosition());
                     }
                 });
             }
@@ -47,11 +47,11 @@ public RecyclerAdapter<ExploreBean> getAdapter() {
     }
 
     public void setRefreshing(final boolean refreshing) {
-        mvcView.setRefreshing(refreshing);
+        view.setRefreshing(refreshing);
     }
 
     public void setViewVisible(boolean visible) {
-        mvcView.setViewVisible(visible);
+        view.setViewVisible(visible);
     }
 
     public void fetchNavigationExtra() {
@@ -67,7 +67,7 @@ public List<ExploreBean> call(Integer integer) {
                         return list;
                     }
                 })
-                .compose(mvcView.getController().<List<ExploreBean>>bindUntilEvent(FragmentEvent.PAUSE))
+                .compose(view.getController().<List<ExploreBean>>bindUntilEvent(FragmentEvent.PAUSE))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Action1<List<ExploreBean>>() {

diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/MainModel.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/MainModel.java
@@ -16,27 +16,27 @@ public class MainModel extends ActivityModel<MainView> {
 
     public MainModel(MainView mvcView) {
         super(mvcView);
-        pagerAdapter = new PagerAdapter(mvcView.getController().getSupportFragmentManager(), 2);
+        pagerAdapter = new PagerAdapter(view.getController().getSupportFragmentManager(), 2);
     }
 
     public void setNotify(MenuItem notify) {
-        mvcView.setNotify(notify);
+        view.setNotify(notify);
     }
 
     public boolean hasNotify() {
         return true;
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {
-        return mvcView.onOptionsItemSelected(item);
+        return view.onOptionsItemSelected(item);
     }
 
     public void onUserInteraction() {
-        mvcView.onUserInteraction();
+        view.onUserInteraction();
     }
 
     public boolean onBackPressed() {
-        return mvcView.onBackPressed();
+        return view.onBackPressed();
     }
 
     public PagerAdapter getPagerAdapter() {

diff --git a/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/NavigationModel.java b/PacificMVC/example/src/main/java/com/pacific/example/mvc/model/NavigationModel.java
@@ -12,7 +12,7 @@ public class NavigationModel extends FragmentModel<NavigationView> {
 
     public NavigationModel(NavigationView mvcView) {
         super(mvcView);
-        adapter = new RecyclerAdapter<MenuBean>(mvcView.getContext(), R.layout.item_menu) {
+        adapter = new RecyclerAdapter<MenuBean>(view.getContext(), R.layout.item_menu) {
             @Override
             protected void convert(RecyclerAdapterHelper helper, MenuBean menuBean) {
                 helper.setImageResource(R.id.img_menu_icon, menuBean.getIconResId());
@@ -26,19 +26,19 @@ public RecyclerAdapter<MenuBean> getAdapter() {
     }
 
     public void loadMenu() {
-        adapter.add(new MenuBean(R.drawable.smart_ticket, mvcView.getContext().getString(R.string.smart_ticket)));
-        adapter.add(new MenuBean(R.drawable.auto_lock, mvcView.getContext().getString(R.string.auto_lock)));
-        adapter.add(new MenuBean(R.drawable.check_device, mvcView.getContext().getString(R.string.check_device)));
-        adapter.add(new MenuBean(R.drawable.e_key, mvcView.getContext().getString(R.string.e_key)));
-        adapter.add(new MenuBean(R.drawable.helper, mvcView.getContext().getString(R.string.helper)));
-        adapter.add(new MenuBean(R.drawable.security_monitor, mvcView.getContext().getString(R.string.security_monitor)));
-        adapter.add(new MenuBean(R.drawable.check_state, mvcView.getContext().getString(R.string.check_state)));
-        adapter.add(new MenuBean(R.drawable.work_instruction, mvcView.getContext().getString(R.string.work_instruction)));
-        adapter.add(new MenuBean(R.drawable.web, mvcView.getContext().getString(R.string.web)));
-        adapter.add(new MenuBean(R.drawable.repair_manage, mvcView.getContext().getString(R.string.repair_manage)));
+        adapter.add(new MenuBean(R.drawable.smart_ticket, view.getContext().getString(R.string.smart_ticket)));
+        adapter.add(new MenuBean(R.drawable.auto_lock, view.getContext().getString(R.string.auto_lock)));
+        adapter.add(new MenuBean(R.drawable.check_device, view.getContext().getString(R.string.check_device)));
+        adapter.add(new MenuBean(R.drawable.e_key, view.getContext().getString(R.string.e_key)));
+        adapter.add(new MenuBean(R.drawable.helper, view.getContext().getString(R.string.helper)));
+        adapter.add(new MenuBean(R.drawable.security_monitor, view.getContext().getString(R.string.security_monitor)));
+        adapter.add(new MenuBean(R.drawable.check_state, view.getContext().getString(R.string.check_state)));
+        adapter.add(new MenuBean(R.drawable.work_instruction, view.getContext().getString(R.string.work_instruction)));
+        adapter.add(new MenuBean(R.drawable.web, view.getContext().getString(R.string.web)));
+        adapter.add(new MenuBean(R.drawable.repair_manage, view.getContext().getString(R.string.repair_manage)));
     }
 
     public void setViewVisible(boolean visible) {
-        mvcView.setViewVisible(visible);
+        view.setViewVisible(visible);
     }
 }
diff --git a/PacificMVC/gradle.properties b/PacificMVC/gradle.properties
@@ -16,7 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=0.0.1
+VERSION_NAME=0.0.2
 VERSION_CODE=1
 GROUP=com.github.thepacific
 POM_NAME=AdapterLibrary

diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/Activity.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/Activity.java
@@ -12,12 +12,12 @@
 
 public abstract class Activity<T extends ActivityModel> extends RxAppCompatActivity implements Fragment.Callback, MVCController {
 
-    protected T mvcModel;
+    protected T model;
 
     @Override
     protected void onStart() {
         super.onStart();
-        if (mvcModel == null) {
+        if (model == null) {
             throw new RuntimeException("must instantiate Model in onCreate().");
         }
     }

diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/ActivityModel.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/ActivityModel.java
@@ -1,15 +1,12 @@
 package com.pacific.mvc;
 
-import android.support.annotation.CallSuper;
-
 public abstract class ActivityModel<T extends ActivityView> extends MVCModel<T> {
 
-    public ActivityModel(T mvcView) {
-        super(mvcView);
+    public ActivityModel(T view) {
+        super(view);
     }
 
-    @CallSuper
     public void onCreate() {
-        mvcView.onCreate();
+        view.onCreate();
     }
 }
diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/Fragment.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/Fragment.java
@@ -15,7 +15,7 @@
 public abstract class Fragment<T extends FragmentModel> extends RxFragment implements MVCController {
 
     protected Callback callback;
-    protected T mvcModel;
+    protected T model;
     private boolean isNew = false;
 
     @Override
@@ -27,7 +27,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (mvcModel == null) {
+        if (model == null) {
             throw new RuntimeException("must instantiate Model in onCreate().");
         }
         return super.onCreateView(inflater, container, savedInstanceState);
@@ -42,7 +42,7 @@ public boolean onTouch(View v, MotionEvent event) {
                 return false;
             }
         });
-        mvcModel.onCreatedView(view);
+        model.onCreatedView(view);
         isNew = false;
     }
 

diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/FragmentModel.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/FragmentModel.java
@@ -1,15 +1,13 @@
 package com.pacific.mvc;
 
-import android.support.annotation.CallSuper;
 import android.view.View;
 
 public abstract class FragmentModel<T extends FragmentView> extends MVCModel<T> {
-    public FragmentModel(T mvcView) {
-        super(mvcView);
+    public FragmentModel(T view) {
+        super(view);
     }
 
-    @CallSuper
     public void onCreatedView(View rootView) {
-        mvcView.onCreatedView(rootView);
+        view.onCreatedView(rootView);
     }
 }
diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/FragmentView.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/FragmentView.java
@@ -30,8 +30,8 @@ public Context getContext() {
         return fragment.getContext();
     }
 
-    final void onCreatedView(View view) {
-        this.view = view;
+    final void onCreatedView(View rootView) {
+        this.view = rootView;
         findView();
         setListener();
         setAdapter();

diff --git a/PacificMVC/mvc/src/main/java/com/pacific/mvc/MVCModel.java b/PacificMVC/mvc/src/main/java/com/pacific/mvc/MVCModel.java
@@ -1,9 +1,9 @@
 package com.pacific.mvc;
 
 public abstract class MVCModel<T extends MVCView> {
-    protected T mvcView;
+    protected T view;
 
-    public MVCModel(T mvcView) {
-        this.mvcView = mvcView;
+    public MVCModel(T view) {
+        this.view = view;
     }
 }