More consistent naming convention (#13)

Author: Daniel Novak

library/src/main/java/eu/inloop/viewmodel/AbstractViewModel.java

@@ -7,6 +7,7 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.util.Log;
+import android.view.View;
 
 public abstract class AbstractViewModel<T extends IView> {
 
@@ -39,14 +40,19 @@ public String getUniqueIdentifier() {
      *                  {@link Activity#getIntent()}.{@link Intent#getExtras()}
      * @param savedInstanceState bundle with saved state, will be not null
      *               only in case the system is killed due to low memory
-     *               and restored (and {@link #saveState(Bundle)} returned a non-null bundle.
+     *               and restored (and {@link #onSaveInstanceState(Bundle)} returned a non-null bundle.
      */
     @SuppressWarnings("EmptyMethod")
     public void onCreate(@Nullable Bundle arguments, @Nullable Bundle savedInstanceState) {
 
     }
 
-    public void bindView(@NonNull T view) {
+    /**
+     * This method is an equivalent of {@link Fragment#onViewCreated(View, Bundle)} or {@link Activity#onCreate(Bundle)}.
+     * At this point, the View is ready and you can initialise it.
+     * @param view
+     */
+    public void onBindView(@NonNull T view) {
         mBindViewWasCalled = true;
         mView = view;
     }
@@ -61,7 +67,7 @@ public void clearView() {
     }
 
     @SuppressWarnings("EmptyMethod")
-    public void saveState(@NonNull final Bundle bundle) {
+    public void onSaveInstanceState(@NonNull final Bundle bundle) {
 
     }
 
@@ -82,7 +88,7 @@ public void onStart() {
      * This is a good place to empty any planned tasks that are useless without a UI.
      */
     @SuppressWarnings("EmptyMethod")
-    public void onModelRemoved() {
+    public void onDestroy() {
 
     }
 }

library/src/main/java/eu/inloop/viewmodel/ViewModelHelper.java

@@ -71,7 +71,7 @@ public void setView(@NonNull final T view) {
             //no viewmodel for this fragment
             return;
         }
-        mViewModel.bindView(view);
+        mViewModel.onBindView(view);
     }
 
     /**
@@ -176,15 +176,15 @@ public R getViewModel() {
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         bundle.putString("identifier", mScreenId);
         if (mViewModel != null) {
-            mViewModel.saveState(bundle);
+            mViewModel.onSaveInstanceState(bundle);
             mOnSaveInstanceCalled = true;
         }
     }
 
     private void removeViewModel(@NonNull final Activity activity) {
         if (mViewModel != null && !mModelRemoved) {
             getViewModelProvider(activity).getViewModelProvider().remove(mScreenId);
-            mViewModel.onModelRemoved();
+            mViewModel.onDestroy();
             mModelRemoved = true;
         }
     }

sample/src/main/java/eu/inloop/viewmodel/sample/viewmodel/UserListViewModel.java

@@ -32,8 +32,8 @@ public void onCreate(@Nullable Bundle arguments, @Nullable Bundle savedInstanceS
     }
 
     @Override
-    public void bindView(@NonNull IUserListView view) {
-        super.bindView(view);
+    public void onBindView(@NonNull IUserListView view) {
+        super.onBindView(view);
 
         //downloading list of users
         if (mLoadedUsers != null) {
@@ -127,16 +127,16 @@ protected void onPostExecute(Void aVoid) {
 
 
     @Override
-    public void saveState(@NonNull final Bundle bundle) {
-        super.saveState(bundle);
+    public void onSaveInstanceState(@NonNull final Bundle bundle) {
+        super.onSaveInstanceState(bundle);
         if (mLoadedUsers != null) {
             bundle.putStringArrayList("userlist", new ArrayList<>(mLoadedUsers));
         }
     }
 
     @Override
-    public void onModelRemoved() {
-        super.onModelRemoved();
+    public void onDestroy() {
+        super.onDestroy();
         //use this to cancel any planned requests
     }
 }