Use layout tag in all layout xml files. Use androidx to fix compilati…

…on issues

Configure listener with data binding

Map all super hero detail fields into the layout

Use data binding in the edit super heroes screen

Migrate to pure data binding super hero detail

Finish migrating to data binding

Fix all tests

Add comment explaining why are we using our own InstrumentationRegistry class

Remove useless call

app/build.gradle

@@ -31,6 +31,9 @@ android {
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 configurations {
@@ -66,16 +69,15 @@ dependencies {
     implementation "com.google.android.material:material:1.0.0"
 
     /* Testing */
-    testImplementation "junit:junit:4.12"
+    testImplementation "androidx.test.ext:junit:1.1.0"
     testImplementation "org.mockito:mockito-core:2.23.4"
+    androidTestImplementation "androidx.test.ext:junit:1.1.0"
     androidTestImplementation "org.mockito:mockito-android:2.23.4"
     androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
     androidTestImplementation "com.github.tmurakami:dexopener:2.0.0"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
-    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:3.0.2") {
-        exclude group: "com.android.support"
-    }
-    androidTestImplementation "com.android.support.test.espresso:espresso-intents:3.0.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:3.1.1"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:3.1.1"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.1.0"
     androidTestImplementation "androidx.room:room-testing:2.1.0-alpha04"
 }

app/src/androidTest/java/android/support/test/InstrumentationRegistry.kt

@@ -0,0 +1,20 @@
+package android.support.test
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+
+/**
+ * This solves the issue with mockito looking for InstrumentationRegistry with reflection.
+ * Hopefully this class won't be required with a mockito update.
+ *
+ * Report: https://github.com/mockito/mockito/issues/1472
+ * Solution: https://github.com/mockito/mockito/pull/1583
+ */
+class InstrumentationRegistry {
+    companion object {
+        @JvmStatic
+        fun getTargetContext(): Context? {
+            return ApplicationProvider.getApplicationContext()
+        }
+    }
+}

app/src/androidTest/java/com/karumi/TestRunner.kt

@@ -3,7 +3,7 @@ package com.karumi
 import android.app.Application
 import android.content.Context
 import android.os.Bundle
-import android.support.test.runner.AndroidJUnitRunner
+import androidx.test.runner.AndroidJUnitRunner
 import com.facebook.testing.screenshot.ScreenshotRunner
 import com.github.tmurakami.dexopener.DexOpener
 

app/src/androidTest/java/com/karumi/jetpack/superheroes/data/repository/room/MigrationTest.kt

@@ -1,9 +1,9 @@
 package com.karumi.jetpack.superheroes.data.repository.room
 
-import android.support.test.InstrumentationRegistry
 import androidx.room.testing.MigrationTestHelper
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.platform.app.InstrumentationRegistry
 import com.karumi.jetpack.superheroes.common.Migrations
 import com.karumi.jetpack.superheroes.common.SuperHeroesDatabase
 import org.junit.Assert.assertEquals

app/src/androidTest/java/com/karumi/jetpack/superheroes/ui/view/AcceptanceTest.kt

@@ -3,11 +3,11 @@ package com.karumi.jetpack.superheroes.ui.view
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.filters.LargeTest
-import android.support.test.runner.AndroidJUnit4
-import com.karumi.jetpack.superheroes.asApp
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import com.karumi.jetpack.superheroes.SuperHeroesApplication
 import org.junit.Before
 import org.junit.Rule
 import org.junit.runner.RunWith
@@ -25,7 +25,7 @@ abstract class AcceptanceTest<T : Activity>(clazz: Class<T>) : ScreenshotTest {
     @Before
     fun setup() {
         MockitoAnnotations.initMocks(this)
-        val app = InstrumentationRegistry.getInstrumentation().targetContext.asApp()
+        val app = ApplicationProvider.getApplicationContext<SuperHeroesApplication>()
         app.override(testDependencies)
     }
 

app/src/androidTest/java/com/karumi/jetpack/superheroes/ui/view/ScreenshotTest.kt

@@ -2,11 +2,11 @@ package com.karumi.jetpack.superheroes.ui.view
 
 import android.app.Activity
 import android.content.Context
-import android.support.test.InstrumentationRegistry.getInstrumentation
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.WindowManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.testing.screenshot.Screenshot
 import com.facebook.testing.screenshot.ViewHelpers
 
@@ -20,7 +20,7 @@ interface ScreenshotTest {
     }
 
     fun compareScreenshot(view: View, height: Int) {
-        val context = getInstrumentation().targetContext
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
         val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
         val metrics = DisplayMetrics()
         windowManager.defaultDisplay.getMetrics(metrics)

app/src/androidTest/java/com/karumi/jetpack/superheroes/ui/view/SuperHeroViewHolderTest.kt

@@ -1,7 +1,7 @@
 package com.karumi.jetpack.superheroes.ui.view
 
-import android.support.test.InstrumentationRegistry.getInstrumentation
 import android.view.LayoutInflater
+import androidx.test.platform.app.InstrumentationRegistry
 import com.karumi.jetpack.superheroes.R
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.ui.presenter.SuperHeroesPresenter
@@ -52,7 +52,7 @@ class SuperHeroViewHolderTest : ScreenshotTest {
     }
 
     private fun givenASuperHeroViewHolder(): SuperHeroViewHolder {
-        val context = getInstrumentation().targetContext
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.super_hero_row, null, false)
         return SuperHeroViewHolder(

app/src/main/java/com/karumi/jetpack/superheroes/SuperHeroesApplication.kt

@@ -1,7 +1,6 @@
 package com.karumi.jetpack.superheroes
 
 import android.app.Application
-import android.content.Context
 import com.karumi.jetpack.superheroes.common.SuperHeroesDatabase
 import com.karumi.jetpack.superheroes.common.module
 import com.karumi.jetpack.superheroes.data.repository.LocalSuperHeroDataSource
@@ -48,6 +47,4 @@ class SuperHeroesApplication : Application(), KodeinAware {
             RemoteSuperHeroDataSource()
         }
     }
-}
-
-fun Context.asApp() = this.applicationContext as SuperHeroesApplication
+}

app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/EditSuperHeroPresenter.kt

@@ -18,7 +18,7 @@ class EditSuperHeroPresenter(
     view: View,
     private val getSuperHeroById: GetSuperHeroById,
     private val saveSuperHero: SaveSuperHero
-) : LifecycleObserver, CoroutineScope by MainScope() {
+) : EditSuperHeroListener, LifecycleObserver, CoroutineScope by MainScope() {
 
     private val view: View? by weak(view)
     private lateinit var id: String
@@ -43,7 +43,7 @@ class EditSuperHeroPresenter(
         cancel()
     }
 
-    fun onSaveSuperHeroSelected(
+    override fun onSaveSuperHeroSelected(
         name: String,
         description: String,
         isAvenger: Boolean
@@ -73,8 +73,16 @@ class EditSuperHeroPresenter(
 
     interface View {
         fun close()
-        fun showLoading()
         fun hideLoading()
+        fun showLoading()
         fun showSuperHero(superHero: SuperHero)
     }
+}
+
+interface EditSuperHeroListener {
+    fun onSaveSuperHeroSelected(
+        name: String,
+        description: String,
+        isAvenger: Boolean
+    )
 }

app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroDetailPresenter.kt

@@ -16,7 +16,7 @@ import kotlinx.coroutines.launch
 class SuperHeroDetailPresenter(
     view: View,
     private val getSuperHeroById: GetSuperHeroById
-) : LifecycleObserver, CoroutineScope by MainScope() {
+) : LifecycleObserver, SuperHeroDetailListener, CoroutineScope by MainScope() {
 
     private val view: View? by weak(view)
 
@@ -41,7 +41,7 @@ class SuperHeroDetailPresenter(
         cancel()
     }
 
-    fun onEditSelected() {
+    override fun onEditSelected() {
         view?.openEditSuperHero(id)
     }
 
@@ -53,9 +53,13 @@ class SuperHeroDetailPresenter(
 
     interface View {
         fun close()
-        fun showLoading()
         fun hideLoading()
+        fun showLoading()
         fun showSuperHero(superHero: SuperHero)
         fun openEditSuperHero(superHeroId: String)
     }
+}
+
+interface SuperHeroDetailListener {
+    fun onEditSelected()
 }

app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroesPresenter.kt

@@ -48,9 +48,9 @@ class SuperHeroesPresenter(
 
     interface View {
         fun hideLoading()
-        fun showSuperHeroes(superHeroes: List<SuperHero>)
         fun showLoading()
         fun showEmptyCase()
+        fun showSuperHeroes(superHeroes: List<SuperHero>)
         fun openDetail(id: String)
     }
 }

app/src/main/java/com/karumi/jetpack/superheroes/ui/view/BaseActivity.kt

@@ -4,12 +4,14 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
 import androidx.lifecycle.LifecycleObserver
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.closestKodein
 
-abstract class BaseActivity : AppCompatActivity(), KodeinAware {
+abstract class BaseActivity<T : ViewDataBinding> : AppCompatActivity(), KodeinAware {
 
     private val appKodein by closestKodein()
     override val kodein: Kodein = Kodein.lazy {
@@ -20,11 +22,13 @@ abstract class BaseActivity : AppCompatActivity(), KodeinAware {
     abstract val layoutId: Int
     abstract val toolbarView: Toolbar
     abstract val activityModules: Kodein.Module
+    protected lateinit var binding: T
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lifecycle.addObserver(presenter)
-        setContentView(layoutId)
+        binding = DataBindingUtil.setContentView(this, layoutId)
+        configureBinding(binding)
         setSupportActionBar(toolbarView)
         prepare(intent)
     }
@@ -34,5 +38,6 @@ abstract class BaseActivity : AppCompatActivity(), KodeinAware {
         lifecycle.removeObserver(presenter)
     }
 
+    abstract fun configureBinding(binding: T)
     open fun prepare(intent: Intent?) {}
 }

app/src/main/java/com/karumi/jetpack/superheroes/ui/view/EditSuperHeroActivity.kt

@@ -3,10 +3,10 @@ package com.karumi.jetpack.superheroes.ui.view
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.appcompat.widget.Toolbar
 import com.karumi.jetpack.superheroes.R
 import com.karumi.jetpack.superheroes.common.module
+import com.karumi.jetpack.superheroes.databinding.EditSuperHeroActivityBinding
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.domain.usecase.GetSuperHeroById
 import com.karumi.jetpack.superheroes.domain.usecase.SaveSuperHero
@@ -17,7 +17,10 @@ import org.kodein.di.erased.bind
 import org.kodein.di.erased.instance
 import org.kodein.di.erased.provider
 
-class EditSuperHeroActivity : BaseActivity(), EditSuperHeroPresenter.View {
+class EditSuperHeroActivity :
+    BaseActivity<EditSuperHeroActivityBinding>(),
+    EditSuperHeroPresenter.View {
+
     companion object {
         private const val SUPER_HERO_ID_KEY = "super_hero_id_key"
 
@@ -45,6 +48,11 @@ class EditSuperHeroActivity : BaseActivity(), EditSuperHeroPresenter.View {
         }
     }
 
+    override fun configureBinding(binding: EditSuperHeroActivityBinding) {
+        binding.listener = presenter
+        binding.isLoading = false
+    }
+
     override fun prepare(intent: Intent?) {
         title = superHeroId
         presenter.preparePresenter(superHeroId)
@@ -54,25 +62,17 @@ class EditSuperHeroActivity : BaseActivity(), EditSuperHeroPresenter.View {
         finish()
     }
 
-    override fun showLoading() {
-        et_super_hero_name.isEnabled = false
-        et_super_hero_description.isEnabled = false
-        bt_save_edition.isEnabled = false
-        progress_bar.visibility = View.VISIBLE
+    override fun hideLoading() {
+        binding.isLoading = false
     }
 
-    override fun hideLoading() {
-        et_super_hero_name.isEnabled = true
-        et_super_hero_description.isEnabled = true
-        bt_save_edition.isEnabled = true
-        progress_bar.visibility = View.GONE
+    override fun showLoading() {
+        binding.isLoading = true
     }
 
     override fun showSuperHero(superHero: SuperHero) {
-        et_super_hero_name.setText(superHero.name)
-        et_super_hero_description.setText(superHero.description)
+        binding.superHero = superHero
         iv_super_hero_photo.setImageBackground(superHero.photo)
-        cb_is_avenger.isChecked = superHero.isAvenger
     }
 
     override val activityModules = module {