집안일 카드 상태 저장되도록 변경 (#180)

depromeet · Jul 10, 2023 · 2b81cfe · 2b81cfe
1 parent 4bff86f
commit 2b81cfe
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 25 deletions.
diff --git a/...rc/main/java/com/depromeet/housekeeper/ui/addHousework/selectSpace/SelectSpaceFragment.kt b/...rc/main/java/com/depromeet/housekeeper/ui/addHousework/selectSpace/SelectSpaceFragment.kt
@@ -1,5 +1,6 @@
 package com.depromeet.housekeeper.ui.addHousework.selectSpace
 
+import android.annotation.SuppressLint
 import android.app.DatePickerDialog
 import android.view.View
 import androidx.fragment.app.viewModels
@@ -11,7 +12,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.depromeet.housekeeper.R
 import com.depromeet.housekeeper.base.BaseFragment
 import com.depromeet.housekeeper.databinding.FragmentSelectSpaceBinding
-import com.depromeet.housekeeper.model.FeedbackHouseworkResponse
 import com.depromeet.housekeeper.model.SpaceChores
 import com.depromeet.housekeeper.model.enums.ViewType
 import com.depromeet.housekeeper.model.request.RepeatCycle
@@ -108,28 +108,34 @@ class SelectSpaceFragment :
         val gridLayoutManager = GridLayoutManager(context, 3)
         binding.selectSpaceRecyclerview.layoutManager = gridLayoutManager
         binding.selectSpaceRecyclerview.addItemDecoration(VerticalItemDecorator(12))
-        myAdapter = SelectSpaceChoreAdapter(emptyList<String>())
+        myAdapter = SelectSpaceChoreAdapter(emptyList(), emptyList())
         binding.selectSpaceRecyclerview.adapter = myAdapter
         viewModel.setChoreAdapter(myAdapter)
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     private fun bindingVm() {
-        viewModel.clearChore()
         lifecycleScope.launchWhenStarted {
             viewModel.choreList.collect {
-                myAdapter = SelectSpaceChoreAdapter(viewModel.choreList.value)
+                if(viewModel.selectedChorePos.value.isEmpty()){
+                    viewModel.setIsSelectedChore(false)
+                }else{
+                    viewModel.setIsSelectedChore(true)
+                }
+                myAdapter = SelectSpaceChoreAdapter(viewModel.choreList.value,viewModel.selectedChorePos.value)
                 myAdapter.notifyDataSetChanged()
                 binding.selectSpaceRecyclerview.adapter = myAdapter
 
                 myAdapter.setItemClickListener(object :
                     SelectSpaceChoreAdapter.OnItemClickListener {
                     override fun onClick(v: View, chore: String, position: Int) {
                         v.isSelected = !v.isSelected
-                        Timber.d("item click $position")
+                        viewModel.updateSelectedChorePos(position)
                         viewModel.updateChores(chore, v.isSelected)
-                        viewModel.setIsSelectedChore(true)
-                        if (viewModel.getChoreCount() == 0) {
+                        if(viewModel.selectedChorePos.value.isEmpty()){
                             viewModel.setIsSelectedChore(false)
+                        }else{
+                            viewModel.setIsSelectedChore(true)
                         }
                     }
                 })
@@ -222,10 +228,10 @@ class SelectSpaceFragment :
         dialog.showDialog()
         dialog.onItemClickListener = object : FairerDialog.OnItemClickListener {
             override fun onItemClick() {
-                setSelected()
-                onClick(space)
                 viewModel.setIsSelectedChore(false)
                 viewModel.clearChore()
+                setSelected()
+                onClick(space)
             }
         }
     }
@@ -298,4 +304,4 @@ class SelectSpaceFragment :
     }
 
 
-}
+}
diff --git a/...c/main/java/com/depromeet/housekeeper/ui/addHousework/selectSpace/SelectSpaceViewModel.kt b/...c/main/java/com/depromeet/housekeeper/ui/addHousework/selectSpace/SelectSpaceViewModel.kt
@@ -11,8 +11,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
@@ -23,7 +25,7 @@ class SelectSpaceViewModel @Inject constructor(
         getChoreList()
     }
     private val _choreAdapter : MutableStateFlow<SelectSpaceChoreAdapter?> = MutableStateFlow(null)
-    val choreAdapter : StateFlow<SelectSpaceChoreAdapter?>
+    val choreAdapter: StateFlow<SelectSpaceChoreAdapter?>
         get() = _choreAdapter
 
     private val _chorePreset: MutableStateFlow<List<ChoreList>> = MutableStateFlow(listOf())
@@ -34,6 +36,10 @@ class SelectSpaceViewModel @Inject constructor(
     val choreList: StateFlow<List<String>>
         get() = _choreList
 
+    private val _selectedChorePos: MutableStateFlow<List<Int>> = MutableStateFlow(listOf())
+    val selectedChorePos: StateFlow<List<Int>>
+        get() = _selectedChorePos
+
     private val _selectSpace: MutableStateFlow<String> = MutableStateFlow("")
     val selectSpace: StateFlow<String>
         get() = _selectSpace
@@ -67,6 +73,7 @@ class SelectSpaceViewModel @Inject constructor(
     }
 
     fun clearChore() {
+        _selectedChorePos.value = emptyList()
         _chores.value = emptyList()
     }
 
@@ -86,12 +93,18 @@ class SelectSpaceViewModel @Inject constructor(
         _isSelectedSpace.value = boolean
     }
 
-    fun setSpace(space: String) {
-        _selectSpace.value = space
+    fun updateSelectedChorePos(pos: Int) {
+        if (_selectedChorePos.value.contains(pos)) {
+            _selectedChorePos.value = _selectedChorePos.value.minus(pos)
+            Timber.d("${_selectedChorePos.value}")
+        } else {
+            _selectedChorePos.value = _selectedChorePos.value.plus(pos)
+            Timber.d("${_selectedChorePos.value}")
+        }
     }
 
-    fun getChoreCount(): Int {
-        return _chores.value.size
+    fun setSpace(space: String) {
+        _selectSpace.value = space
     }
 
     fun updateChores(chores: String, isSelect: Boolean) {
@@ -105,10 +118,6 @@ class SelectSpaceViewModel @Inject constructor(
         }
     }
 
-    fun updateSelectDate(date: String) {
-        _selectCalendar.value = DayOfWeek(date)
-    }
-
     fun updateCalendarView(year: Int, month: Int, dayOfMonth: Int) {
         calendar.set(Calendar.YEAR, year)
         calendar.set(Calendar.MONTH, month)
@@ -145,4 +154,4 @@ class SelectSpaceViewModel @Inject constructor(
         }
     }
 
-}
+}
diff --git a/.../com/depromeet/housekeeper/ui/addHousework/selectSpace/adapter/SelectSpaceChoreAdapter.kt b/.../com/depromeet/housekeeper/ui/addHousework/selectSpace/adapter/SelectSpaceChoreAdapter.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.depromeet.housekeeper.databinding.ItemSelectSpaceTaskBinding
 
-class SelectSpaceChoreAdapter(private val chores: List<String>) :
+class SelectSpaceChoreAdapter(private val chores: List<String>,private val selectedPos : List<Int>) :
     RecyclerView.Adapter<SelectSpaceChoreAdapter.ViewHolder>() {
 
     interface OnItemClickListener {
@@ -40,6 +40,9 @@ class SelectSpaceChoreAdapter(private val chores: List<String>) :
             binding.selectSpaceBtnTask.text = chore
             val pos = adapterPosition
             if (pos != RecyclerView.NO_POSITION) {
+                if(selectedPos.contains(pos)){
+                    itemView.isSelected = true
+                }
                 binding.selectSpaceBtnTask.setOnClickListener {
                     itemClickListener.onClick(itemView, chore, pos)
                 }
@@ -48,4 +51,4 @@ class SelectSpaceChoreAdapter(private val chores: List<String>) :
     }
 
 
-}
+}
diff --git a/app/src/main/java/com/depromeet/housekeeper/ui/settings/SettingFragment.kt b/app/src/main/java/com/depromeet/housekeeper/ui/settings/SettingFragment.kt
@@ -101,6 +101,4 @@ class SettingFragment : BaseFragment<FragmentSettingBinding>(R.layout.fragment_s
             }
         }
     }
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         }
     }