Removes ViewModelItem and small fixes

JoseAlcerreca · JoseAlcerreca · commit d39dfb77282c · 2017-08-30T13:04:44.000+02:00
diff --git a/todoapp/app/build.gradle b/todoapp/app/build.gradle
@@ -41,8 +41,8 @@ android {
 
     // Remove mockRelease as it's not needed.
     android.variantFilter { variant ->
-        if(variant.buildType.name.equals('release')
-                && variant.getFlavors().get(0).name.equals('mock')) {
+        if(variant.buildType.name == 'release'
+                && variant.getFlavors().get(0).name == 'mock') {
             variant.setIgnore(true);
         }
     }
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/TestUtils.java b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/TestUtils.java
@@ -16,9 +16,6 @@
 
 package com.example.android.architecture.blueprints.todoapp;
 
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.runner.lifecycle.Stage.RESUMED;
-
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
@@ -30,6 +27,9 @@
 
 import java.util.Collection;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static android.support.test.runner.lifecycle.Stage.RESUMED;
+
 /**
  * Useful test methods common to all activities
  */
@@ -63,7 +63,7 @@ public static void rotateOrientation(Activity activity) {
      */
     public static String getToolbarNavigationContentDescription(
             @NonNull Activity activity, @IdRes int toolbar1) {
-        Toolbar toolbar = (Toolbar) activity.findViewById(toolbar1);
+        Toolbar toolbar = activity.findViewById(toolbar1);
         if (toolbar != null) {
             return (String) toolbar.getNavigationContentDescription();
         } else {
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/data/TasksLocalDataSourceTest.java b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/data/TasksLocalDataSourceTest.java
@@ -17,8 +17,8 @@
 package com.example.android.architecture.blueprints.todoapp.data;
 
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksDataSource;
 import com.example.android.architecture.blueprints.todoapp.data.source.local.TasksDbHelper;
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.java b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.java
@@ -16,6 +16,18 @@
 
 package com.example.android.architecture.blueprints.todoapp.tasks;
 
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
+
+import com.example.android.architecture.blueprints.todoapp.R;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
@@ -25,22 +37,9 @@
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
 import static com.example.android.architecture.blueprints.todoapp.TestUtils.getToolbarNavigationContentDescription;
 import static com.example.android.architecture.blueprints.todoapp.custom.action.NavigationViewActions.navigateTo;
 
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.v4.widget.DrawerLayout;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.view.Gravity;
-
-import com.example.android.architecture.blueprints.todoapp.R;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 /**
  * Tests for the {@link DrawerLayout} layout component in {@link TasksActivity} which manages
  * navigation within the app.
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.java b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.java
@@ -17,10 +17,10 @@
 package com.example.android.architecture.blueprints.todoapp.tasks;
 
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ListView;
diff --git a/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.java b/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.java
@@ -23,10 +23,10 @@
 import android.support.test.espresso.IdlingRegistry;
 import android.support.test.espresso.intent.rule.IntentsTestRule;
 import android.support.test.espresso.matcher.BoundedMatcher;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.widget.Toolbar;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.View;
 
 import com.example.android.architecture.blueprints.todoapp.R;
diff --git a/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreenTest.java b/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreenTest.java
@@ -19,9 +19,9 @@
 import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.IdlingRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.example.android.architecture.blueprints.todoapp.Injection;
 import com.example.android.architecture.blueprints.todoapp.R;
diff --git a/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreenTest.java b/todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreenTest.java
@@ -19,10 +19,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.Espresso;
+import android.support.test.espresso.IdlingRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.example.android.architecture.blueprints.todoapp.Injection;
 import com.example.android.architecture.blueprints.todoapp.R;
@@ -122,7 +122,7 @@ private void startActivityWithWithStubbedTask(Task task) {
      */
     @Before
     public void registerIdlingResource() {
-        Espresso.registerIdlingResources(EspressoIdlingResource.getIdlingResource());
+        IdlingRegistry.getInstance().register(EspressoIdlingResource.getIdlingResource());
     }
 
     @Test
@@ -167,6 +167,6 @@ public void orientationChange_menuAndTaskPersist() {
      */
     @After
     public void unregisterIdlingResource() {
-        Espresso.unregisterIdlingResources(EspressoIdlingResource.getIdlingResource());
+        IdlingRegistry.getInstance().unregister(EspressoIdlingResource.getIdlingResource());
     }
 }
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/ScrollChildSwipeRefreshLayout.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/ScrollChildSwipeRefreshLayout.java
@@ -44,7 +44,7 @@ public ScrollChildSwipeRefreshLayout(Context context, AttributeSet attrs) {
     @Override
     public boolean canChildScrollUp() {
         if (mScrollUpChild != null) {
-            return ViewCompat.canScrollVertically(mScrollUpChild, -1);
+            return mScrollUpChild.canScrollVertically(-1);
         }
         return super.canChildScrollUp();
     }
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TaskViewModel.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/TaskViewModel.java
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/source/local/TasksLocalDataSource.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/source/local/TasksLocalDataSource.java
@@ -60,7 +60,7 @@ public static TasksLocalDataSource getInstance(@NonNull Context context) {
      */
     @Override
     public void getTasks(@NonNull LoadTasksCallback callback) {
-        List<Task> tasks = new ArrayList<Task>();
+        List<Task> tasks = new ArrayList<>();
         SQLiteDatabase db = mDbHelper.getReadableDatabase();
 
         String[] projection = {
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.java
@@ -57,7 +57,7 @@ public class StatisticsViewModel extends AndroidViewModel {
 
     private int mNumberOfCompletedTasks = 0;
 
-    private Context mContext;
+    private final Context mContext;
 
     private final TasksRepository mTasksRepository;
 
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModel.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModel.java
@@ -42,9 +42,9 @@ public class TaskDetailViewModel extends AndroidViewModel implements TasksDataSo
 
     public final ObservableBoolean completed = new ObservableBoolean();
 
-    private SingleLiveEvent<Void> mEditTaskCommand = new SingleLiveEvent<>();
+    private final SingleLiveEvent<Void> mEditTaskCommand = new SingleLiveEvent<>();
 
-    private SingleLiveEvent<Void> mDeleteTaskCommand = new SingleLiveEvent<>();
+    private final SingleLiveEvent<Void> mDeleteTaskCommand = new SingleLiveEvent<>();
 
     private final TasksRepository mTasksRepository;
 
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TaskItemViewModel.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TaskItemViewModel.java
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.java
diff --git a/todoapp/app/src/main/res/layout/task_item.xml b/todoapp/app/src/main/res/layout/task_item.xml
diff --git a/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TaskItemViewModelTest.java b/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TaskItemViewModelTest.java

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ android {`
`41`	`41`
`42`	`42`	`// Remove mockRelease as it's not needed.`
`43`	`43`	`android.variantFilter { variant ->`
`44`		`- if(variant.buildType.name.equals('release')`
`45`		`- && variant.getFlavors().get(0).name.equals('mock')) {`
	`44`	`+ if(variant.buildType.name == 'release'`
	`45`	`+ && variant.getFlavors().get(0).name == 'mock') {`
`46`	`46`	`variant.setIgnore(true);`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ScrollChildSwipeRefreshLayout(Context context, AttributeSet attrs) {`
`44`	`44`	`@Override`
`45`	`45`	`public boolean canChildScrollUp() {`
`46`	`46`	`if (mScrollUpChild != null) {`
`47`		`- return ViewCompat.canScrollVertically(mScrollUpChild, -1);`
	`47`	`+ return mScrollUpChild.canScrollVertically(-1);`
`48`	`48`	`}`
`49`	`49`	`return super.canChildScrollUp();`
`50`	`50`	`}`