cleanup

Author: odaridavid

app/src/androidTest/kotlin/com/k0d4black/theforce/SearchActivityIntegrationTest.kt

@@ -68,7 +68,7 @@ internal class SearchActivityIntegrationTest : BaseTest() {
     fun shouldNavigateToCharacterDetailOnItemClick() {
         onView(withId(R.id.action_search)).perform(click())
         onView(isAssignableFrom(EditText::class.java)).perform(typeText(EXISTING_SEARCH_PARAMS))
-        SystemClock.sleep(2000)
+        SystemClock.sleep(1500)
         onView(withId(R.id.search_results_recycler_view)).perform(
             RecyclerViewActions.actionOnItemAtPosition<SearchResultAdapter.SearchedCharacterViewHolder>(
                 0, ViewAction.clickChildViewWithId(R.id.more_info_arrow_image_button)

app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt

@@ -50,7 +50,7 @@ class CharacterDetailActivity : AppCompatActivity() {
     }
 
     private fun observeCharacterSpecies() {
-        characterDetailViewModel.characterStarWarsCharacterSpecies.observe(
+        characterDetailViewModel.species.observe(
             this,
             Observer { species ->
                 if (species.isNotEmpty()) {
@@ -64,7 +64,7 @@ class CharacterDetailActivity : AppCompatActivity() {
     }
 
     private fun observeCharacterFilms() {
-        characterDetailViewModel.starWarsCharacterFilms.observe(this, Observer { films ->
+        characterDetailViewModel.films.observe(this, Observer { films ->
             binding.characterDetailsFilmsRecyclerView.apply {
                 adapter = filmsAdapter.apply { submitList(films) }
                 layoutManager =
@@ -79,7 +79,7 @@ class CharacterDetailActivity : AppCompatActivity() {
     }
 
     private fun observeCharacterPlanet() {
-        characterDetailViewModel.characterPlanet.observe(this, Observer { planet ->
+        characterDetailViewModel.planet.observe(this, Observer { planet ->
             binding.planet = planet
             enableGroup(R.id.character_planet_group)
         })

app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailViewModel.kt

@@ -25,24 +25,24 @@ class CharacterDetailViewModel @Inject constructor(
     private val getFilmsUseCase: GetFilmsUseCase
 ) : UiStateViewModel() {
 
-    val characterPlanet: LiveData<PlanetPresentation>
-        get() = _characterPlanet
+    val planet: LiveData<PlanetPresentation>
+        get() = _planet
 
-    private var _characterPlanet = MutableLiveData<PlanetPresentation>()
+    private var _planet = MutableLiveData<PlanetPresentation>()
 
-    val starWarsCharacterFilms: LiveData<List<FilmPresentation>>
-        get() = _characterFilms
+    val films: LiveData<List<FilmPresentation>>
+        get() = _films
 
-    private var _characterFilms = MutableLiveData<List<FilmPresentation>>()
+    private var _films = MutableLiveData<List<FilmPresentation>>()
 
-    val characterStarWarsCharacterSpecies: LiveData<List<SpeciePresentation>>
-        get() = _characterSpecies
+    val species: LiveData<List<SpeciePresentation>>
+        get() = _species
 
-    private var _characterSpecies = MutableLiveData<List<SpeciePresentation>>()
+    private var _species = MutableLiveData<List<SpeciePresentation>>()
 
     fun getCharacterDetails(characterUrl: String) {
-        _uiState.value = Loading
         viewModelScope.launch(Dispatchers.IO + handler) {
+            _uiState.postValue(Loading)
             loadPlanet(characterUrl)
             loadFilms(characterUrl)
             loadSpecies(characterUrl)
@@ -53,21 +53,21 @@ class CharacterDetailViewModel @Inject constructor(
     private suspend fun loadPlanet(characterUrl: String) {
         getPlanetUseCase(characterUrl).collect { planet ->
             val planetPresentation = planet.toPresentation()
-            _characterPlanet.postValue(planetPresentation)
+            _planet.postValue(planetPresentation)
         }
     }
 
     private suspend fun loadFilms(characterUrl: String) {
         getFilmsUseCase(characterUrl).collect { films ->
             val filmsPresentation = films.map { eachFilm -> eachFilm.toPresentation() }
-            _characterFilms.postValue(filmsPresentation)
+            _films.postValue(filmsPresentation)
         }
     }
 
     private suspend fun loadSpecies(characterUrl: String) {
         getSpeciesUseCase(characterUrl).collect { species ->
             val speciesPresentation = species.map { eachSpecie -> eachSpecie.toPresentation() }
-            _characterSpecies.postValue(speciesPresentation)
+            _species.postValue(speciesPresentation)
         }
     }
 

app/src/test/kotlin/com/k0d4black/theforce/viewmodels/CharacterDetailViewModelTest.kt

@@ -48,15 +48,15 @@ internal class CharacterDetailViewModelTest : BaseViewModelTest() {
         runBlockingTest {
             characterDetailViewModel.getCharacterDetails(characterUrl)
 
-            characterDetailViewModel.characterStarWarsCharacterSpecies.observeOnce {speciesPresentation->
+            characterDetailViewModel.species.observeOnce { speciesPresentation->
                 Truth.assertThat(speciesPresentation)
                     .isEqualTo(SampleData.species.map { it.toPresentation() })
             }
-            characterDetailViewModel.starWarsCharacterFilms.observeOnce {filmPresentation->
+            characterDetailViewModel.films.observeOnce { filmPresentation->
                 Truth.assertThat(filmPresentation)
                     .isEqualTo(SampleData.films.map { it.toPresentation() })
             }
-            characterDetailViewModel.characterPlanet.observeOnce {planetPresentation->
+            characterDetailViewModel.planet1.observeOnce { planetPresentation->
                 Truth.assertThat(planetPresentation).isEqualTo(SampleData.planet.toPresentation())
             }
         }