Update gradle and refactor

Sergi Llamas · Sergi Llamas · commit c670d96bde68 · 2020-05-10T13:17:58.000+02:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,18 +35,20 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5'
+    implementation 'com.squareup.retrofit2:retrofit:2.8.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.8.0'
     implementation 'com.github.bumptech.glide:glide:4.10.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+
     annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
-    testImplementation 'junit:junit:4.12'
+
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
 }
diff --git a/app/src/main/java/com/slg/pokeonary/data/repository/common/ServiceResultWrapper.kt b/app/src/main/java/com/slg/pokeonary/data/repository/common/ServiceResultWrapper.kt
@@ -11,4 +11,4 @@ suspend fun <T : Any> safeApiCall(call: suspend () -> T): ServiceResultWrapper<T
     ServiceResultWrapper.Success(call())
 } catch (e: Exception) {
     ServiceResultWrapper.Error(e)
-}
+}
diff --git a/app/src/main/java/com/slg/pokeonary/mobile/pokemonDetail/PokemonDetailFragment.kt b/app/src/main/java/com/slg/pokeonary/mobile/pokemonDetail/PokemonDetailFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import com.slg.pokeonary.R
diff --git a/app/src/main/java/com/slg/pokeonary/mobile/pokemonList/PokemonListFragment.kt b/app/src/main/java/com/slg/pokeonary/mobile/pokemonList/PokemonListFragment.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -36,17 +36,17 @@ class PokemonListFragment : Fragment() {
 
         navController = view.findNavController()
 
-        viewModel = ViewModelProviders.of(
+        viewModel = ViewModelProvider(
             this,
-            PokemonListViewModel.PokemonListViewModelFactory(activity!!.application)
+            PokemonListViewModel.PokemonListViewModelFactory(requireActivity().application)
         )[PokemonListViewModel::class.java]
 
         pokemonsAdapter = PokemonsAdapter(viewModel::onPokemonClicked)
 
         initializeRecyclerView()
 
-        viewModel.model.observe(this, Observer(::updateUi))
-        viewModel.navigation.observe(this, Observer { event ->
+        viewModel.model.observe(viewLifecycleOwner, Observer(::updateUi))
+        viewModel.navigation.observe(viewLifecycleOwner, Observer { event ->
             event.getContentIfNotHandled()?.let { pokemon ->
                 val action = PokemonListFragmentDirections
                     .actionPokemonListFragmentToPokemonDetailFragment(pokemon)
@@ -57,7 +57,8 @@ class PokemonListFragment : Fragment() {
 
     private fun initializeRecyclerView() {
         recyclerView.adapter = pokemonsAdapter
-        val dividerDrawable = ContextCompat.getDrawable(context!!, R.drawable.recycler_view_divider)
+        val dividerDrawable =
+            ContextCompat.getDrawable(requireContext(), R.drawable.recycler_view_divider)
         recyclerView.addItemDecoration(
             DividerItemDecoration(
                 context,
diff --git a/app/src/main/java/com/slg/pokeonary/mobile/pokemonList/PokemonListViewModel.kt b/app/src/main/java/com/slg/pokeonary/mobile/pokemonList/PokemonListViewModel.kt
@@ -46,8 +46,11 @@ class PokemonListViewModel(private val context: Context) : CoroutineScope, ViewM
             GetPokemonList(PokemonDataRepository(PokemonRemoteDataSource(context)))
         launch {
             _model.value = UiModel.Loading
-            when (val pokemons = getPokemonListUseCase.buildAsync(GetPokemonListParams(START, COUNT))) {
-                is ServiceResultWrapper.Success -> _model.value = pokemons.data?.transformToUi()?.let { UiModel.Content(it) }
+            val pokemons = getPokemonListUseCase.buildAsync(GetPokemonListParams(START, COUNT))
+            when (pokemons) {
+                is ServiceResultWrapper.Success -> {
+                    _model.value = pokemons.data?.transformToUi()?.let { UiModel.Content(it) }
+                }
                 is ServiceResultWrapper.Error -> _model.value = UiModel.Content(listOf())
             }
         }
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 17 10:49:14 CET 2019
+#Sun May 10 12:29:55 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,11 @@ class PokemonListViewModel(private val context: Context) : CoroutineScope, ViewM`
`46`	`46`	`GetPokemonList(PokemonDataRepository(PokemonRemoteDataSource(context)))`
`47`	`47`	`launch {`
`48`	`48`	`_model.value = UiModel.Loading`
`49`		`- when (val pokemons = getPokemonListUseCase.buildAsync(GetPokemonListParams(START, COUNT))) {`
`50`		`- is ServiceResultWrapper.Success -> _model.value = pokemons.data?.transformToUi()?.let { UiModel.Content(it) }`
	`49`	`+ val pokemons = getPokemonListUseCase.buildAsync(GetPokemonListParams(START, COUNT))`
	`50`	`+ when (pokemons) {`
	`51`	`+ is ServiceResultWrapper.Success -> {`
	`52`	`+ _model.value = pokemons.data?.transformToUi()?.let { UiModel.Content(it) }`
	`53`	`+ }`
`51`	`54`	`is ServiceResultWrapper.Error -> _model.value = UiModel.Content(listOf())`
`52`	`55`	`}`
`53`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:3.5.3'`
	`11`	`+ classpath 'com.android.tools.build:gradle:3.6.3'`
`12`	`12`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`13`	`13`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"`
`14`	`14`