Merge branch 'master' into reactive

Change-Id: Ia588e113ea34034d2fad5a7d409981b1de779162

Author: JoseAlcerreca

.travis.yml

@@ -10,7 +10,6 @@ android:
 jdk:
 - oraclejdk8
 script:
-- cd todoapp
 - ./gradlew test
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

app/build.gradle

@@ -3,15 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
-repositories {
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-}
-
 android {
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
-        applicationId "com.example.android.architecture.blueprints.todomvvmlivekotlin"
+        applicationId "com.example.android.architecture.blueprints.master"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 1

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017, The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -186,19 +186,19 @@ class AppNavigationTest {
 
         // Confirm that if we click "<-" once, we end up back at the task details page
         onView(
-          withContentDescription(
-            activityScenario
-              .getToolbarNavigationContentDescription()
-          )
+            withContentDescription(
+                activityScenario
+                    .getToolbarNavigationContentDescription()
+            )
         ).perform(click())
         onView(withId(R.id.task_detail_title)).check(matches(isDisplayed()))
 
         // Confirm that if we click "<-" a second time, we end up back at the home screen
         onView(
-          withContentDescription(
-            activityScenario
-              .getToolbarNavigationContentDescription()
-          )
+            withContentDescription(
+                activityScenario
+                    .getToolbarNavigationContentDescription()
+            )
         ).perform(click())
         onView(withId(R.id.tasksContainer)).check(matches(isDisplayed()))
     }

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivityTest.kt

@@ -180,8 +180,10 @@ class TasksActivityTest {
         onView(withId(R.id.task_detail_complete)).perform(click())
 
         // Click on the navigation up button to go back to the list
-        onView(withContentDescription(
-            activityScenario.getToolbarNavigationContentDescription())
+        onView(
+            withContentDescription(
+                activityScenario.getToolbarNavigationContentDescription()
+            )
         ).perform(click())
 
         // Check that the task is marked as completed
@@ -205,8 +207,10 @@ class TasksActivityTest {
         onView(withId(R.id.task_detail_complete)).perform(click())
 
         // Click on the navigation up button to go back to the list
-        onView(withContentDescription(
-            activityScenario.getToolbarNavigationContentDescription())
+        onView(
+            withContentDescription(
+                activityScenario.getToolbarNavigationContentDescription()
+            )
         ).perform(click())
 
         // Check that the task is marked as active
@@ -232,8 +236,10 @@ class TasksActivityTest {
         onView(withId(R.id.task_detail_complete)).perform(click())
 
         // Click on the navigation up button to go back to the list
-        onView(withContentDescription(
-            activityScenario.getToolbarNavigationContentDescription())
+        onView(
+            withContentDescription(
+                activityScenario.getToolbarNavigationContentDescription()
+            )
         ).perform(click())
 
         // Check that the task is marked as active
@@ -259,8 +265,10 @@ class TasksActivityTest {
         onView(withId(R.id.task_detail_complete)).perform(click())
 
         // Click on the navigation up button to go back to the list
-        onView(withContentDescription(
-            activityScenario.getToolbarNavigationContentDescription())
+        onView(
+            withContentDescription(
+                activityScenario.getToolbarNavigationContentDescription()
+            )
         ).perform(click())
 
         // Check that the task is marked as active

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/tasks/TestUtils.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.example.android.architecture.blueprints.todoapp.tasks
 
 import android.app.Activity
@@ -13,4 +29,4 @@ fun <T : Activity> ActivityScenario<T>.getToolbarNavigationContentDescription()
             it.findViewById<Toolbar>(R.id.toolbar).navigationContentDescription as String
     }
     return description
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2015 The Android Open Source Project
+  ~ Copyright (C) 2019 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.android.architecture.blueprints.todoapp">
 
     <application

app/src/main/java/com/example/android/architecture/blueprints/todoapp/Event.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017, The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,4 +55,4 @@ class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) : Obser
             onEventUnhandledContent(it)
         }
     }
-}
+}

app/src/main/java/com/example/android/architecture/blueprints/todoapp/ScrollChildSwipeRefreshLayout.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017, The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,12 +29,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
  * define which view controls this behavior.
  */
 class ScrollChildSwipeRefreshLayout @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null
+    context: Context,
+    attrs: AttributeSet? = null
 ) : SwipeRefreshLayout(context, attrs) {
 
     var scrollUpChild: View? = null
 
     override fun canChildScrollUp() =
-            scrollUpChild?.canScrollVertically(-1) ?: super.canChildScrollUp()
+        scrollUpChild?.canScrollVertically(-1) ?: super.canChildScrollUp()
 }

app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoApplication.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.example.android.architecture.blueprints.todoapp
 
 import android.app.Application
@@ -21,4 +37,4 @@ class TodoApplication : Application() {
         super.onCreate()
         if (BuildConfig.DEBUG) Timber.plant(DebugTree())
     }
-}
+}

app/src/main/java/com/example/android/architecture/blueprints/todoapp/ViewModelFactory.kt

@@ -28,7 +28,7 @@ import com.example.android.architecture.blueprints.todoapp.tasks.TasksViewModel
  */
 @Suppress("UNCHECKED_CAST")
 class ViewModelFactory constructor(
-        private val tasksRepository: TasksRepository
+    private val tasksRepository: TasksRepository
 ) : ViewModelProvider.NewInstanceFactory() {
 
     override fun <T : ViewModel> create(modelClass: Class<T>) =