Skip to content

Commit 3d9f945

Browse files
UsherBabyUsherBaby
UsherBaby
authored and
UsherBaby
committed
rename
1 parent 3f4504c commit 3d9f945

File tree

13 files changed

+58
-63
lines changed

13 files changed

+58
-63
lines changed

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/ExploreFragment.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727
if (getArguments() != null) {
2828
}
29-
mvcModel = new ExploreModel(new ExploreView(this));
29+
model = new ExploreModel(new ExploreView(this));
3030
}
3131

3232
@Override
@@ -37,21 +37,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
3737
@Override
3838
public void onResume() {
3939
super.onResume();
40-
mvcModel.setViewVisible(true);
40+
model.setViewVisible(true);
4141
}
4242

4343
@Override
4444
public void onPause() {
4545
super.onPause();
46-
mvcModel.setRefreshing(false);
47-
mvcModel.setViewVisible(false);
46+
model.setRefreshing(false);
47+
model.setViewVisible(false);
4848
}
4949

5050
public void fetchNavigationExtra() {
51-
mvcModel.fetchNavigationExtra();
51+
model.fetchNavigationExtra();
5252
}
5353

5454
public RecyclerAdapter<ExploreBean> getQuickAdapter() {
55-
return mvcModel.getAdapter();
55+
return model.getAdapter();
5656
}
5757
}

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/MainActivity.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ public class MainActivity extends Activity<MainModel> {
1515
protected void onCreate(Bundle savedInstanceState) {
1616
super.onCreate(savedInstanceState);
1717
setContentView(R.layout.activity_main);
18-
mvcModel = new MainModel(new MainView(this));
18+
model = new MainModel(new MainView(this));
1919
/** we need to call onCreate() manually*/
20-
mvcModel.onCreate();
20+
model.onCreate();
2121
}
2222

2323

2424
@Override
2525
public boolean onCreateOptionsMenu(Menu menu) {
2626
getMenuInflater().inflate(R.menu.main, menu);
27-
mvcModel.setNotify(menu.findItem(R.id.action_notify));
27+
model.setNotify(menu.findItem(R.id.action_notify));
2828
return true;
2929
}
3030

3131
@Override
3232
public boolean onOptionsItemSelected(MenuItem item) {
33-
if (mvcModel.onOptionsItemSelected(item)) {
33+
if (model.onOptionsItemSelected(item)) {
3434
return true;
3535
}
3636
return super.onOptionsItemSelected(item);
@@ -39,21 +39,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
3939
@Override
4040
public void onUserInteraction() {
4141
super.onUserInteraction();
42-
mvcModel.onUserInteraction();
42+
model.onUserInteraction();
4343
}
4444

4545
@Override
4646
public void onBackPressed() {
47-
if (!mvcModel.onBackPressed()) {
47+
if (!model.onBackPressed()) {
4848
super.onBackPressed();
4949
}
5050
}
5151

5252
public MainModel.PagerAdapter getPagerAdapter() {
53-
return mvcModel.getPagerAdapter();
53+
return model.getPagerAdapter();
5454
}
5555

5656
public boolean hasNotify() {
57-
return mvcModel.hasNotify();
57+
return model.hasNotify();
5858
}
5959
}

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/controller/NavigationFragment.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727
if (getArguments() != null) {
2828
}
29-
mvcModel = new NavigationModel(new NavigationView(this));
29+
model = new NavigationModel(new NavigationView(this));
3030
}
3131

3232
@Override
@@ -42,20 +42,20 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
4242
@Override
4343
public void onResume() {
4444
super.onResume();
45-
mvcModel.setViewVisible(true);
45+
model.setViewVisible(true);
4646
}
4747

4848
@Override
4949
public void onPause() {
5050
super.onPause();
51-
mvcModel.setViewVisible(false);
51+
model.setViewVisible(false);
5252
}
5353

5454
public RecyclerAdapter<MenuBean> getQuickAdapter() {
55-
return mvcModel.getAdapter();
55+
return model.getAdapter();
5656
}
5757

5858
public void loadMenu() {
59-
mvcModel.loadMenu();
59+
model.loadMenu();
6060
}
6161
}

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/model/ExploreModel.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ExploreModel extends FragmentModel<ExploreView> {
2626

2727
public ExploreModel(ExploreView fragment) {
2828
super(fragment);
29-
adapter = new RecyclerAdapter<ExploreBean>(mvcView.getContext(), R.layout.item_explore) {
29+
adapter = new RecyclerAdapter<ExploreBean>(view.getContext(), R.layout.item_explore) {
3030
@Override
3131
protected void convert(final RecyclerAdapterHelper helper, ExploreBean exploreBean) {
3232
helper.setImageResource(R.id.img_explore_icon, exploreBean.getIconResId());
@@ -35,7 +35,7 @@ protected void convert(final RecyclerAdapterHelper helper, ExploreBean exploreBe
3535
helper.getItemView().setOnClickListener(new View.OnClickListener() {
3636
@Override
3737
public void onClick(View v) {
38-
mvcView.clickSnack(helper.getAdapterPosition());
38+
view.clickSnack(helper.getAdapterPosition());
3939
}
4040
});
4141
}
@@ -47,11 +47,11 @@ public RecyclerAdapter<ExploreBean> getAdapter() {
4747
}
4848

4949
public void setRefreshing(final boolean refreshing) {
50-
mvcView.setRefreshing(refreshing);
50+
view.setRefreshing(refreshing);
5151
}
5252

5353
public void setViewVisible(boolean visible) {
54-
mvcView.setViewVisible(visible);
54+
view.setViewVisible(visible);
5555
}
5656

5757
public void fetchNavigationExtra() {
@@ -67,7 +67,7 @@ public List<ExploreBean> call(Integer integer) {
6767
return list;
6868
}
6969
})
70-
.compose(mvcView.getController().<List<ExploreBean>>bindUntilEvent(FragmentEvent.PAUSE))
70+
.compose(view.getController().<List<ExploreBean>>bindUntilEvent(FragmentEvent.PAUSE))
7171
.subscribeOn(Schedulers.io())
7272
.observeOn(AndroidSchedulers.mainThread())
7373
.subscribe(new Action1<List<ExploreBean>>() {

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/model/MainModel.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ public class MainModel extends ActivityModel<MainView> {
1616

1717
public MainModel(MainView mvcView) {
1818
super(mvcView);
19-
pagerAdapter = new PagerAdapter(mvcView.getController().getSupportFragmentManager(), 2);
19+
pagerAdapter = new PagerAdapter(view.getController().getSupportFragmentManager(), 2);
2020
}
2121

2222
public void setNotify(MenuItem notify) {
23-
mvcView.setNotify(notify);
23+
view.setNotify(notify);
2424
}
2525

2626
public boolean hasNotify() {
2727
return true;
2828
}
2929

3030
public boolean onOptionsItemSelected(MenuItem item) {
31-
return mvcView.onOptionsItemSelected(item);
31+
return view.onOptionsItemSelected(item);
3232
}
3333

3434
public void onUserInteraction() {
35-
mvcView.onUserInteraction();
35+
view.onUserInteraction();
3636
}
3737

3838
public boolean onBackPressed() {
39-
return mvcView.onBackPressed();
39+
return view.onBackPressed();
4040
}
4141

4242
public PagerAdapter getPagerAdapter() {

‎PacificMVC/example/src/main/java/com/pacific/example/mvc/model/NavigationModel.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class NavigationModel extends FragmentModel<NavigationView> {
1212

1313
public NavigationModel(NavigationView mvcView) {
1414
super(mvcView);
15-
adapter = new RecyclerAdapter<MenuBean>(mvcView.getContext(), R.layout.item_menu) {
15+
adapter = new RecyclerAdapter<MenuBean>(view.getContext(), R.layout.item_menu) {
1616
@Override
1717
protected void convert(RecyclerAdapterHelper helper, MenuBean menuBean) {
1818
helper.setImageResource(R.id.img_menu_icon, menuBean.getIconResId());
@@ -26,19 +26,19 @@ public RecyclerAdapter<MenuBean> getAdapter() {
2626
}
2727

2828
public void loadMenu() {
29-
adapter.add(new MenuBean(R.drawable.smart_ticket, mvcView.getContext().getString(R.string.smart_ticket)));
30-
adapter.add(new MenuBean(R.drawable.auto_lock, mvcView.getContext().getString(R.string.auto_lock)));
31-
adapter.add(new MenuBean(R.drawable.check_device, mvcView.getContext().getString(R.string.check_device)));
32-
adapter.add(new MenuBean(R.drawable.e_key, mvcView.getContext().getString(R.string.e_key)));
33-
adapter.add(new MenuBean(R.drawable.helper, mvcView.getContext().getString(R.string.helper)));
34-
adapter.add(new MenuBean(R.drawable.security_monitor, mvcView.getContext().getString(R.string.security_monitor)));
35-
adapter.add(new MenuBean(R.drawable.check_state, mvcView.getContext().getString(R.string.check_state)));
36-
adapter.add(new MenuBean(R.drawable.work_instruction, mvcView.getContext().getString(R.string.work_instruction)));
37-
adapter.add(new MenuBean(R.drawable.web, mvcView.getContext().getString(R.string.web)));
38-
adapter.add(new MenuBean(R.drawable.repair_manage, mvcView.getContext().getString(R.string.repair_manage)));
29+
adapter.add(new MenuBean(R.drawable.smart_ticket, view.getContext().getString(R.string.smart_ticket)));
30+
adapter.add(new MenuBean(R.drawable.auto_lock, view.getContext().getString(R.string.auto_lock)));
31+
adapter.add(new MenuBean(R.drawable.check_device, view.getContext().getString(R.string.check_device)));
32+
adapter.add(new MenuBean(R.drawable.e_key, view.getContext().getString(R.string.e_key)));
33+
adapter.add(new MenuBean(R.drawable.helper, view.getContext().getString(R.string.helper)));
34+
adapter.add(new MenuBean(R.drawable.security_monitor, view.getContext().getString(R.string.security_monitor)));
35+
adapter.add(new MenuBean(R.drawable.check_state, view.getContext().getString(R.string.check_state)));
36+
adapter.add(new MenuBean(R.drawable.work_instruction, view.getContext().getString(R.string.work_instruction)));
37+
adapter.add(new MenuBean(R.drawable.web, view.getContext().getString(R.string.web)));
38+
adapter.add(new MenuBean(R.drawable.repair_manage, view.getContext().getString(R.string.repair_manage)));
3939
}
4040

4141
public void setViewVisible(boolean visible) {
42-
mvcView.setViewVisible(visible);
42+
view.setViewVisible(visible);
4343
}
4444
}

‎PacificMVC/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
VERSION_NAME=0.0.1
19+
VERSION_NAME=0.0.2
2020
VERSION_CODE=1
2121
GROUP=com.github.thepacific
2222
POM_NAME=AdapterLibrary

‎PacificMVC/mvc/src/main/java/com/pacific/mvc/Activity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
public abstract class Activity<T extends ActivityModel> extends RxAppCompatActivity implements Fragment.Callback, MVCController {
1414

15-
protected T mvcModel;
15+
protected T model;
1616

1717
@Override
1818
protected void onStart() {
1919
super.onStart();
20-
if (mvcModel == null) {
20+
if (model == null) {
2121
throw new RuntimeException("must instantiate Model in onCreate().");
2222
}
2323
}

‎PacificMVC/mvc/src/main/java/com/pacific/mvc/ActivityModel.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package com.pacific.mvc;
22

3-
import android.support.annotation.CallSuper;
4-
53
public abstract class ActivityModel<T extends ActivityView> extends MVCModel<T> {
64

7-
public ActivityModel(T mvcView) {
8-
super(mvcView);
5+
public ActivityModel(T view) {
6+
super(view);
97
}
108

11-
@CallSuper
129
public void onCreate() {
13-
mvcView.onCreate();
10+
view.onCreate();
1411
}
1512
}

‎PacificMVC/mvc/src/main/java/com/pacific/mvc/Fragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public abstract class Fragment<T extends FragmentModel> extends RxFragment implements MVCController {
1616

1717
protected Callback callback;
18-
protected T mvcModel;
18+
protected T model;
1919
private boolean isNew = false;
2020

2121
@Override
@@ -27,7 +27,7 @@ public void onCreate(Bundle savedInstanceState) {
2727
@Nullable
2828
@Override
2929
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
30-
if (mvcModel == null) {
30+
if (model == null) {
3131
throw new RuntimeException("must instantiate Model in onCreate().");
3232
}
3333
return super.onCreateView(inflater, container, savedInstanceState);
@@ -42,7 +42,7 @@ public boolean onTouch(View v, MotionEvent event) {
4242
return false;
4343
}
4444
});
45-
mvcModel.onCreatedView(view);
45+
model.onCreatedView(view);
4646
isNew = false;
4747
}
4848

0 commit comments

Comments
 (0)