Merge pull request android#401 from GuoTianqi/dev-todo-mvp-kotlin

DougSig · web-flow · commit a477b057d94e · 2017-08-29T09:29:54.000-07:00
[Dev todo mvp kotlin] Use more extension functions
diff --git a/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.kt b/todoapp/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreenTest.kt
@@ -98,7 +98,7 @@ import org.junit.runner.RunWith
      * @return Matcher that matches text in the given view
      */
     private fun withItemText(itemText: String): Matcher<View> {
-        checkArgument(!TextUtils.isEmpty(itemText), "itemText cannot be null or empty")
+        checkArgument(itemText.isNotEmpty(), "itemText cannot be null or empty")
         return object : TypeSafeMatcher<View>() {
             public override fun matchesSafely(item: View): Boolean {
                 return allOf(
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/ScrollChildSwipeRefreshLayout.kt b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/ScrollChildSwipeRefreshLayout.kt
@@ -35,10 +35,6 @@ class ScrollChildSwipeRefreshLayout @JvmOverloads constructor(context: Context,
 
     var scrollUpChild: View? = null
 
-    override fun canChildScrollUp(): Boolean {
-        if (scrollUpChild != null) {
-            return ViewCompat.canScrollVertically(scrollUpChild, -1)
-        }
-        return super.canChildScrollUp()
-    }
+    override fun canChildScrollUp() =
+            scrollUpChild?.canScrollVertically(-1) ?: super.canChildScrollUp()
 }
