Add setModelView() method

inloop · May 18, 2015 · 54a7d1a · 54a7d1a
1 parent 65396a0
commit 54a7d1a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java b/library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java
@@ -62,7 +62,7 @@ public void onCreate(@Nullable Bundle savedInstanceState,
      * or {@link android.app.Activity#onCreate(android.os.Bundle)}
      * @param view
      */
-    public void initWithView(@NonNull T view) {
+    public void setView(@NonNull T view) {
         if (mViewModel == null) {
             //no viewmodel for this fragment
             return;

diff --git a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java
@@ -1,6 +1,7 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 
 import eu.inloop.viewmodel.AbstractViewModel;
@@ -15,8 +16,14 @@ public abstract class ViewModelBaseActivity<T extends IView, R extends AbstractV
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mViewModeHelper.onCreate(savedInstanceState, getViewModelClass(), getIntent().getExtras());
-        //noinspection unchecked
-        mViewModeHelper.initWithView((T) this);
+    }
+
+    /**
+     * Call this after your view is ready - usually on the end of {@link android.app.Activity#onCreate(Bundle)}
+     * @param view
+     */
+    public void setModelView(@NonNull T view) {
+        mViewModeHelper.setView(view);
     }
 
     public abstract Class<R> getViewModelClass();

diff --git a/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java b/library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java
@@ -1,6 +1,7 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.view.View;
@@ -21,11 +22,12 @@ public void onCreate(Bundle savedInstanceState) {
 
     public abstract Class<R> getViewModelClass();
 
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        //noinspection unchecked
-        mViewModeHelper.initWithView((T) this);
+    /**
+     * Call this after your view is ready - usually on the end of {@link Fragment#onViewCreated(View, Bundle)}
+     * @param view
+     */
+    protected void setModelView(@NonNull T view) {
+        mViewModeHelper.setView(view);
     }
 
     @Override

diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java
@@ -29,6 +29,12 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return inflater.inflate(R.layout.fragment_empty, container, false);
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        setModelView(this);
+    }
+
     @Override
     public Class<SampleArgumentViewModel> getViewModelClass() {
         return SampleArgumentViewModel.class;

diff --git a/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java b/sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java
@@ -79,6 +79,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 getViewModel().deleteUser(i - mListview.getHeaderViewsCount());
             }
         });
+        setModelView(this);
     }
 
     @Override