Rearrange properties in DetailViewModel

Author: skydoves

.github/workflows/android.yml

@@ -3,7 +3,7 @@ name: Android CI
 on:
  push:
   branches:
-   - master
+   - main
 
 jobs:
   build:

app/src/main/java/com/skydoves/pokedex/di/PersistenceModule.kt

@@ -21,6 +21,8 @@ import androidx.room.Room
 import com.skydoves.pokedex.persistence.AppDatabase
 import com.skydoves.pokedex.persistence.PokemonDao
 import com.skydoves.pokedex.persistence.PokemonInfoDao
+import com.skydoves.pokedex.persistence.TypeResponseConverter
+import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -33,10 +35,20 @@ object PersistenceModule {
 
   @Provides
   @Singleton
-  fun provideAppDatabase(application: Application): AppDatabase {
+  fun provideMoshi(): Moshi {
+    return Moshi.Builder().build()
+  }
+
+  @Provides
+  @Singleton
+  fun provideAppDatabase(
+    application: Application,
+    typeResponseConverter: TypeResponseConverter
+  ): AppDatabase {
     return Room
       .databaseBuilder(application, AppDatabase::class.java, "Pokedex.db")
       .fallbackToDestructiveMigration()
+      .addTypeConverter(typeResponseConverter)
       .build()
   }
 
@@ -51,4 +63,10 @@ object PersistenceModule {
   fun providePokemonInfoDao(appDatabase: AppDatabase): PokemonInfoDao {
     return appDatabase.pokemonInfoDao()
   }
+
+  @Provides
+  @Singleton
+  fun provideTypeResponseConverter(moshi: Moshi): TypeResponseConverter {
+    return TypeResponseConverter(moshi)
+  }
 }

app/src/main/java/com/skydoves/pokedex/persistence/TypeResponseConverter.kt

@@ -16,25 +16,26 @@
 
 package com.skydoves.pokedex.persistence
 
+import androidx.room.ProvidedTypeConverter
 import androidx.room.TypeConverter
 import com.skydoves.pokedex.model.PokemonInfo
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
+import javax.inject.Inject
 
-object TypeResponseConverter {
+@ProvidedTypeConverter
+class TypeResponseConverter @Inject constructor(
+  private val moshi: Moshi
+) {
 
-  private val moshi = Moshi.Builder().build()
-
-  @JvmStatic
   @TypeConverter
   fun fromString(value: String): List<PokemonInfo.TypeResponse>? {
     val listType = Types.newParameterizedType(List::class.java, PokemonInfo.TypeResponse::class.java)
     val adapter: JsonAdapter<List<PokemonInfo.TypeResponse>> = moshi.adapter(listType)
     return adapter.fromJson(value)
   }
 
-  @JvmStatic
   @TypeConverter
   fun fromInfoType(type: List<PokemonInfo.TypeResponse>?): String {
     val listType = Types.newParameterizedType(List::class.java, PokemonInfo.TypeResponse::class.java)

app/src/main/java/com/skydoves/pokedex/ui/details/DetailActivity.kt

@@ -61,7 +61,6 @@ class DetailActivity : DataBindingActivity() {
   }
 
   companion object {
-
     @VisibleForTesting const val EXTRA_POKEMON = "EXTRA_POKEMON"
 
     fun startActivity(transformationLayout: TransformationLayout, pokemon: Pokemon) {

app/src/main/java/com/skydoves/pokedex/ui/details/DetailViewModel.kt

@@ -34,21 +34,24 @@ class DetailViewModel @AssistedInject constructor(
   @Assisted private val pokemonName: String
 ) : LiveCoroutinesViewModel() {
 
+  val pokemonInfoLiveData: LiveData<PokemonInfo?>
+
+  private val _toastLiveData: MutableLiveData<String> = MutableLiveData()
+  val toastLiveData: LiveData<String> get() = _toastLiveData
+
   val isLoading: ObservableBoolean = ObservableBoolean(false)
-  val toastLiveData: MutableLiveData<String> = MutableLiveData()
-  val pokemonInfoLiveData: LiveData<PokemonInfo?> = launchOnViewModelScope(
-    block = {
+
+  init {
+    Timber.d("init DetailViewModel")
+
+    pokemonInfoLiveData = launchOnViewModelScope {
       isLoading.set(true)
       detailRepository.fetchPokemonInfo(
         name = pokemonName,
         onSuccess = { isLoading.set(false) },
-        onError = { toastLiveData.postValue(it) }
+        onError = { _toastLiveData.postValue(it) }
       ).asLiveData()
     }
-  )
-
-  init {
-    Timber.d("init DetailViewModel")
   }
 
   @AssistedInject.Factory

app/src/test/java/com/skydoves/pokedex/persistence/LocalDatabase.kt

@@ -18,6 +18,7 @@ package com.skydoves.pokedex.persistence
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import com.squareup.moshi.Moshi
 import org.junit.After
 import org.junit.Before
 import org.junit.runner.RunWith
@@ -31,8 +32,10 @@ abstract class LocalDatabase {
 
   @Before
   fun initDB() {
+    val moshi = Moshi.Builder().build()
     db = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java)
       .allowMainThreadQueries()
+      .addTypeConverter(TypeResponseConverter(moshi))
       .build()
   }
 

dependencies.gradle

@@ -34,7 +34,7 @@ ext.versions = [
     // architecture components
     fragmentVersion      : '1.2.5',
     lifecycleVersion     : '2.2.0',
-    roomVersion          : '2.2.5',
+    roomVersion          : '2.3.0-alpha03',
     archCompomentVersion : '2.1.0',
 
     // startup