cleaning up

Author: riyhs

app/src/main/java/com/riyaldi/gamekuy/detail/DetailActivity.kt

@@ -6,17 +6,13 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.map
 import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
 import com.riyaldi.core.data.Resource
 import com.riyaldi.core.domain.model.Game
 import com.riyaldi.gamekuy.R
 import com.riyaldi.gamekuy.databinding.ActivityDetailBinding
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
 import kotlin.math.abs
 
 @AndroidEntryPoint
@@ -25,7 +21,6 @@ class DetailActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListener
     private val detailViewModel: DetailViewModel by viewModels()
 
     private lateinit var binding: ActivityDetailBinding
-    private lateinit var dataGame: Game
 
     companion object {
         const val EXTRA_GAME = "extra_game"
@@ -42,66 +37,25 @@ class DetailActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListener
         val game = intent.getParcelableExtra<Game>(EXTRA_GAME)
 
         if (game != null) {
-            var isFav = true
-
-            lifecycleScope.launch {
-                isFav = detailViewModel.isFavorite(game.id) as Boolean
-            }
-            Toast.makeText(this@DetailActivity, isFav.toString(), Toast.LENGTH_SHORT).show()
-
-            if (isFav) {
-                var isChanged = false
-
-                detailViewModel.getDetailFilm(game.id).observe(this, { detailGame ->
-                    when (detailGame) {
-                        is Resource.Loading -> showLoading(true)
-                        is Resource.Success -> {
-                            dataGame = detailGame.data as Game
-
-                            if (dataGame.isFavorite != isFav && !isChanged) {
-                                detailViewModel.setFavoriteGame(dataGame)
-                                setFavoriteState(dataGame.isFavorite)
-                                isChanged = true
-                            }
-
-                            populateData(dataGame)
-                            showLoading(false)
-
+            detailViewModel.getDetailFilm(game.id).observe(this, { detailGame ->
+                when(detailGame) {
+                    is Resource.Loading -> showLoading(true)
+                    is Resource.Success -> {
+                        val dataGame = detailGame.data as Game
+                        setFavoriteState(dataGame.isFavorite)
+                        populateData(dataGame)
+                        showLoading(false)
+                        binding.fabAddFavorite.setOnClickListener {
+                            detailViewModel.setFavoriteGame(dataGame)
                             setFavoriteState(dataGame.isFavorite)
-                            binding.fabAddFavorite.setOnClickListener {
-                                detailViewModel.setFavoriteGame(dataGame)
-                                setFavoriteState(dataGame.isFavorite)
-                            }
-                        }
-                        is Resource.Error -> {
-                            Toast.makeText(this, "error : ${detailGame.message}", Toast.LENGTH_SHORT).show()
-                            showLoading(false)
                         }
                     }
-                })
-            } else {
-                detailViewModel.getDetailFilm(game.id).observe(this, { detailGame ->
-                    when (detailGame) {
-                        is Resource.Loading -> showLoading(true)
-                        is Resource.Success -> {
-                            dataGame = detailGame.data as Game
-
-                            populateData(dataGame)
-                            showLoading(false)
-
-                            setFavoriteState(dataGame.isFavorite)
-                            binding.fabAddFavorite.setOnClickListener {
-                                detailViewModel.setFavoriteGame(dataGame)
-                                setFavoriteState(dataGame.isFavorite)
-                            }
-                        }
-                        is Resource.Error -> {
-                            Toast.makeText(this, "error : ${detailGame.message}", Toast.LENGTH_SHORT).show()
-                            showLoading(false)
-                        }
+                    is Resource.Error -> {
+                        Toast.makeText(this, "error : ${detailGame.message}", Toast.LENGTH_SHORT).show()
+                        showLoading(false)
                     }
-                })
-            }
+                }
+            })
         }
     }
 

app/src/main/java/com/riyaldi/gamekuy/detail/DetailViewModel.kt

@@ -9,5 +9,4 @@ import com.riyaldi.core.domain.usecase.GameUseCase
 class DetailViewModel @ViewModelInject constructor(private val gameUseCase: GameUseCase): ViewModel() {
     fun getDetailFilm(id: Int) = gameUseCase.getDetailGame(id).asLiveData()
     fun setFavoriteGame(game: Game) = gameUseCase.setFavoriteGame(game)
-    suspend fun isFavorite(id: Int) = gameUseCase.isFavorite(id)
 }

core/src/main/java/com/riyaldi/core/data/GameRepositoryImpl.kt

@@ -74,11 +74,6 @@ class GameRepositoryImpl @Inject constructor(
                 }
             }.asFlow() as Flow<Resource<Game>>
 
-    override suspend fun isFavorite(id: Int): Boolean? {
-
-        return localDataSource.getGameById(id)?.first()?.isFavorite
-    }
-
     override fun setFavoriteGame(game: Game) {
         val gameEntity = DataMapper.mapDomainToEntity(game)
         gameEntity.isFavorite = !gameEntity.isFavorite

core/src/main/java/com/riyaldi/core/domain/repository/GameRepository.kt

@@ -8,7 +8,6 @@ interface GameRepository {
     fun getGames(): Flow<Resource<List<Game>>>
     fun getFavoriteGames(): Flow<List<Game>>
     fun getDetailGame(id: Int): Flow<Resource<Game>>
-    suspend fun isFavorite(id: Int): Boolean?
     fun setFavoriteGame(game: Game)
     suspend fun searchGames(query: String): Resource<List<Game>>
     suspend fun insertGame(game: Game)

core/src/main/java/com/riyaldi/core/domain/usecase/GameUseCase.kt

@@ -8,7 +8,6 @@ interface GameUseCase {
     fun getGames(): Flow<Resource<List<Game>>>
     fun getFavoriteGames(): Flow<List<Game>>
     fun getDetailGame(id: Int): Flow<Resource<Game>>
-    suspend fun isFavorite(id: Int): Boolean?
     fun setFavoriteGame(game: Game)
     suspend fun searchGames(query: String): Resource<List<Game>>
     suspend fun insertGame(game: Game)

core/src/main/java/com/riyaldi/core/domain/usecase/GameUseCaseImpl.kt

@@ -9,7 +9,6 @@ class GameUseCaseImpl @Inject constructor(private val gameRepository: GameReposi
     override fun getGames() = gameRepository.getGames()
     override fun getFavoriteGames() = gameRepository.getFavoriteGames()
     override fun getDetailGame(id: Int) = gameRepository.getDetailGame(id)
-    override suspend fun isFavorite(id: Int): Boolean? = gameRepository.isFavorite(id)
     override fun setFavoriteGame(game: Game) = gameRepository.setFavoriteGame(game)
     override suspend fun searchGames(query: String): Resource<List<Game>> = gameRepository.searchGames(query)
     override suspend fun insertGame(game: Game) = gameRepository.insertGame(game)