[refact/all]: App 추가화면 로직 수정

feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/appadd/AppAddActivity.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 class AppAddActivity : AppCompatActivity() {
+
     companion object {
         const val SELECTED_APPS = "selected_apps"
         const val GOAL_TIME = "goal_time"
@@ -25,56 +26,43 @@ class AppAddActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        initViewPager()
-        initNextButton()
+        initViews()
         collectState()
-        setOnClickBackButton()
     }
 
-    private fun setOnClickBackButton() {
-        binding.ivBack.setOnClickListener {
-            finish()
-        }
-    }
+    private fun initViews() {
+        binding.run {
+            vpAppAdd.adapter = AppAddViewPagerAdapter(this@AppAddActivity)
+            vpAppAdd.isUserInputEnabled = false
 
-    private fun collectState() {
-        viewModel.state.flowWithLifecycle(lifecycle).onEach {
-            binding.btAppSelection.isEnabled = it.selectedApp.isNotEmpty()
-        }.launchIn(lifecycleScope)
-    }
+            btAppSelection.setOnClickListener { handleNextClicked() }
+            ivBack.setOnClickListener { finish() }
 
-    private fun initNextButton() {
-        binding.run {
-            btAppSelection.setOnClickListener {
-                handleNextClicked()
-            }
         }
+
     }
 
-    private fun ActivityAppAddBinding.handleNextClicked() {
-        when (vpAppAdd.currentItem) {
-            0 -> {
-                vpAppAdd.currentItem = 1
-            }
+    private fun collectState() {
+        viewModel.state.flowWithLifecycle(lifecycle)
+            .onEach { binding.btAppSelection.isEnabled = it.appSelectionList.isNotEmpty() }
+            .launchIn(lifecycleScope)
+    }
 
-            1 -> {
-                val intent = Intent().apply {
-                    val selectedApps = viewModel.state.value.selectedApp
-                    putExtra(SELECTED_APPS, selectedApps.toTypedArray())
-                    putExtra(GOAL_TIME, viewModel.state.value.goalTime)
-                }
-                setResult(RESULT_OK, intent)
-                finish()
+    private fun handleNextClicked() {
+        binding.vpAppAdd.run {
+            when (currentItem) {
+                0 -> currentItem = 1
+                1 -> finishWithResults()
             }
-
-            else -> Unit
         }
     }
 
-    private fun initViewPager() {
-        binding.vpAppAdd.run {
-            adapter = AppAddViewPagerAdapter(this@AppAddActivity)
-            isUserInputEnabled = false
+    private fun finishWithResults() {
+        val intent = Intent().apply {
+            putExtra(SELECTED_APPS, viewModel.state.value.selectedApps.toTypedArray())
+            putExtra(GOAL_TIME, viewModel.state.value.goalTime)
         }
+        setResult(RESULT_OK, intent)
+        finish()
     }
 }

feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/appadd/AppAddViewModel.kt

@@ -1,36 +1,81 @@
 package com.hmh.hamyeonham.challenge.appadd
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.hmh.hamyeonham.challenge.appadd.appselection.AppSelectionModel
+import com.hmh.hamyeonham.challenge.usecase.GetInstalledAppUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-sealed interface AppAddEffect {
-    data class AppAdd(val selectedApp: List<String>, val goalTime: Long) : AppAddEffect
-}
+sealed interface AppAddEffect {}
 
 data class AppAddState(
-    val selectedApp: List<String> = listOf(),
+    val installedApp: List<String> = emptyList(),
+    val selectedApps: List<String> = emptyList(),
     val goalHour: Long = 0,
     val goalMin: Long = 0,
 ) {
     val goalTime = goalHour + goalMin
+    val appSelectionList = installedApp.map { AppSelectionModel(it, selectedApps.contains(it)) }
 }
 
 @HiltViewModel
-class AppAddViewModel @Inject constructor() : ViewModel() {
+class AppAddViewModel @Inject constructor(
+    private val getInstalledAppUseCase: GetInstalledAppUseCase
+) : ViewModel() {
+
+    init {
+        getInstalledApps()
+    }
+
     private val _state = MutableStateFlow(AppAddState())
     val state = _state.asStateFlow()
 
-    private val _effect = MutableSharedFlow<AppAddEffect>()
+    private val _effect = MutableSharedFlow<AppAddEffect>(1)
     val effect = _effect.asSharedFlow()
 
-    fun updateState(transform: AppAddState.() -> AppAddState) {
+    private fun updateState(transform: AppAddState.() -> AppAddState) {
         val currentState = state.value
         val newState = currentState.transform()
         _state.value = newState
     }
+
+    fun checkApp(packageName: String) {
+        updateState {
+            copy(selectedApps = selectedApps + packageName)
+        }
+
+    }
+
+    fun unCheckApp(packageName: String) {
+        updateState {
+            copy(selectedApps = selectedApps - packageName)
+        }
+    }
+
+    fun setGoalHour(goalHour: Long) {
+        updateState {
+            copy(goalHour = goalHour)
+        }
+    }
+
+    fun setGoalMin(goalMin: Long) {
+        updateState {
+            copy(goalMin = goalMin)
+        }
+    }
+
+    private fun getInstalledApps() {
+        viewModelScope.launch {
+            val installApps = getInstalledAppUseCase()
+            updateState {
+                copy(installedApp = installApps)
+            }
+        }
+    }
 }

feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/appadd/appselection/AppSelectionAdapter.kt

@@ -1,6 +1,5 @@
 package com.hmh.hamyeonham.challenge.appadd.appselection
 
-import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.ListAdapter
@@ -11,64 +10,61 @@ import com.hmh.hamyeonham.common.view.ItemDiffCallback
 import com.hmh.hamyeonham.feature.challenge.databinding.ItemAppBinding
 
 class AppSelectionAdapter(
-    private val onAppCheckboxClicked: (String) -> Unit,
-    private val onAppCheckboxUnClicked: (String) -> Unit,
-) :
-    ListAdapter<Pair<String, Boolean>, AppSelectionAdapter.AppSelectionViewHolder>(
-        ItemDiffCallback(onItemsTheSame = { oldItem, newItem ->
+    private val onAppChecked: (String) -> Unit,
+    private val onAppUnChecked: (String) -> Unit,
+) : ListAdapter<AppSelectionModel, AppSelectionAdapter.AppSelectionViewHolder>(
+    ItemDiffCallback(
+        onItemsTheSame = { oldItem, newItem ->
             oldItem == newItem
-        }, onContentsTheSame = { oldItem, newItem ->
-            oldItem == newItem
-        }),
-    ) {
-    private val checkBoxStatus = SparseBooleanArray()
+        },
+        onContentsTheSame = { oldItem, newItem ->
+            oldItem.packageName == newItem.packageName
+        }
+    ),
+) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppSelectionViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         val binding = ItemAppBinding.inflate(inflater, parent, false)
         return AppSelectionViewHolder(
             binding,
-            onAppCheckboxClicked = onAppCheckboxClicked,
-            onAppCheckboxUnClicked = onAppCheckboxUnClicked,
+            onAppChecked = onAppChecked,
+            onAppUnChecked = onAppUnChecked,
         )
     }
 
-    override fun onBindViewHolder(
-        holder: AppSelectionViewHolder,
-        position: Int,
-    ) {
+    override fun onBindViewHolder(holder: AppSelectionViewHolder, position: Int) {
         holder.onBind(currentList[position])
     }
 
-    inner class AppSelectionViewHolder(
+    class AppSelectionViewHolder(
         private val binding: ItemAppBinding,
-        private val onAppCheckboxClicked: (String) -> Unit,
-        private val onAppCheckboxUnClicked: (String) -> Unit,
+        private val onAppChecked: (String) -> Unit,
+        private val onAppUnChecked: (String) -> Unit,
     ) : RecyclerView.ViewHolder(binding.root) {
-        fun onBind(packagePair: Pair<String, Boolean>) {
-            val packageName = packagePair.first
-            val isChecked = packagePair.second
+        fun onBind(appSelectionModel: AppSelectionModel) {
+            val packageName = appSelectionModel.packageName
             binding.run {
-                val context = binding.root.context
+                val context = root.context
                 tvAppname.text = context.getAppNameFromPackageName(packageName)
                 ivAppicon.setImageDrawable(context.getAppIconFromPackageName(packageName))
-                cbApp.isChecked = isChecked || checkBoxStatus[adapterPosition]
-                cbApp.isClickable = false
             }
-            initAppSelectionListener(packageName)
+            updateCheckedAppListner(appSelectionModel)
         }
 
-        private fun initAppSelectionListener(packageName: String) {
-            binding.root.setOnClickListener {
-                if (adapterPosition != RecyclerView.NO_POSITION) {
-                    if (binding.cbApp.isChecked) {
-                        binding.cbApp.isChecked = false
-                        onAppCheckboxUnClicked(packageName)
-                        checkBoxStatus.put(adapterPosition, false)
+        private fun updateCheckedAppListner(appSelectionModel: AppSelectionModel) {
+            binding.run {
+                cbApp.setOnCheckedChangeListener(null)
+                cbApp.isChecked = appSelectionModel.isChecked
+                root.setOnClickListener {
+                    cbApp.isChecked = !cbApp.isChecked
+                }
+
+                cbApp.setOnCheckedChangeListener { _, isChecked ->
+                    if (isChecked) {
+                        onAppChecked(appSelectionModel.packageName)
                     } else {
-                        binding.cbApp.isChecked = true
-                        onAppCheckboxClicked(packageName)
-                        checkBoxStatus.put(adapterPosition, true)
+                        onAppUnChecked(appSelectionModel.packageName)
                     }
                 }
             }