diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..8d09ae2
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+RickAndMorty
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..e34606c
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..6199cc2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e0b4b9f..f02469f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: "androidx.navigation.safeargs.kotlin"
 
 android {
     compileSdkVersion 29
@@ -18,8 +19,7 @@ android {
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "com.example.rickandmorty.utils.CustomTestRunner"
     }
 
     compileOptions {
@@ -27,59 +27,147 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+
+    packagingOptions {
+        // Multiple dependency bring these files in. Exclude them to enable
+        // our test APK to build (has no effect on our AARs)
+        excludes += "/META-INF/AL2.0"
+        excludes += "/META-INF/LGPL2.1"
+    }
+
     kotlinOptions {
         jvmTarget = "1.8"
     }
 
+    buildFeatures {
+        dataBinding true
+    }
+
+    testOptions {
+        animationsDisabled = true
+        unitTests {
+            returnDefaultValues = true
+            includeAndroidResources = true
+        }
+    }
+
+    android {
+        sourceSets {
+            String sharedTestDir = 'src/sharedTest/java'
+            test {
+                java.srcDirs += sharedTestDir
+            }
+            androidTest {
+                java.srcDirs += sharedTestDir
+            }
+        }
+    }
+
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
+            testCoverageEnabled true
+            splits.abi.enable = false
+            splits.density.enable = false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        release {
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
+    useLibrary 'android.test.runner'
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
+    configurations.all {
+        resolutionStrategy.force 'junit:junit:4.13'
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-
-    //Lifecycle
-    def lifecycle_version = "2.2.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-
-    //Kotlin Coroutines
-    def coroutines_android_version = '1.3.7'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_android_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_android_version"
-
-    //Hilt
-    implementation 'com.google.dagger:hilt-android:2.28.1-alpha'
-    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha01"
-    kapt 'com.google.dagger:hilt-android-compiler:2.28.1-alpha'
-    kapt "androidx.hilt:hilt-compiler:1.0.0-alpha01"
-
-    //Room
-    def room_version = "2.2.5"
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-
-    //Navigation
-    def nav_version = "2.3.0"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+    implementation 'com.google.android.material:material:1.3.0'
+
+    // App dependencies
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.cardview:cardview:$cardVersion"
+    implementation "com.google.android.material:material:$materialVersion"
+    implementation "androidx.recyclerview:recyclerview:$recyclerViewVersion"
+    implementation "androidx.annotation:annotation:$androidXAnnotations"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+    implementation "com.jakewharton.timber:timber:$timberVersion"
+    implementation "androidx.legacy:legacy-support-v4:$androidXLegacySupport"
+    implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
+    implementation "androidx.room:room-runtime:$roomVersion"
+    kapt "androidx.room:room-compiler:$roomVersion"
+
+    // Architecture Components
+    implementation "androidx.room:room-runtime:$roomVersion"
+    kapt "androidx.room:room-compiler:$roomVersion"
+    implementation "androidx.room:room-ktx:$roomVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$archLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$archLifecycleVersion"
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion"
+
+    // Hilt
+    implementation "com.google.dagger:hilt-android:$hiltVersion"
+    kapt "com.google.dagger:hilt-android-compiler:$hiltVersion"
+
+    // Hilt testing
+    androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
+    kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hiltVersion"
+
+    // Dependencies for local unit tests
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "org.hamcrest:hamcrest-all:$hamcrestVersion"
+    testImplementation "androidx.arch.core:core-testing:$archTestingVersion"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "androidx.navigation:navigation-testing:$navigationVersion"
+    testImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+    testImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
+    testImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
+    testImplementation "com.google.truth:truth:$truthVersion"
+
+    // Dependencies for Android unit tests
+    androidTestImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+
+    // AndroidX Test - JVM testing
+    testImplementation "androidx.test:core-ktx:$androidXTestCoreVersion"
+    testImplementation "androidx.test.ext:junit-ktx:$androidXTestExtKotlinRunnerVersion"
+    testImplementation "androidx.test:rules:$androidXTestRulesVersion"
+    // Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation
+    debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
+    implementation "androidx.test:core:$androidXTestCoreVersion"
+    implementation "androidx.fragment:fragment:$fragmentVersion"
+
+    // AndroidX Test - Instrumented testing
+    androidTestImplementation "androidx.test:core-ktx:$androidXTestCoreVersion"
+    androidTestImplementation "androidx.test.ext:junit-ktx:$androidXTestExtKotlinRunnerVersion"
+    androidTestImplementation "androidx.test:rules:$androidXTestRulesVersion"
+    androidTestImplementation "androidx.room:room-testing:$roomVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$archTestingVersion"
+    androidTestImplementation "androidx.navigation:navigation-testing:$navigationVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$espressoVersion"
+    implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
+
+    // Resolve conflicts between main and test APK:
+    androidTestImplementation "androidx.annotation:annotation:$androidXAnnotations"
+    androidTestImplementation "androidx.legacy:legacy-support-v4:$androidXLegacySupport"
+    androidTestImplementation "androidx.recyclerview:recyclerview:$recyclerViewVersion"
+    androidTestImplementation "androidx.appcompat:appcompat:$appCompatVersion"
+    androidTestImplementation "com.google.android.material:material:$materialVersion"
 
     //Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -88,7 +176,12 @@ dependencies {
     //Timber
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "androidx.fragment:fragment-ktx:$fragmentKtxVersion"
+    testImplementation('com.jraska.livedata:testing-ktx:1.2.0')
+    //mockito
+    testImplementation "io.mockk:mockk:1.10.0"
+    androidTestImplementation "io.mockk:mockk:1.10.0"
+
 }
diff --git a/app/src/androidTest/java/com/example/rickandmorty/CharacterTest.kt b/app/src/androidTest/java/com/example/rickandmorty/CharacterTest.kt
new file mode 100644
index 0000000..e274448
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/CharacterTest.kt
@@ -0,0 +1,119 @@
+package com.example.rickandmorty
+
+import android.view.View
+import androidx.lifecycle.MutableLiveData
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import com.example.rickandmorty.data.entities.Character
+import com.example.rickandmorty.data.repository.CharacterRepository
+import com.example.rickandmorty.ui.MainActivity
+import com.example.rickandmorty.ui.characters.CharacterViewHolder
+import com.example.rickandmorty.utils.DataBindingIdlingResource
+import com.example.rickandmorty.utils.EspressoIdlingResource
+import com.example.rickandmorty.utils.Resource
+import com.example.rickandmorty.utils.monitorActivity
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matcher
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.`is`
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import javax.inject.Inject
+
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+@HiltAndroidTest
+class CharacterPageTest {
+    private val dataBindingIdlingResource = DataBindingIdlingResource()
+
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
+    @Inject
+    lateinit var viewModel: CharacterRepository
+
+    @Before
+    fun init(){
+        hiltRule.inject()
+    }
+
+    /**
+     * Idling resources tell Espresso that the app is idle or busy. This is needed when operations
+     * are not scheduled in the main Looper (for example when executed on a different thread).
+     */
+    @Before
+    fun registerIdlingResource() {
+        IdlingRegistry.getInstance().register(EspressoIdlingResource.countingIdlingResource)
+        IdlingRegistry.getInstance().register(dataBindingIdlingResource)
+    }
+
+    /**
+     * Unregister your Idling Resource so it can be garbage collected and does not leak any memory.
+     */
+    @After
+    fun unregisterIdlingResource() {
+        IdlingRegistry.getInstance().unregister(EspressoIdlingResource.countingIdlingResource)
+        IdlingRegistry.getInstance().unregister(dataBindingIdlingResource)
+    }
+
+
+    @Test
+    fun `checkLaunchDetail`() {
+        val activityScenario = ActivityScenario.launch(MainActivity::class.java)
+        dataBindingIdlingResource.monitorActivity(activityScenario)
+
+        doViewActionWithId(R.id.characters_rv){
+            val recyclerView = it as RecyclerView
+            val adapter = recyclerView.adapter
+            assertThat("list is not empty",adapter!!.itemCount > 1)
+        }
+        onView(withId(R.id.characters_rv)).perform(
+            RecyclerViewActions.actionOnItemAtPosition<CharacterViewHolder>(0,
+                doViewActionWithId(R.id.root){
+                    it.performClick()
+                }))
+
+        //verify
+        onView(withId(R.id.character_detail)).check(matches(isDisplayed()))
+        //close
+        activityScenario.close()
+    }
+}
+
+
+fun doViewActionWithId(id: Int,action: (view : View) -> Unit): ViewAction {
+    return object : ViewAction {
+        override fun getConstraints(): Matcher<View>? {
+            return null
+        }
+
+        override fun getDescription(): String {
+            return "Click on a child view with specified id."
+        }
+
+        override fun perform(uiController: UiController, v: View) {
+            val view = v.findViewById<View>(id)
+            action(view)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/rickandmorty/CharaterDetailPageTest.kt b/app/src/androidTest/java/com/example/rickandmorty/CharaterDetailPageTest.kt
new file mode 100644
index 0000000..41c82dd
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/CharaterDetailPageTest.kt
@@ -0,0 +1,47 @@
+package com.example.rickandmorty
+
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.example.rickandmorty.data.repository.CharacterRepository
+import com.example.rickandmorty.ui.characterdetail.CharacterDetailFragment
+import com.example.rickandmorty.ui.characterdetail.CharacterDetailFragmentArgs
+import com.example.rickandmorty.utils.launchFragmentInHiltContainer
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import javax.inject.Inject
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@ExperimentalCoroutinesApi
+@HiltAndroidTest
+class CharaterDetailPageTest {
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
+
+    @Inject
+    lateinit var repository: CharacterRepository
+
+    @Before
+    fun init() {
+        hiltRule.inject()
+    }
+
+    @Test
+    fun activityDisplayed_UI() {
+        // WHEN - Details fragment launched to display task
+        val bundle = CharacterDetailFragmentArgs(1).toBundle()
+        launchFragmentInHiltContainer<CharacterDetailFragment>(bundle, R.style.AppTheme)
+        onView(withId(R.id.character_detail)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/rickandmorty/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/rickandmorty/ExampleInstrumentedTest.kt
deleted file mode 100644
index c6c2fb5..0000000
--- a/app/src/androidTest/java/com/example/rickandmorty/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.rickandmorty
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.example.rickandmorty", appContext.packageName)
-    }
-}
diff --git a/app/src/androidTest/java/com/example/rickandmorty/utils/CustomTestRunner.kt b/app/src/androidTest/java/com/example/rickandmorty/utils/CustomTestRunner.kt
new file mode 100644
index 0000000..f6b5051
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/utils/CustomTestRunner.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.rickandmorty.utils
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+class CustomTestRunner : AndroidJUnitRunner() {
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}
diff --git a/app/src/androidTest/java/com/example/rickandmorty/utils/DataBindingIdlingResource.kt b/app/src/androidTest/java/com/example/rickandmorty/utils/DataBindingIdlingResource.kt
new file mode 100644
index 0000000..9181955
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/utils/DataBindingIdlingResource.kt
@@ -0,0 +1,112 @@
+/*
+ * 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.rickandmorty.utils
+
+import android.view.View
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.testing.FragmentScenario
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.IdlingResource
+import java.util.UUID
+
+/**
+ * An espresso idling resource implementation that reports idle status for all data binding
+ * layouts. Data Binding uses a mechanism to post messages which Espresso doesn't track yet.
+ *
+ * Since this application only uses fragments, the resource only checks the fragments and their
+ * children instead of the whole view tree.
+ */
+class DataBindingIdlingResource : IdlingResource {
+    // list of registered callbacks
+    private val idlingCallbacks = mutableListOf<IdlingResource.ResourceCallback>()
+    // give it a unique id to workaround an espresso bug where you cannot register/unregister
+    // an idling resource w/ the same name.
+    private val id = UUID.randomUUID().toString()
+    // holds whether isIdle is called and the result was false. We track this to avoid calling
+    // onTransitionToIdle callbacks if Espresso never thought we were idle in the first place.
+    private var wasNotIdle = false
+
+    lateinit var activity: FragmentActivity
+
+    override fun getName() = "DataBinding $id"
+
+    override fun isIdleNow(): Boolean {
+        val idle = !getBindings().any { it.hasPendingBindings() }
+        @Suppress("LiftReturnOrAssignment")
+        if (idle) {
+            if (wasNotIdle) {
+                // notify observers to avoid espresso race detector
+                idlingCallbacks.forEach { it.onTransitionToIdle() }
+            }
+            wasNotIdle = false
+        } else {
+            wasNotIdle = true
+            // check next frame
+            activity.findViewById<View>(android.R.id.content).postDelayed({
+                isIdleNow
+            }, 16)
+        }
+        return idle
+    }
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+        idlingCallbacks.add(callback)
+    }
+
+    /**
+     * Find all binding classes in all currently available fragments.
+     */
+    private fun getBindings(): List<ViewDataBinding> {
+        val fragments = (activity as? FragmentActivity)
+            ?.supportFragmentManager
+            ?.fragments
+
+        val bindings =
+            fragments?.mapNotNull {
+                it.view?.getBinding()
+            } ?: emptyList()
+        val childrenBindings = fragments?.flatMap { it.childFragmentManager.fragments }
+            ?.mapNotNull { it.view?.getBinding() } ?: emptyList()
+
+        return bindings + childrenBindings
+    }
+}
+
+private fun View.getBinding(): ViewDataBinding? = DataBindingUtil.getBinding(this)
+
+/**
+ * Sets the activity from an [ActivityScenario] to be used from [DataBindingIdlingResource].
+ */
+fun DataBindingIdlingResource.monitorActivity(
+    activityScenario: ActivityScenario<out FragmentActivity>
+) {
+    activityScenario.onActivity {
+        this.activity = it
+    }
+}
+
+/**
+ * Sets the fragment from a [FragmentScenario] to be used from [DataBindingIdlingResource].
+ */
+fun <T : Fragment> DataBindingIdlingResource.monitorFragment(fragmentScenario: FragmentScenario<T>) {
+    fragmentScenario.onFragment {
+        this.activity = it.requireActivity()
+    }
+}
diff --git a/app/src/androidTest/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt b/app/src/androidTest/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt
new file mode 100644
index 0000000..eca8981
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.rickandmorty.utils
+
+import androidx.test.espresso.IdlingResource
+
+/**
+ * Contains a static reference to [IdlingResource], only available in the 'mock' build type.
+ */
+object EspressoIdlingResource {
+
+    private const val RESOURCE = "GLOBAL"
+
+    @JvmField
+    val countingIdlingResource = SimpleCountingIdlingResource(RESOURCE)
+
+    fun increment() {
+        countingIdlingResource.increment()
+    }
+
+    fun decrement() {
+        if (!countingIdlingResource.isIdleNow) {
+            countingIdlingResource.decrement()
+        }
+    }
+}
+
+inline fun <T> wrapEspressoIdlingResource(function: () -> T): T {
+    // Espresso does not work well with coroutines yet. See
+    // https://github.com/Kotlin/kotlinx.coroutines/issues/982
+    EspressoIdlingResource.increment() // Set app as busy.
+    return try {
+        function()
+    } finally {
+        EspressoIdlingResource.decrement() // Set app as idle.
+    }
+}
diff --git a/app/src/androidTest/java/com/example/rickandmorty/utils/HiltExt.kt b/app/src/androidTest/java/com/example/rickandmorty/utils/HiltExt.kt
new file mode 100644
index 0000000..20b1747
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/utils/HiltExt.kt
@@ -0,0 +1,67 @@
+/*
+ * 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.rickandmorty.utils
+
+import android.content.ComponentName
+import android.content.Intent
+import android.os.Bundle
+import androidx.annotation.StyleRes
+import androidx.core.util.Preconditions
+import androidx.fragment.app.Fragment
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import com.example.rickandmorty.R
+import com.example.rickandmorty.TestActivity
+
+/**
+ * launchFragmentInContainer from the androidx.fragment:fragment-testing library
+ * is NOT possible to use right now as it uses a hardcoded Activity under the hood
+ * (i.e. [EmptyFragmentActivity]) which is not annotated with @AndroidEntryPoint.
+ *
+ * As a workaround, use this function that is equivalent. It requires you to add
+ * [HiltTestActivity] in the debug folder and include it in the debug AndroidManifest.xml file
+ * as can be found in this project.
+ */
+inline fun <reified T : Fragment> launchFragmentInHiltContainer(
+    fragmentArgs: Bundle? = null,
+    @StyleRes themeResId: Int = R.style.FragmentScenarioEmptyFragmentActivityTheme,
+    crossinline action: Fragment.() -> Unit = {}
+) {
+    val startActivityIntent = Intent.makeMainActivity(
+        ComponentName(
+            ApplicationProvider.getApplicationContext(),
+            TestActivity::class.java
+        )
+    ).putExtra(
+        "androidx.fragment.app.testing.FragmentScenario.EmptyFragmentActivity.THEME_EXTRAS_BUNDLE_KEY",
+        themeResId
+    )
+
+    ActivityScenario.launch<TestActivity>(startActivityIntent).onActivity { activity ->
+        val fragment: Fragment = activity.supportFragmentManager.fragmentFactory.instantiate(
+            Preconditions.checkNotNull(T::class.java.classLoader),
+            T::class.java.name
+        )
+        fragment.arguments = fragmentArgs
+        activity.supportFragmentManager
+            .beginTransaction()
+            .add(android.R.id.content, fragment, "")
+            .commitNow()
+
+        fragment.action()
+    }
+}
diff --git a/app/src/androidTest/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt b/app/src/androidTest/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt
new file mode 100644
index 0000000..9782a59
--- /dev/null
+++ b/app/src/androidTest/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.rickandmorty.utils
+
+import androidx.test.espresso.IdlingResource
+
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * An simple counter implementation of [IdlingResource] that determines idleness by
+ * maintaining an internal counter. When the counter is 0 - it is considered to be idle, when it is
+ * non-zero it is not idle. This is very similar to the way a [java.util.concurrent.Semaphore]
+ * behaves.
+ *
+ *
+ * This class can then be used to wrap up operations that while in progress should block tests from
+ * accessing the UI.
+ */
+class SimpleCountingIdlingResource(private val resourceName: String) : IdlingResource {
+
+    private val counter = AtomicInteger(0)
+
+    // written from main thread, read from any thread.
+    @Volatile
+    private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+    override fun getName() = resourceName
+
+    override fun isIdleNow() = counter.get() == 0
+
+    override fun registerIdleTransitionCallback(resourceCallback: IdlingResource.ResourceCallback) {
+        this.resourceCallback = resourceCallback
+    }
+
+    /**
+     * Increments the count of in-flight transactions to the resource being monitored.
+     */
+    fun increment() {
+        counter.getAndIncrement()
+    }
+
+    /**
+     * Decrements the count of in-flight transactions to the resource being monitored.
+     * If this operation results in the counter falling below 0 - an exception is raised.
+     *
+     * @throws IllegalStateException if the counter is below 0.
+     */
+    fun decrement() {
+        val counterVal = counter.decrementAndGet()
+        if (counterVal == 0) {
+            // we've gone from non-zero to zero. That means we're idle now! Tell espresso.
+            resourceCallback?.onTransitionToIdle()
+        } else if (counterVal < 0) {
+            throw IllegalStateException("Counter has been corrupted!")
+        }
+    }
+}
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..9d90908
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity android:name="com.example.rickandmorty.TestActivity"></activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/debug/java/com/example/rickandmorty/TestActivity.kt b/app/src/debug/java/com/example/rickandmorty/TestActivity.kt
new file mode 100644
index 0000000..361ee1f
--- /dev/null
+++ b/app/src/debug/java/com/example/rickandmorty/TestActivity.kt
@@ -0,0 +1,8 @@
+package com.example.rickandmorty
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class TestActivity : AppCompatActivity()
\ No newline at end of file
diff --git a/app/src/debug/res/layout/activity_test.xml b/app/src/debug/res/layout/activity_test.xml
new file mode 100644
index 0000000..9ea4942
--- /dev/null
+++ b/app/src/debug/res/layout/activity_test.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".TestActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 0000000..73862c4
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1 @@
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickandmorty/data/OpenForTesting.kt b/app/src/main/java/com/example/rickandmorty/data/OpenForTesting.kt
new file mode 100644
index 0000000..1a95ec0
--- /dev/null
+++ b/app/src/main/java/com/example/rickandmorty/data/OpenForTesting.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 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.rickandmorty.data
+
+/**
+ * This annotation allows us to open some classes for mocking purposes while they are final in
+ * release builds.
+ */
+@Target(AnnotationTarget.ANNOTATION_CLASS)
+annotation class OpenClass
+
+/**
+ * Annotate a class with [OpenForTesting] if you want it to be extendable in debug builds.
+ */
+@OpenClass
+@Target(AnnotationTarget.CLASS)
+annotation class OpenForTesting
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickandmorty/data/local/CharacterDao.kt b/app/src/main/java/com/example/rickandmorty/data/local/CharacterDao.kt
index 76c1e95..01dcffc 100644
--- a/app/src/main/java/com/example/rickandmorty/data/local/CharacterDao.kt
+++ b/app/src/main/java/com/example/rickandmorty/data/local/CharacterDao.kt
@@ -5,9 +5,11 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import com.example.rickandmorty.data.OpenForTesting
 import com.example.rickandmorty.data.entities.Character
 
 @Dao
+@OpenForTesting
 interface CharacterDao {
 
     @Query("SELECT * FROM characters")
diff --git a/app/src/main/java/com/example/rickandmorty/data/remote/CharacterRemoteDataSource.kt b/app/src/main/java/com/example/rickandmorty/data/remote/CharacterRemoteDataSource.kt
index 68c1f4d..0c21484 100644
--- a/app/src/main/java/com/example/rickandmorty/data/remote/CharacterRemoteDataSource.kt
+++ b/app/src/main/java/com/example/rickandmorty/data/remote/CharacterRemoteDataSource.kt
@@ -1,7 +1,11 @@
 package com.example.rickandmorty.data.remote
 
+import com.example.rickandmorty.data.OpenForTesting
+import dagger.Provides
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@OpenForTesting
 class CharacterRemoteDataSource @Inject constructor(
     private val characterService: CharacterService
 ): BaseDataSource() {
diff --git a/app/src/main/java/com/example/rickandmorty/data/remote/CharacterService.kt b/app/src/main/java/com/example/rickandmorty/data/remote/CharacterService.kt
index 27723c4..fbebaa4 100644
--- a/app/src/main/java/com/example/rickandmorty/data/remote/CharacterService.kt
+++ b/app/src/main/java/com/example/rickandmorty/data/remote/CharacterService.kt
@@ -1,5 +1,6 @@
 package com.example.rickandmorty.data.remote
 
+import com.example.rickandmorty.data.OpenForTesting
 import com.example.rickandmorty.data.entities.Character
 import com.example.rickandmorty.data.entities.CharacterList
 import retrofit2.Response
diff --git a/app/src/main/java/com/example/rickandmorty/data/repository/CharacterRepository.kt b/app/src/main/java/com/example/rickandmorty/data/repository/CharacterRepository.kt
index c1d6e90..b7d778a 100644
--- a/app/src/main/java/com/example/rickandmorty/data/repository/CharacterRepository.kt
+++ b/app/src/main/java/com/example/rickandmorty/data/repository/CharacterRepository.kt
@@ -3,22 +3,28 @@ package com.example.rickandmorty.data.repository
 import com.example.rickandmorty.data.local.CharacterDao
 import com.example.rickandmorty.data.remote.CharacterRemoteDataSource
 import com.example.rickandmorty.utils.performGetOperation
+import com.example.rickandmorty.utils.wrapEspressoIdlingResource
 import javax.inject.Inject
 
+
 class CharacterRepository @Inject constructor(
     private val remoteDataSource: CharacterRemoteDataSource,
     private val localDataSource: CharacterDao
 ) {
 
-    fun getCharacter(id: Int) = performGetOperation(
-        databaseQuery = { localDataSource.getCharacter(id) },
-        networkCall = { remoteDataSource.getCharacter(id) },
-        saveCallResult = { localDataSource.insert(it) }
-    )
+    fun getCharacter(id: Int) = wrapEspressoIdlingResource {
+            performGetOperation(
+                databaseQuery = { localDataSource.getCharacter(id) },
+                networkCall = { remoteDataSource.getCharacter(id) },
+                saveCallResult = { localDataSource.insert(it) }
+            )
+        }
 
-    fun getCharacters() = performGetOperation(
-        databaseQuery = { localDataSource.getAllCharacters() },
-        networkCall = { remoteDataSource.getCharacters() },
-        saveCallResult = { localDataSource.insertAll(it.results) }
-    )
+    fun getCharacters() = wrapEspressoIdlingResource {
+        performGetOperation(
+            databaseQuery = { localDataSource.getAllCharacters() },
+            networkCall = { remoteDataSource.getCharacters() },
+            saveCallResult = { localDataSource.insertAll(it.results) }
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickandmorty/di/AppModule.kt b/app/src/main/java/com/example/rickandmorty/di/AppModule.kt
index 7c47b6a..714354d 100644
--- a/app/src/main/java/com/example/rickandmorty/di/AppModule.kt
+++ b/app/src/main/java/com/example/rickandmorty/di/AppModule.kt
@@ -8,17 +8,19 @@ import com.example.rickandmorty.data.remote.CharacterService
 import com.example.rickandmorty.data.repository.CharacterRepository
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import dagger.Binds
+import dagger.Component
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
 import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 object AppModule {
 
     @Singleton
@@ -42,13 +44,9 @@ object AppModule {
     @Provides
     fun provideDatabase(@ApplicationContext appContext: Context) = AppDatabase.getDatabase(appContext)
 
-    @Singleton
-    @Provides
-    fun provideCharacterDao(db: AppDatabase) = db.characterDao()
-
     @Singleton
     @Provides
     fun provideRepository(remoteDataSource: CharacterRemoteDataSource,
-                          localDataSource: CharacterDao) =
-        CharacterRepository(remoteDataSource, localDataSource)
+                          localDataSource: AppDatabase) =
+        CharacterRepository(remoteDataSource, localDataSource.characterDao())
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rickandmorty/ui/MainActivity.kt b/app/src/main/java/com/example/rickandmorty/ui/MainActivity.kt
index a89b49a..8608893 100644
--- a/app/src/main/java/com/example/rickandmorty/ui/MainActivity.kt
+++ b/app/src/main/java/com/example/rickandmorty/ui/MainActivity.kt
@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
         val navController: NavController = navHostFragment.navController
 
-        val appBarConfiguration: AppBarConfiguration = AppBarConfiguration(navController.graph)
+        val appBarConfiguration = AppBarConfiguration(navController.graph)
         binding.toolbar.setupWithNavController(navController, appBarConfiguration)
 
     }
diff --git a/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailFragment.kt b/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailFragment.kt
index 325eee1..309c50e 100644
--- a/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailFragment.kt
+++ b/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailFragment.kt
@@ -8,6 +8,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
+import androidx.navigation.fragment.navArgs
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.example.rickandmorty.data.entities.Character
@@ -18,7 +19,7 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class CharacterDetailFragment : Fragment() {
-
+    private val args: CharacterDetailFragmentArgs by navArgs()
     private var binding: CharacterDetailFragmentBinding by autoCleared()
     private val viewModel: CharacterDetailViewModel by viewModels()
 
@@ -32,7 +33,7 @@ class CharacterDetailFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        arguments?.getInt("id")?.let { viewModel.start(it) }
+        viewModel.start(args.id)
         setupObservers()
     }
 
diff --git a/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailViewModel.kt b/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailViewModel.kt
index 9e99276..0928bc6 100644
--- a/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailViewModel.kt
+++ b/app/src/main/java/com/example/rickandmorty/ui/characterdetail/CharacterDetailViewModel.kt
@@ -1,6 +1,5 @@
 package com.example.rickandmorty.ui.characterdetail
 
-import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -8,8 +7,11 @@ import androidx.lifecycle.switchMap
 import com.example.rickandmorty.data.entities.Character
 import com.example.rickandmorty.data.repository.CharacterRepository
 import com.example.rickandmorty.utils.Resource
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class CharacterDetailViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CharacterDetailViewModel @Inject constructor(
     private val repository: CharacterRepository
 ) : ViewModel() {
 
@@ -18,6 +20,7 @@ class CharacterDetailViewModel @ViewModelInject constructor(
     private val _character = _id.switchMap { id ->
         repository.getCharacter(id)
     }
+
     val character: LiveData<Resource<Character>> = _character
 
 
diff --git a/app/src/main/java/com/example/rickandmorty/ui/characters/CharactersViewModel.kt b/app/src/main/java/com/example/rickandmorty/ui/characters/CharactersViewModel.kt
index 2b1d4fb..4b53e73 100644
--- a/app/src/main/java/com/example/rickandmorty/ui/characters/CharactersViewModel.kt
+++ b/app/src/main/java/com/example/rickandmorty/ui/characters/CharactersViewModel.kt
@@ -1,16 +1,29 @@
 package com.example.rickandmorty.ui.characters
 
-import androidx.hilt.lifecycle.ViewModelInject
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.switchMap
+import com.bumptech.glide.load.engine.Resource
+import com.example.rickandmorty.data.entities.Character
 import com.example.rickandmorty.data.repository.CharacterRepository
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 
-class CharactersViewModel @ViewModelInject constructor(
+@HiltViewModel
+class CharactersViewModel @Inject constructor(
     private val repository: CharacterRepository
 ) : ViewModel() {
+    private val _invoke = MutableLiveData<Boolean>()
 
-    val characters = repository.getCharacters()
+
+    fun start() {
+        _invoke.value = true
+    }
+
+    var _char = _invoke.switchMap {
+        repository.getCharacters()
+    }
+
+    val characters: LiveData<com.example.rickandmorty.utils.Resource<List<Character>>> = _char
 }
diff --git a/app/src/main/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt b/app/src/main/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt
new file mode 100644
index 0000000..eca8981
--- /dev/null
+++ b/app/src/main/java/com/example/rickandmorty/utils/EspressoIdlingResource.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.rickandmorty.utils
+
+import androidx.test.espresso.IdlingResource
+
+/**
+ * Contains a static reference to [IdlingResource], only available in the 'mock' build type.
+ */
+object EspressoIdlingResource {
+
+    private const val RESOURCE = "GLOBAL"
+
+    @JvmField
+    val countingIdlingResource = SimpleCountingIdlingResource(RESOURCE)
+
+    fun increment() {
+        countingIdlingResource.increment()
+    }
+
+    fun decrement() {
+        if (!countingIdlingResource.isIdleNow) {
+            countingIdlingResource.decrement()
+        }
+    }
+}
+
+inline fun <T> wrapEspressoIdlingResource(function: () -> T): T {
+    // Espresso does not work well with coroutines yet. See
+    // https://github.com/Kotlin/kotlinx.coroutines/issues/982
+    EspressoIdlingResource.increment() // Set app as busy.
+    return try {
+        function()
+    } finally {
+        EspressoIdlingResource.decrement() // Set app as idle.
+    }
+}
diff --git a/app/src/main/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt b/app/src/main/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt
new file mode 100644
index 0000000..9782a59
--- /dev/null
+++ b/app/src/main/java/com/example/rickandmorty/utils/SimpleCountingIdlingResource.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.rickandmorty.utils
+
+import androidx.test.espresso.IdlingResource
+
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * An simple counter implementation of [IdlingResource] that determines idleness by
+ * maintaining an internal counter. When the counter is 0 - it is considered to be idle, when it is
+ * non-zero it is not idle. This is very similar to the way a [java.util.concurrent.Semaphore]
+ * behaves.
+ *
+ *
+ * This class can then be used to wrap up operations that while in progress should block tests from
+ * accessing the UI.
+ */
+class SimpleCountingIdlingResource(private val resourceName: String) : IdlingResource {
+
+    private val counter = AtomicInteger(0)
+
+    // written from main thread, read from any thread.
+    @Volatile
+    private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+    override fun getName() = resourceName
+
+    override fun isIdleNow() = counter.get() == 0
+
+    override fun registerIdleTransitionCallback(resourceCallback: IdlingResource.ResourceCallback) {
+        this.resourceCallback = resourceCallback
+    }
+
+    /**
+     * Increments the count of in-flight transactions to the resource being monitored.
+     */
+    fun increment() {
+        counter.getAndIncrement()
+    }
+
+    /**
+     * Decrements the count of in-flight transactions to the resource being monitored.
+     * If this operation results in the counter falling below 0 - an exception is raised.
+     *
+     * @throws IllegalStateException if the counter is below 0.
+     */
+    fun decrement() {
+        val counterVal = counter.decrementAndGet()
+        if (counterVal == 0) {
+            // we've gone from non-zero to zero. That means we're idle now! Tell espresso.
+            resourceCallback?.onTransitionToIdle()
+        } else if (counterVal < 0) {
+            throw IllegalStateException("Counter has been corrupted!")
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a4240dd..bd16a24 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.MainActivity"
-    android:orientation="vertical">
+<layout>
 
-    <com.google.android.material.appbar.AppBarLayout
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".ui.MainActivity">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
-            android:theme="@style/ToolbarTheme"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:layout_height="wrap_content">
 
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="@style/ToolbarTheme"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph" />
-</LinearLayout>
\ No newline at end of file
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:defaultNavHost="true"
+            app:navGraph="@navigation/nav_graph" />
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/character_detail_fragment.xml b/app/src/main/res/layout/character_detail_fragment.xml
index a84dbfd..7a9487b 100644
--- a/app/src/main/res/layout/character_detail_fragment.xml
+++ b/app/src/main/res/layout/character_detail_fragment.xml
@@ -1,105 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.characterdetail.CharacterDetailFragment">
+<layout>
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        tools:visibility="gone" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/character_cl"
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/character_detail"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_marginTop="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent"
+        tools:context=".ui.characterdetail.CharacterDetailFragment">
 
-        <TextView
-            android:id="@+id/name"
+        <ProgressBar
+            android:id="@+id/progress_bar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            tools:text="TextView"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image" />
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            tools:visibility="gone" />
 
-        <TextView
-            android:id="@+id/species_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="60dp"
-            android:layout_marginTop="30dp"
-            android:text="Species:"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/name" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/character_cl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-        <TextView
-            android:id="@+id/species"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
-            android:layout_marginEnd="60dp"
-            tools:text="TextView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/name" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/image"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_marginTop="10dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/status_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="60dp"
-            android:layout_marginTop="10dp"
-            android:text="Status:"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/species_text" />
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/image"
+                tools:text="TextView" />
 
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="60dp"
-            tools:text="TextView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/species" />
+            <TextView
+                android:id="@+id/species_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="60dp"
+                android:layout_marginTop="30dp"
+                android:text="Species:"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/name" />
 
-        <TextView
-            android:id="@+id/gender_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="60dp"
-            android:layout_marginTop="10dp"
-            android:text="Gender:"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/status_text" />
+            <TextView
+                android:id="@+id/species"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:layout_marginEnd="60dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/name"
+                tools:text="TextView" />
 
-        <TextView
-            android:id="@+id/gender"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="60dp"
-            tools:text="TextView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/status" />
+            <TextView
+                android:id="@+id/status_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="60dp"
+                android:layout_marginTop="10dp"
+                android:text="Status:"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/species_text" />
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="60dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/species"
+                tools:text="TextView" />
+
+            <TextView
+                android:id="@+id/gender_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="60dp"
+                android:layout_marginTop="10dp"
+                android:text="Gender:"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/status_text" />
+
+            <TextView
+                android:id="@+id/gender"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="60dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/status"
+                tools:text="TextView" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-</FrameLayout>
\ No newline at end of file
+    </FrameLayout>
+</layout>
diff --git a/app/src/main/res/layout/characters_fragment.xml b/app/src/main/res/layout/characters_fragment.xml
index 177f6df..09afc06 100644
--- a/app/src/main/res/layout/characters_fragment.xml
+++ b/app/src/main/res/layout/characters_fragment.xml
@@ -1,38 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.characters.CharactersFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+<layout>
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context=".ui.characters.CharactersFragment">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/characters_rv"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/characters_rv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
 
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:indeterminate="true"
-            android:visibility="gone"/>
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</FrameLayout>
\ No newline at end of file
+    </FrameLayout>
+</layout>
diff --git a/app/src/main/res/layout/item_character.xml b/app/src/main/res/layout/item_character.xml
index f85fba7..1e50f3d 100644
--- a/app/src/main/res/layout/item_character.xml
+++ b/app/src/main/res/layout/item_character.xml
@@ -1,41 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="10dp">
+<layout>
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/root"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="10dp"
-        android:text="TextView"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@+id/image"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:padding="10dp">
 
-    <TextView
-        android:id="@+id/species_and_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="5dp"
-        android:text="TextView"
-        app:layout_constraintStart_toEndOf="@+id/image"
-        app:layout_constraintTop_toBottomOf="@+id/name" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="10dp"
+            android:text="TextView"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@+id/image"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/species_and_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="5dp"
+            android:text="TextView"
+            app:layout_constraintStart_toEndOf="@+id/image"
+            app:layout_constraintTop_toBottomOf="@+id/name" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 1ba81ee..0deea90 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -9,15 +9,19 @@
         android:id="@+id/charactersFragment"
         android:name="com.example.rickandmorty.ui.characters.CharactersFragment"
         android:label="Characters"
-        tools:layout="@layout/characters_fragment" >
+        tools:layout="@layout/characters_fragment">
         <action
             android:id="@+id/action_charactersFragment_to_characterDetailFragment"
             app:destination="@id/characterDetailFragment" />
-
     </fragment>
     <fragment
         android:id="@+id/characterDetailFragment"
         android:name="com.example.rickandmorty.ui.characterdetail.CharacterDetailFragment"
         android:label="Character Detail"
-        tools:layout="@layout/character_detail_fragment" />
+        tools:layout="@layout/character_detail_fragment">
+        <argument
+            android:name="id"
+            android:defaultValue="0"
+            app:argType="integer" />
+    </fragment>
 </navigation>
\ No newline at end of file
diff --git a/app/src/sharedTest/java/DummyObject.kt b/app/src/sharedTest/java/DummyObject.kt
new file mode 100644
index 0000000..6ccd581
--- /dev/null
+++ b/app/src/sharedTest/java/DummyObject.kt
@@ -0,0 +1,31 @@
+import com.example.rickandmorty.data.entities.Character
+import com.example.rickandmorty.data.entities.CharacterList
+import com.example.rickandmorty.data.entities.Info
+
+object DummyObject {
+    val fakeListChar: List<Character> = listOf(
+        Character(
+            "20-01-2022",
+            "male",
+            1,
+            "",
+            "Dony Nuransyah",
+            "man",
+            "nothing",
+            "unknown",
+            ""
+        )
+    )
+    val fakeCharacterList = CharacterList(Info(1,"",1,false), fakeListChar)
+    val fakeCharacter = Character(
+        "20-01-2022",
+        "male",
+        1,
+        "",
+        "Dony Nuransyah",
+        "man",
+        "nothing",
+        "unknown",
+        ""
+    )
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/example/rickandmorty/BaseTest.kt b/app/src/test/java/com/example/rickandmorty/BaseTest.kt
new file mode 100644
index 0000000..06b9a85
--- /dev/null
+++ b/app/src/test/java/com/example/rickandmorty/BaseTest.kt
@@ -0,0 +1,20 @@
+package com.example.rickandmorty
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import io.mockk.MockKAnnotations
+import org.junit.Before
+import org.junit.Rule
+
+abstract class BaseTest {
+    @get:Rule
+    var instantExecutorRule = InstantTaskExecutorRule()
+
+
+    @Before
+    fun setupTest() {
+        MockKAnnotations.init(this)
+        preTest()
+    }
+
+    abstract fun preTest()
+}
diff --git a/app/src/test/java/com/example/rickandmorty/CharacterDetailViewModelTest.kt b/app/src/test/java/com/example/rickandmorty/CharacterDetailViewModelTest.kt
new file mode 100644
index 0000000..08d2a32
--- /dev/null
+++ b/app/src/test/java/com/example/rickandmorty/CharacterDetailViewModelTest.kt
@@ -0,0 +1,42 @@
+package com.example.rickandmorty
+
+import DummyObject
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.example.rickandmorty.data.entities.Character
+import com.example.rickandmorty.data.remote.CharacterRemoteDataSource
+import com.example.rickandmorty.data.repository.CharacterRepository
+import com.example.rickandmorty.ui.characterdetail.CharacterDetailViewModel
+import com.example.rickandmorty.utils.Resource
+import com.example.rickandmorty.utils.observeForTesting
+import com.jraska.livedata.test
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.RelaxedMockK
+import org.junit.Test
+
+class CharacterDetailViewModelTest : BaseTest() {
+    @RelaxedMockK
+    lateinit var repo: CharacterRepository
+    lateinit var vm: CharacterDetailViewModel
+
+    @RelaxedMockK
+    lateinit var data: CharacterRemoteDataSource
+    override fun preTest() {
+        vm = CharacterDetailViewModel(repo)
+    }
+
+    @Test
+    fun detail() {
+        val expected: Resource<Character> = Resource.success(DummyObject.fakeCharacter)
+        every {
+            repo.getCharacter(1)
+        } returns MutableLiveData(expected)
+        vm.start(1)
+        val obs = vm.character.test()
+        obs.assertHasValue()
+            .assertValue {
+                it == expected
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/example/rickandmorty/CharactersViewModelTest.kt b/app/src/test/java/com/example/rickandmorty/CharactersViewModelTest.kt
new file mode 100644
index 0000000..870d772
--- /dev/null
+++ b/app/src/test/java/com/example/rickandmorty/CharactersViewModelTest.kt
@@ -0,0 +1,57 @@
+package com.example.rickandmorty
+
+import DummyObject
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.test.runner.screenshot.Screenshot.capture
+import com.example.rickandmorty.data.entities.Character
+import com.example.rickandmorty.data.remote.CharacterRemoteDataSource
+import com.example.rickandmorty.data.repository.CharacterRepository
+import com.example.rickandmorty.ui.characters.CharactersViewModel
+import com.example.rickandmorty.utils.Resource
+import com.example.rickandmorty.utils.getOrAwaitValue
+import com.example.rickandmorty.utils.observeForTesting
+import com.google.common.truth.Truth
+import com.jraska.livedata.test
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.slot
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.Test
+
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@ExperimentalCoroutinesApi
+class CharactersViewModelTest : BaseTest() {
+
+    override fun preTest() {
+        testedObject = CharactersViewModel(charRepository)
+    }
+
+    // Subject under test
+    private lateinit var testedObject: CharactersViewModel
+
+    @RelaxedMockK
+    private lateinit var charRepository: CharacterRepository
+
+    @Test
+    fun getAllChars() {
+        val expected = MutableLiveData(Resource.success(DummyObject.fakeListChar))
+        every {
+            charRepository.getCharacters()
+        }.returns(expected)
+        testedObject.start()
+        val obs = testedObject.characters.test()
+        obs.assertHasValue()
+            .assertValue {
+                it == Resource.success(DummyObject.fakeListChar)
+            }
+    }
+
+}
diff --git a/app/src/test/java/com/example/rickandmorty/ExampleUnitTest.kt b/app/src/test/java/com/example/rickandmorty/ExampleUnitTest.kt
deleted file mode 100644
index 2dfe7d1..0000000
--- a/app/src/test/java/com/example/rickandmorty/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.rickandmorty
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/app/src/test/java/com/example/rickandmorty/utils/LiveDataTestUtil.kt b/app/src/test/java/com/example/rickandmorty/utils/LiveDataTestUtil.kt
new file mode 100644
index 0000000..d4d55d0
--- /dev/null
+++ b/app/src/test/java/com/example/rickandmorty/utils/LiveDataTestUtil.kt
@@ -0,0 +1,74 @@
+/*
+ * 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.rickandmorty.utils
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+/**
+ * Gets the value of a [LiveData] or waits for it to have one, with a timeout.
+ *
+ * Use this extension from host-side (JVM) tests. It's recommended to use it alongside
+ * `InstantTaskExecutorRule` or a similar mechanism to execute tasks synchronously.
+ */
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
+fun <T> LiveData<T>.getOrAwaitValue(
+    time: Long = 2,
+    timeUnit: TimeUnit = TimeUnit.SECONDS,
+    afterObserve: () -> Unit = {}
+): T {
+    var data: T? = null
+    val latch = CountDownLatch(1)
+    val observer = object : Observer<T> {
+        override fun onChanged(o: T?) {
+            data = o
+            latch.countDown()
+            this@getOrAwaitValue.removeObserver(this)
+        }
+    }
+    this.observeForever(observer)
+
+    try {
+        afterObserve.invoke()
+
+        // Don't wait indefinitely if the LiveData is not set.
+        if (!latch.await(time, timeUnit)) {
+            this.removeObserver(observer)
+            throw TimeoutException("LiveData value was never set.")
+        }
+    } finally {
+        this.removeObserver(observer)
+    }
+    @Suppress("UNCHECKED_CAST")
+    return data as T
+}
+
+/**
+ * Observes a [LiveData] until the `block` is done executing.
+ */
+fun <T> LiveData<T>.observeForTesting(block: () -> Unit) {
+    val observer = Observer<T> { }
+    try {
+        observeForever(observer)
+        block()
+    } finally {
+        removeObserver(observer)
+    }
+}
diff --git a/app/src/test/java/com/example/rickandmorty/utils/MainCoroutineRule.kt b/app/src/test/java/com/example/rickandmorty/utils/MainCoroutineRule.kt
new file mode 100644
index 0000000..1b7021d
--- /dev/null
+++ b/app/src/test/java/com/example/rickandmorty/utils/MainCoroutineRule.kt
@@ -0,0 +1,64 @@
+/*
+ * 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.rickandmorty.utils
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineScope
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+import kotlin.coroutines.ContinuationInterceptor
+
+/**
+ * Sets the main coroutines dispatcher to a [TestCoroutineScope] for unit testing. A
+ * [TestCoroutineScope] provides control over the execution of coroutines.
+ *
+ * Declare it as a JUnit Rule:
+ *
+ * ```
+ * @get:Rule
+ * var mainCoroutineRule = MainCoroutineRule()
+ * ```
+ *
+ * Use it directly as a [TestCoroutineScope]:
+ *
+ * ```
+ * mainCoroutineRule.pauseDispatcher()
+ * ...
+ * mainCoroutineRule.resumeDispatcher()
+ * ...
+ * mainCoroutineRule.runBlockingTest { }
+ * ...
+ *
+ * ```
+ */
+@ExperimentalCoroutinesApi
+class MainCoroutineRule : TestWatcher(), TestCoroutineScope by TestCoroutineScope() {
+
+    override fun starting(description: Description?) {
+        super.starting(description)
+        Dispatchers.setMain(this.coroutineContext[ContinuationInterceptor] as CoroutineDispatcher)
+    }
+
+    override fun finished(description: Description?) {
+        super.finished(description)
+        Dispatchers.resetMain()
+    }
+}
diff --git a/build.gradle b/build.gradle
index 156ee39..3f2ded6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,65 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext {
+        kotlinVersion = '1.5.10'
+        // App dependencies
+        androidXVersion = '1.0.0'
+        androidXTestCoreVersion = '1.3.0'
+        androidXTestExtKotlinRunnerVersion = '1.1.2'
+        androidXTestRulesVersion = '1.2.0'
+        androidXAnnotations = '1.2.0'
+        androidXLegacySupport = '1.0.0'
+        appCompatVersion = '1.3.0'
+        archLifecycleVersion = '2.3.1'
+        archTestingVersion = '2.1.0'
+        cardVersion = '1.0.0'
+        coroutinesVersion = '1.5.0'
+        dexMakerVersion = '2.12.1'
+        espressoVersion = '3.3.0'
+        fragmentVersion = '1.3.4'
+        fragmentKtxVersion = '1.3.4'
+        hamcrestVersion = '1.3'
+        junitVersion = '4.13.1'
+        materialVersion = '1.3.0'
+        multiDexVersion = '2.0.1'
+        recyclerViewVersion = '1.2.0'
+        robolectricVersion = '4.5.1'
+        roomVersion = '2.3.0'
+        rulesVersion = '1.0.1'
+        timberVersion = '4.7.1'
+        truthVersion = '1.1.2'
+        navigationVersion = '2.3.5'
+        ktlintVersion = '0.33.0'
+        hiltVersion = "2.36"
+    }
     repositories {
         google()
+        mavenCentral()
         jcenter()
-        
+
     }
     dependencies {
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.28-alpha'
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.35.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
-
+apply plugin: "kotlin-allopen"
+allOpen {
+    annotation("com.example.rickandmorty.data.OpenForTesting")
+    // annotations("com.another.Annotation", "com.third.Annotation")
+}
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
-        
+
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8b56fd1..8382245 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip