Merge branch 'submission-1' into dev

Author: riyhs

app/build.gradle

@@ -9,7 +9,7 @@ apply from: '../shared_dependencies.gradle'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.riyaldi.gamekuy"

app/src/main/java/com/riyaldi/gamekuy/App.kt

@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-open class App: Application()
+class App: Application()

app/src/main/java/com/riyaldi/gamekuy/explore/ExploreFragment.kt

@@ -8,6 +8,7 @@ import android.util.TypedValue
 import android.view.*
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -28,7 +29,7 @@ class ExploreFragment : Fragment() {
     private val exploreViewModel: ExploreViewModel by viewModels()
 
     private var _binding: FragmentExploreBinding? = null
-    private val binding get() = _binding!!
+    private val binding get() = _binding as FragmentExploreBinding
 
     private lateinit var gameAdapter: GameAdapter
 
@@ -46,6 +47,7 @@ class ExploreFragment : Fragment() {
         if (activity != null) {
             setHasOptionsMenu(true)
             showLoading(false)
+            showSearchGame(true)
 
             gameAdapter = GameAdapter()
 
@@ -58,6 +60,23 @@ class ExploreFragment : Fragment() {
                 startActivity(intent)
             }
 
+            exploreViewModel.games.observe(viewLifecycleOwner, { games ->
+                if (games != null) {
+                    when(games) {
+                        is Resource.Loading -> showLoading(true)
+                        is Resource.Success -> {
+                            gameAdapter.setData(games.data)
+                            showLoading(false)
+                        }
+                        is Resource.Error -> {
+                            showNoGame(true)
+                            Toast.makeText(context, "error", Toast.LENGTH_SHORT).show()
+                            showLoading(false)
+                        }
+                    }
+                }
+            })
+
             val marginVertical = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, resources.displayMetrics)
 
             with(binding.rvExplore){
@@ -81,25 +100,13 @@ class ExploreFragment : Fragment() {
         searchView.queryHint = "Cari game"
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
+                showSearchGame(false)
+                showNoGame(false)
+                showLoading(true)
 
                 if (query != null) {
                     lifecycleScope.launch {
                         exploreViewModel.searchGames(query)
-                        exploreViewModel.games.observe(viewLifecycleOwner, { games ->
-                            if (games != null) {
-                                when(games) {
-                                    is Resource.Loading -> showLoading(true)
-                                    is Resource.Success -> {
-                                        gameAdapter.setData(games.data)
-                                        showLoading(false)
-                                    }
-                                    is Resource.Error -> {
-                                        Toast.makeText(context, "error", Toast.LENGTH_SHORT).show()
-                                        showLoading(false)
-                                    }
-                                }
-                            }
-                        })
                     }
                 }
                 return true
@@ -113,6 +120,18 @@ class ExploreFragment : Fragment() {
 
     private fun showLoading(state: Boolean) {
         binding.pbExplore.isVisible = state
+        binding.rvExplore.isInvisible = state
+    }
+
+    private fun showSearchGame(state: Boolean) {
+        binding.ivSearchGame.isVisible = state
+        binding.tvSearchGame.isVisible = state
+        binding.rvExplore.isVisible = !state
+    }
+
+    private fun showNoGame(state: Boolean) {
+        binding.ivNoGame.isVisible = state
+        binding.tvNoGame.isVisible = state
         binding.rvExplore.isVisible = !state
     }
 

app/src/main/java/com/riyaldi/gamekuy/explore/ExploreViewModel.kt

@@ -5,7 +5,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.riyaldi.core.data.Resource
-import com.riyaldi.core.data.source.local.entity.GameEntity
 import com.riyaldi.core.domain.model.Game
 import com.riyaldi.core.domain.usecase.GameUseCase
 

app/src/main/java/com/riyaldi/gamekuy/home/HomeFragment.kt

@@ -25,7 +25,7 @@ class HomeFragment : Fragment() {
     private val homeViewModel: HomeViewModel by viewModels()
 
     private var _binding: FragmentHomeBinding? = null
-    private val binding get() = _binding!!
+    private val binding get() = _binding as FragmentHomeBinding
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)