Merge pull request #961 from dlam/dlam/update-paging

Update PagingSample with ViewBinding and ActivityScenario

Author: dlam

PagingSample/app/build.gradle

@@ -15,12 +15,9 @@
  */
 
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
 apply plugin: 'kotlin-kapt'
+
 android {
     compileSdkVersion build_versions.compile_sdk
     buildToolsVersion build_versions.build_tools
@@ -32,16 +29,23 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
@@ -63,8 +67,8 @@ dependencies {
     androidTestImplementation deps.atsl.ext_junit
     androidTestImplementation deps.atsl.runner
     androidTestImplementation deps.atsl.rules
-    androidTestImplementation deps.room.testing
     androidTestImplementation deps.arch_core.testing
+    androidTestImplementation deps.room.testing
 
     kapt deps.room.compiler
 }

PagingSample/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 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 paging.android.example.com.pagingsample
+
+import android.content.Intent
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.CoreMatchers
+import org.hamcrest.MatcherAssert
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeoutException
+
+/**
+ * Simply sanity test to ensure that activity launches without any issues and shows some data.
+ */
+@RunWith(AndroidJUnit4::class)
+class MainActivityTest {
+
+    @Test
+    @Throws(InterruptedException::class, TimeoutException::class)
+    fun showSomeResults() {
+        val intent = Intent(ApplicationProvider.getApplicationContext(), MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        val scenario = ActivityScenario.launch<MainActivity>(intent)
+
+        scenario.onActivity { activity ->
+            val recyclerView: RecyclerView = activity.binding.cheeseList
+            MatcherAssert.assertThat(recyclerView.adapter, CoreMatchers.notNullValue())
+            MatcherAssert.assertThat(recyclerView.adapter!!.itemCount > 0, CoreMatchers.`is`(true))
+        }
+    }
+}

PagingSample/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.kt

@@ -24,9 +24,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import paging.android.example.com.pagingsample.databinding.ActivityMainBinding
 
 /**
  * Shows a list of Cheeses, with swipe-to-delete, and an input field at the top to add.
@@ -35,15 +35,18 @@ import kotlinx.coroutines.launch
  * is updated automatically using paging components.
  */
 class MainActivity : AppCompatActivity() {
+    lateinit var binding: ActivityMainBinding
+        private set
     private val viewModel by viewModels<CheeseViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         // Create adapter for the RecyclerView
         val adapter = CheeseAdapter()
-        cheeseList.adapter = adapter
+        binding.cheeseList.adapter = adapter
 
         // Subscribe the adapter to the ViewModel, so the items in the adapter are refreshed
         // when the list changes
@@ -60,7 +63,7 @@ class MainActivity : AppCompatActivity() {
             // enable the items to swipe to the left or right
             override fun getMovementFlags(recyclerView: RecyclerView,
                                           viewHolder: RecyclerView.ViewHolder): Int =
-                    makeMovementFlags(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT)
+                makeMovementFlags(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT)
 
             override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder,
                                 target: RecyclerView.ViewHolder): Boolean = false
@@ -72,32 +75,32 @@ class MainActivity : AppCompatActivity() {
                     viewModel.remove(it)
                 }
             }
-        }).attachToRecyclerView(cheeseList)
+        }).attachToRecyclerView(binding.cheeseList)
     }
 
     private fun addCheese() {
-        val newCheese = inputText.text.trim()
+        val newCheese = binding.inputText.text.trim()
         if (newCheese.isNotEmpty()) {
             viewModel.insert(newCheese)
-            inputText.setText("")
+            binding.inputText.setText("")
         }
     }
 
     private fun initAddButtonListener() {
-        addButton.setOnClickListener {
+        binding.addButton.setOnClickListener {
             addCheese()
         }
 
         // when the user taps the "Done" button in the on screen keyboard, save the item.
-        inputText.setOnEditorActionListener { _, actionId, _ ->
+        binding.inputText.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 addCheese()
                 return@setOnEditorActionListener true
             }
             false // action that isn't DONE occurred - ignore
         }
         // When the user clicks on the button, or presses enter, save the item.
-        inputText.setOnKeyListener { _, keyCode, event ->
+        binding.inputText.setOnKeyListener { _, keyCode, event ->
             if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
                 addCheese()
                 return@setOnKeyListener true