[AN-REFACTOR] 상성 화면 리팩토링

android/app/src/main/java/poke/rogue/helper/data/datasource/LocalTypeDataSource.kt

@@ -1,5 +1,6 @@
 package poke.rogue.helper.data.datasource
 
+import poke.rogue.helper.data.model.TypeInfo
 import poke.rogue.helper.data.model.TypeMatchedResult
 import poke.rogue.helper.local.DummyTypeData
 
@@ -35,4 +36,6 @@ class LocalTypeDataSource(private val typeData: DummyTypeData = DummyTypeData) {
             listOf(typeData.allTypes.get(defendingTypeId)),
         )
     }
+
+    fun allTypes(): List<TypeInfo> = typeData.allTypes
 }

android/app/src/main/java/poke/rogue/helper/data/repository/TypeRepository.kt

@@ -2,6 +2,7 @@ package poke.rogue.helper.data.repository
 
 import poke.rogue.helper.data.datasource.LocalTypeDataSource
 import poke.rogue.helper.data.model.MatchedResult
+import poke.rogue.helper.data.model.TypeInfo
 import poke.rogue.helper.data.model.TypeMatchedResult
 
 class TypeRepository(private val localTypeDataSource: LocalTypeDataSource) {
@@ -23,4 +24,8 @@ class TypeRepository(private val localTypeDataSource: LocalTypeDataSource) {
             localTypeDataSource.findMatchedTypeResult(myTypeId, it)
         }.filter { it.matchedResult != MatchedResult.NORMAL }
     }
+
+    fun allTypes(): List<TypeInfo> {
+        return localTypeDataSource.allTypes()
+    }
 }

android/app/src/main/java/poke/rogue/helper/presentation/type/TypeActivity.kt

@@ -6,17 +6,19 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import poke.rogue.helper.R
 import poke.rogue.helper.databinding.ActivityTypeBinding
 import poke.rogue.helper.presentation.base.BindingActivity
 import poke.rogue.helper.presentation.type.model.SelectorType
-import poke.rogue.helper.presentation.type.model.TypeSelectionUiState
-import poke.rogue.helper.presentation.type.typeselection.TypeSelectionBottomSheetFragment
-import poke.rogue.helper.presentation.util.context.colorOf
+import poke.rogue.helper.presentation.type.result.TypeResultAdapter
+import poke.rogue.helper.presentation.type.selection.TypeSelectionBottomSheetFragment
 import poke.rogue.helper.presentation.util.context.drawableOf
 import poke.rogue.helper.presentation.util.context.stringOf
+import poke.rogue.helper.presentation.util.repeatOnStarted
+import poke.rogue.helper.presentation.util.view.setVisible
 
 class TypeActivity : BindingActivity<ActivityTypeBinding>(R.layout.activity_type) {
     private val viewModel: TypeViewModel by viewModels {
@@ -46,8 +48,7 @@ class TypeActivity : BindingActivity<ActivityTypeBinding>(R.layout.activity_type
     }
 
     private fun navigateToPokeRogue() {
-        val intent =
-            Intent(Intent.ACTION_VIEW, Uri.parse(stringOf(R.string.home_pokerogue_url)))
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(stringOf(R.string.home_pokerogue_url)))
         startActivity(intent)
     }
 
@@ -56,86 +57,61 @@ class TypeActivity : BindingActivity<ActivityTypeBinding>(R.layout.activity_type
             setSupportActionBar(toolbarHome.toolbar)
             toolbarHome.toolbar.overflowIcon = drawableOf(R.drawable.ic_menu)
             supportActionBar?.setDisplayShowTitleEnabled(false)
+
+            typeHandler = viewModel
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initViews()
         initAdapter()
-        initListener()
         initObserver()
-        binding.typeHandler = viewModel
     }
 
     private fun initAdapter() {
         binding.rvTypeResult.adapter = typeResultAdapter
     }
 
-    private fun initListener() {
-        binding.vwTypeMyTypeContainer.setOnClickListener {
-            displayBottomSheet(SelectorType.MINE)
-        }
-
-        binding.vwTypeOpponentTypeContainer1.setOnClickListener {
-            displayBottomSheet(SelectorType.OPPONENT1)
-        }
-
-        binding.vwTypeOpponentTypeContainer2.setOnClickListener {
-            displayBottomSheet(SelectorType.OPPONENT2)
-        }
-        binding.btnRefresh.setOnClickListener {
-            viewModel.refresh()
-        }
-    }
-
     private fun initObserver() {
-        viewModel.myType.observe(this) { uiState ->
-            when (uiState) {
-                is TypeSelectionUiState.Selected -> {
-                    val data = uiState.selectedType
-                    binding.vwTypeMyTypeContent.visibility = View.VISIBLE
-                    binding.vwTypeMyTypeContent.setContentColor(this.colorOf(data.typeColor))
-                    binding.ivTypeMyTypeContent.setImageResource(uiState.selectedType.typeIconResId)
-                }
-
-                is TypeSelectionUiState.Idle -> {
-                    binding.vwTypeMyTypeContent.visibility = View.GONE
+        repeatOnStarted {
+            viewModel.typeEvent.collect {
+                if (it is TypeEvent.ShowSelection) {
+                    displayBottomSheet(it.selectorType)
                 }
             }
         }
 
-        viewModel.opponentType1.observe(this) { uiState ->
-            when (uiState) {
-                is TypeSelectionUiState.Selected -> {
-                    val data = uiState.selectedType
-                    binding.vwTypeOpponentTypeContent1.visibility = View.VISIBLE
-                    binding.vwTypeOpponentTypeContent1.setContentColor(this.colorOf(data.typeColor))
-                    binding.ivTypeOpponentTypeContent1.setImageResource(uiState.selectedType.typeIconResId)
-                }
-
-                is TypeSelectionUiState.Idle -> {
-                    binding.vwTypeOpponentTypeContent1.visibility = View.GONE
+        lifecycleScope.launch {
+            viewModel.myType.collect { uiState ->
+                binding.parallelogramTypeMyTypeContent.setVisible(uiState is TypeSelectionUiState.Selected)
+                if (uiState is TypeSelectionUiState.Selected) {
+                    binding.myType = uiState.selectedType
                 }
             }
         }
 
-        viewModel.opponentType2.observe(this) { uiState ->
-            when (uiState) {
-                is TypeSelectionUiState.Selected -> {
-                    val data = uiState.selectedType
-                    binding.vwTypeOpponentTypeContent2.visibility = View.VISIBLE
-                    binding.vwTypeOpponentTypeContent2.setContentColor(this.colorOf(data.typeColor))
-                    binding.ivTypeOpponentTypeContent2.setImageResource(uiState.selectedType.typeIconResId)
+        lifecycleScope.launch {
+            viewModel.opponentType1.collect { uiState ->
+                binding.parallelogramTypeOpponentTypeContent1.setVisible(uiState is TypeSelectionUiState.Selected)
+                if (uiState is TypeSelectionUiState.Selected) {
+                    binding.opponent1Type = uiState.selectedType
                 }
+            }
+        }
 
-                is TypeSelectionUiState.Idle -> {
-                    binding.vwTypeOpponentTypeContent2.visibility = View.GONE
+        lifecycleScope.launch {
+            viewModel.opponentType2.collect { uiState ->
+                binding.parallelogramTypeOpponentTypeContent2.setVisible(uiState is TypeSelectionUiState.Selected)
+                if (uiState is TypeSelectionUiState.Selected) {
+                    binding.opponent2Type = uiState.selectedType
                 }
             }
         }
 
-        viewModel.type.observe(this) { matchedResult ->
-            typeResultAdapter.submitList(matchedResult)
+        lifecycleScope.launch {
+            viewModel.type.collect { matchedResult ->
+                typeResultAdapter.submitList(matchedResult)
+            }
         }
     }
 

android/app/src/main/java/poke/rogue/helper/presentation/type/TypeEvent.kt

@@ -0,0 +1,9 @@
+package poke.rogue.helper.presentation.type
+
+import poke.rogue.helper.presentation.type.model.SelectorType
+
+sealed interface TypeEvent {
+    data class ShowSelection(val selectorType: SelectorType) : TypeEvent
+
+    data object HideSelection : TypeEvent
+}

android/app/src/main/java/poke/rogue/helper/presentation/type/TypeHandler.kt

@@ -4,14 +4,14 @@ import poke.rogue.helper.presentation.type.model.SelectorType
 import poke.rogue.helper.presentation.type.model.TypeUiModel
 
 interface TypeHandler {
-    fun selectType(
+    fun showSelection(selectorType: SelectorType)
+
+    fun applySelection(
         selectorType: SelectorType,
         selectedType: TypeUiModel,
     )
 
-    fun deleteMyType()
-
-    fun deleteOpponent1Type()
+    fun removeSelection(selectorType: SelectorType)
 
-    fun deleteOpponent2Type()
+    fun removeAllSelections()
 }

android/app/src/main/java/poke/rogue/helper/presentation/type/model/TypeSelectionUiState.kt → android/app/src/main/java/poke/rogue/helper/presentation/type/TypeSelectionUiState.kt

@@ -1,4 +1,6 @@
-package poke.rogue.helper.presentation.type.model
+package poke.rogue.helper.presentation.type
+
+import poke.rogue.helper.presentation.type.model.TypeUiModel
 
 sealed interface TypeSelectionUiState {
     data class Selected(val selectedType: TypeUiModel) : TypeSelectionUiState