Code cleanup (Lint checks)

Author: Daniel Novak

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

@@ -38,22 +38,26 @@ public void clearView() {
         mView = null;
     }
 
+    @SuppressWarnings("EmptyMethod")
     public void saveState(Bundle bundle) {
 
     }
 
     /**
      * Will be called only in case the system is killed due to low memory and restored
-     * @param bundle
+     * @param bundle - bundle with saved state
      */
+    @SuppressWarnings("EmptyMethod")
     public void restoreState(Bundle bundle) {
 
     }
 
+    @SuppressWarnings("EmptyMethod")
     public void onStop() {
 
     }
 
+    @SuppressWarnings("EmptyMethod")
     public void onStart() {
 
     }
@@ -62,6 +66,7 @@ public void onStart() {
      * Called when there parent fragment or view is already gone and destroyed.
      * This is a good place to empty any planned tasks that are useless without a UI.
      */
+    @SuppressWarnings("EmptyMethod")
     public void onModelRemoved() {
 
     }

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

@@ -15,7 +15,7 @@ public class ViewModelHelper<T extends IView, R extends AbstractViewModel<T>> {
     private R mViewModel;
     private boolean mModelRemoved;
     private boolean mOnSaveInstanceCalled;
-    private static AtomicInteger sModelIndex = new AtomicInteger(0);
+    private static final AtomicInteger sModelIndex = new AtomicInteger(0);
 
     /**
      * Call from {@link android.app.Activity#onCreate(android.os.Bundle)} or
@@ -41,11 +41,14 @@ public void onCreate(@Nullable Bundle savedInstanceState,
 
         // get model instance for this screen
         final ViewModelProvider.ViewModelWrapper<T> viewModelWrapper = ViewModelProvider.getInstance().getViewModel(mScreenId, viewModelClass);
+        //noinspection unchecked
         mViewModel = (R) viewModelWrapper.viewModel;
 
         // detect that the system has killed the app - saved instance is not null, but the model was recreated
         if (savedInstanceState != null && viewModelWrapper.wasCreated) {
-            Log.d("model", "Fragment recreated by system - restoring viewmodel");
+            if (BuildConfig.DEBUG) {
+                Log.d("model", "Fragment recreated by system - restoring viewmodel");
+            }
             mViewModel.restoreState(savedInstanceState);
         }
     }
@@ -95,7 +98,9 @@ public void onDestroy(@NonNull Fragment fragment) {
         } else if (fragment.isRemoving() && !mOnSaveInstanceCalled) {
             // The fragment can be still in backstack even if isRemoving() is true.
             // We check mOnSaveInstanceCalled - if this was not called then the fragment is totally removed.
-            Log.d("mode", "Removing viewmodel - fragment replaced");
+            if (BuildConfig.DEBUG) {
+                Log.d("mode", "Removing viewmodel - fragment replaced");
+            }
             removeViewModel();
         }
     }

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

@@ -2,8 +2,6 @@
 import android.support.annotation.NonNull;
 import android.util.SparseArray;
 
-import java.util.HashMap;
-
 /**
  * Create and keep this class inside your Activity. Store it
  * in {@link android.support.v4.app.FragmentActivity#onRetainCustomNonConfigurationInstance()
@@ -28,13 +26,6 @@ public synchronized void remove(int modelIndex) {
         mViewModelCache.remove(modelIndex);
     }
 
-    /**
-     * Call this in {@link android.app.Activity#onStop()} if {@link android.app.Activity#isFinishing()}
-     */
-    public synchronized void removeAllViewModels() {
-        mViewModelCache.clear();
-    }
-
     @SuppressWarnings("unchecked")
     @NonNull
     public synchronized <T extends IView> ViewModelWrapper<T> getViewModel(int modelIndex, @NonNull Class<? extends AbstractViewModel<T>> viewModelClass) {
@@ -48,8 +39,8 @@ public synchronized <T extends IView> ViewModelWrapper<T> getViewModel(int model
             instance.setUniqueIdentifier(modelIndex);
             mViewModelCache.put(modelIndex, instance);
             return new ViewModelWrapper<>(instance, true);
-        } catch (InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
         }
     }
 

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java

@@ -1,7 +1,6 @@
 package eu.inloop.viewmodel.base;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AppCompatActivity;
 
 import eu.inloop.viewmodel.AbstractViewModel;
@@ -10,12 +9,13 @@
 
 public abstract class ViewModelBaseActivity<T extends IView, R extends AbstractViewModel<T>> extends AppCompatActivity implements IView {
 
-    private ViewModelHelper<T, R> mViewModeHelper = new ViewModelHelper<>();
+    private final ViewModelHelper<T, R> mViewModeHelper = new ViewModelHelper<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mViewModeHelper.onCreate(savedInstanceState, getViewModelClass());
+        //noinspection unchecked
         mViewModeHelper.initWithView((T) this);
     }
 

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseFragment.java

@@ -11,7 +11,7 @@
 
 public abstract class ViewModelBaseFragment<T extends IView, R extends AbstractViewModel<T>> extends Fragment {
 
-    private ViewModelHelper<T, R> mViewModeHelper = new ViewModelHelper<>();
+    private final ViewModelHelper<T, R> mViewModeHelper = new ViewModelHelper<>();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -24,6 +24,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        //noinspection unchecked
         mViewModeHelper.initWithView((T) this);
     }
 

sample/src/main/java/eu/inloop/viewmodel/sample/activity/MainActivity.java

@@ -3,10 +3,8 @@
 import android.os.Bundle;
 
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import eu.inloop.viewmodel.base.ViewModelBaseActivity;
 import eu.inloop.viewmodel.sample.R;
-import eu.inloop.viewmodel.sample.fragment.EmptyFragment;
 import eu.inloop.viewmodel.sample.fragment.UserListFragment;
 
 

sample/src/main/java/eu/inloop/viewmodel/sample/fragment/EmptyFragment.java

@@ -1,6 +1,5 @@
 package eu.inloop.viewmodel.sample.fragment;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;

sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java

@@ -90,21 +90,6 @@ public void showUsers(List<String> users) {
         mAdapter.notifyDataSetChanged();
     }
 
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
-
     @Override
     public void showLoading(float progress) {
         mProgressView.setVisibility(View.VISIBLE);

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

@@ -127,7 +127,7 @@ public void restoreState(Bundle bundle) {
     public void saveState(Bundle bundle) {
         super.saveState(bundle);
         if (mLoadedUsers != null) {
-            bundle.putStringArrayList("userlist", new ArrayList<String>(mLoadedUsers));
+            bundle.putStringArrayList("userlist", new ArrayList<>(mLoadedUsers));
         }
     }
 

sample/src/main/res/layout/fragment_empty.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <TextView
-        android:text="Test"
+        android:text="@string/empty_fragment_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />