Merge remote-tracking branch 'origin/develop' into feature/#163-fix-c…

…ategory-item-click
TeamHous · Jul 23, 2022 · c9c61d3 · c9c61d3
2 parents c9814c8 + a722e71
commit c9c61d3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 14 deletions.
diff --git a/app/src/main/java/com/hous/hous_aos/ui/newrules/NewRuleActivity.kt b/app/src/main/java/com/hous/hous_aos/ui/newrules/NewRuleActivity.kt
@@ -15,6 +15,9 @@ class NewRuleActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityNewRuleBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        val categoryName = intent.getStringExtra("categoryName") ?: ""
+        val categoryId = intent.getStringExtra("categoryId") ?: ""
+        viewModel.setCategoryName(categoryId, categoryName)
         binding.cvNewRuleScreen.setContent {
             NewRulesScreen(
                 viewModel,
@@ -24,7 +27,7 @@ class NewRuleActivity : AppCompatActivity() {
         initStatusBarColor()
     }
 
-    private fun initStatusBarColor(){
+    private fun initStatusBarColor() {
         window.statusBarColor = getColor(R.color.hous_blue_bg)
     }
 }
diff --git a/app/src/main/java/com/hous/hous_aos/ui/newrules/NewRulesViewModel.kt b/app/src/main/java/com/hous/hous_aos/ui/newrules/NewRulesViewModel.kt
@@ -27,7 +27,8 @@ class NewRulesViewModel @Inject constructor(
         it.ruleName.isNotEmpty() &&
             it.categoryName.isNotEmpty() &&
             (uiState.value.checkBoxState == State.SELECT || isDayCheck())
-    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(3000L), false)
+    }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(3000L), false)
 
     init {
         viewModelScope.launch {
@@ -76,14 +77,12 @@ class NewRulesViewModel @Inject constructor(
         _uiState.value = _uiState.value.copy(ruleName = rule)
     }
 
-    fun setCategoryName(
-        categoryId: String,
-        category: String
-    ) {
+    fun setCategoryName(categoryId: String, category: String) {
         _uiState.value = _uiState.value.copy(
             categoryId = categoryId,
             categoryName = category
         )
+        Log.d("viewModel", "$categoryId $category")
     }
 
     fun setCheckBoxState(where: String, state: State) {
@@ -144,7 +143,7 @@ class NewRulesViewModel @Inject constructor(
             _uiState.value = _uiState.value.copy(ManagerList = tempManager)
         } else {
             _uiState.value = _uiState.value.copy(ManagerList = listOf(Manager()))
-            _uiState.value = _uiState.value.copy(checkBoxState = State.UNSELECT)
+            setCheckBoxState("deleteManager", State.UNSELECT)
         }
     }
 
@@ -215,18 +214,17 @@ class NewRulesViewModel @Inject constructor(
                 when (dayData.dayState) {
                     State.UNSELECT -> {
                         tempDay.add(DayData(d.day, State.SELECT))
-                        _uiState.value = _uiState.value.copy(checkBoxState = State.BLOCK)
+                        setCheckBoxState("changeDayState Unselect", State.BLOCK)
                     }
                     State.SELECT -> {
                         tempDay.add(DayData(d.day, State.UNSELECT))
                         if (uiState.value.ManagerList.size == 1) {
-                            var isCheck = false
+                            var isCheck = true
                             uiState.value.ManagerList[0].dayDataList.forEach { dayData ->
-                                if (dayData.dayState == State.SELECT) isCheck = true
+                                if (dayData.dayState == State.SELECT) isCheck = false
                             }
                             if (isCheck && uiState.value.ManagerList[0].managerHomie.userName == "담당자 없음")
-                                _uiState.value =
-                                    _uiState.value.copy(checkBoxState = State.UNSELECT)
+                                setCheckBoxState("changeDayState select", State.UNSELECT)
                         }
                     }
                 }

diff --git a/app/src/main/java/com/hous/hous_aos/ui/profile/ProfileFragment.kt b/app/src/main/java/com/hous/hous_aos/ui/profile/ProfileFragment.kt
@@ -20,6 +20,11 @@ class ProfileFragment : Fragment() {
     private val binding get() = _binding!!
     private val viewModel: ProfileViewModel by viewModels()
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.getProfileDate()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

diff --git a/app/src/main/java/com/hous/hous_aos/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/hous/hous_aos/ui/profile/ProfileViewModel.kt
@@ -7,8 +7,8 @@ import androidx.lifecycle.viewModelScope
 import com.hous.hous_aos.data.entity.Homie
 import com.hous.hous_aos.data.repository.ProfileRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class ProfileViewModel @Inject constructor(
@@ -18,6 +18,10 @@ class ProfileViewModel @Inject constructor(
     val profileData get() = _profileData
 
     init {
+        getProfileDate()
+    }
+
+    fun getProfileDate() {
         viewModelScope.launch {
             profileRepository.getUserProfile()
                 .onSuccess {

diff --git a/app/src/main/java/com/hous/hous_aos/ui/rules/RulesViewModel.kt b/app/src/main/java/com/hous/hous_aos/ui/rules/RulesViewModel.kt
@@ -13,7 +13,6 @@ import com.hous.hous_aos.data.model.response.TempManagerRequest
 import com.hous.hous_aos.data.repository.RulesTodayRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import java.util.stream.Collectors.toList
 import javax.inject.Inject
 
 @HiltViewModel
@@ -55,6 +54,12 @@ class RulesViewModel @Inject constructor(
     private var _ruleTableSize = MutableLiveData<Int>(0)
     val ruleTableSize get() = _ruleTableSize
 
+    private var _categoryName = MutableLiveData("")
+    val categoryName get() = _categoryName
+
+    private var _categoryId = MutableLiveData("")
+    val categoryId get() = _categoryId
+
     init {
         viewModelScope.launch {
             rulesTodayRepository.getTodayTodayInfoList("")
@@ -198,6 +203,8 @@ class RulesViewModel @Inject constructor(
      * 카테고리 아이콘 클릭시 Rule Table 받아오기*/
     fun fetchToRulesTableList(position: Int) {
         val categoryId = categoryOfRuleList.value!![position].id
+        _categoryName.value = categoryOfRuleList.value!![position].categoryName
+        _categoryId.value = categoryOfRuleList.value!![position].id
         Log.d("RulesViewModel", "categoryId: $categoryId")
         viewModelScope.launch {
             rulesTodayRepository.getRuleTableInfoList("", categoryId)

diff --git a/app/src/main/java/com/hous/hous_aos/ui/rules/rules_table/RulesTableFragment.kt b/app/src/main/java/com/hous/hous_aos/ui/rules/rules_table/RulesTableFragment.kt
@@ -42,6 +42,7 @@ class RulesTableFragment : Fragment() {
         observeRulesTable()
         clickPlusButton()
     }
+
     private fun initConcatAdapter() {
         conCatAdapter = ConcatAdapter(keyRulesAdapter, generalRulesAdapter)
         binding.rvRulesTable.adapter = conCatAdapter
@@ -60,6 +61,8 @@ class RulesTableFragment : Fragment() {
     private fun clickPlusButton() {
         binding.clPlusRules.setOnClickListener {
             val intent = Intent(activity, NewRuleActivity::class.java)
+            intent.putExtra("categoryName", viewModel.categoryName.value)
+            intent.putExtra("categoryId", viewModel.categoryId.value)
             startActivity(intent)
         }
     }