fix: 잘못된 UI 수정 및 색상 추가, NickNameViewModel과 관련 없는 코드 수정

app/src/main/java/com/owori/android/auth/ui/TextViewExt.kt

@@ -26,3 +26,10 @@ fun TextView.setSubTitleText(currentItemIndex: Int) {
     )
 }
 
+@BindingAdapter("setTextLength")
+fun TextView.setTextLength(text: String) {
+    setText(
+        text.length.toString()
+    )
+}
+

app/src/main/java/com/owori/android/auth/ui/view/AgreeServiceConditionFragment.kt

@@ -2,12 +2,12 @@ package com.owori.android.auth.ui.view
 
 import androidx.fragment.app.viewModels
 import com.owori.android.R
-import com.owori.android.auth.ui.viewmodel.NickNameViewModel
+import com.owori.android.auth.ui.viewmodel.AgreeServiceViewModel
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.databinding.FragmentAgreeServiceConditionBinding
 
-class AgreeServiceConditionFragment : BaseFragment<FragmentAgreeServiceConditionBinding, NickNameViewModel>(R.layout.fragment_agree_service_condition) {
-    override val viewModel: NickNameViewModel by viewModels()
+class AgreeServiceConditionFragment : BaseFragment<FragmentAgreeServiceConditionBinding, AgreeServiceViewModel>(R.layout.fragment_agree_service_condition) {
+    override val viewModel: AgreeServiceViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

app/src/main/java/com/owori/android/auth/ui/view/BirthDateFragment.kt

@@ -1,17 +1,16 @@
 package com.owori.android.auth.ui.view
 
 
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import com.owori.android.R
-import com.owori.android.auth.ui.viewmodel.NickNameViewModel
+import com.owori.android.auth.ui.viewmodel.BirthDateViewModel
 import com.owori.android.common.navigateTo
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.databinding.FragmentBirthDateBinding
 
 
-class BirthDateFragment : BaseFragment<FragmentBirthDateBinding, NickNameViewModel>(R.layout.fragment_birth_date) {
-    override val viewModel: NickNameViewModel by viewModels()
+class BirthDateFragment : BaseFragment<FragmentBirthDateBinding, BirthDateViewModel>(R.layout.fragment_birth_date) {
+    override val viewModel: BirthDateViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

app/src/main/java/com/owori/android/auth/ui/view/FamilyConnectFragment.kt

@@ -3,14 +3,14 @@ package com.owori.android.auth.ui.view
 
 import androidx.fragment.app.viewModels
 import com.owori.android.R
-import com.owori.android.auth.ui.viewmodel.NickNameViewModel
+import com.owori.android.auth.ui.viewmodel.FamilyConnectViewModel
 import com.owori.android.common.navigateTo
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.databinding.FragmentFamilyConnectBinding
 
 
-class FamilyConnectFragment : BaseFragment<FragmentFamilyConnectBinding, NickNameViewModel>(R.layout.fragment_family_connect) {
-    override val viewModel: NickNameViewModel by viewModels()
+class FamilyConnectFragment : BaseFragment<FragmentFamilyConnectBinding, FamilyConnectViewModel>(R.layout.fragment_family_connect) {
+    override val viewModel: FamilyConnectViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

app/src/main/java/com/owori/android/auth/ui/view/GroupFragment.kt

@@ -3,14 +3,14 @@ package com.owori.android.auth.ui.view
 
 import androidx.fragment.app.viewModels
 import com.owori.android.R
-import com.owori.android.auth.ui.viewmodel.NickNameViewModel
+import com.owori.android.auth.ui.viewmodel.GroupViewModel
 import com.owori.android.common.navigateTo
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.databinding.FragmentGroupBinding
 
 
-class GroupFragment : BaseFragment<FragmentGroupBinding, NickNameViewModel>(R.layout.fragment_group) {
-    override val viewModel: NickNameViewModel by viewModels()
+class GroupFragment : BaseFragment<FragmentGroupBinding, GroupViewModel>(R.layout.fragment_group) {
+    override val viewModel: GroupViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

app/src/main/java/com/owori/android/auth/ui/view/InputFamilyCodeFragment.kt

@@ -3,14 +3,14 @@ package com.owori.android.auth.ui.view
 
 import androidx.fragment.app.viewModels
 import com.owori.android.R
-import com.owori.android.auth.ui.viewmodel.NickNameViewModel
+import com.owori.android.auth.ui.viewmodel.InputFamilyCodeViewModel
 import com.owori.android.common.navigateTo
 import com.owori.android.common.ui.view.BaseFragment
 import com.owori.android.databinding.FragmentInputFamilyCodeBinding
 
 
-class InputFamilyCodeFragment : BaseFragment<FragmentInputFamilyCodeBinding, NickNameViewModel>(R.layout.fragment_input_family_code) {
-    override val viewModel: NickNameViewModel by viewModels()
+class InputFamilyCodeFragment : BaseFragment<FragmentInputFamilyCodeBinding, InputFamilyCodeViewModel>(R.layout.fragment_input_family_code) {
+    override val viewModel: InputFamilyCodeViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel

app/src/main/java/com/owori/android/auth/ui/view/NickNameFragment.kt

@@ -26,13 +26,7 @@ class NickNameFragment: BaseFragment<FragmentNickNameBinding, NickNameViewModel>
     override fun initObserver() {
         with(viewModel) {
             nickname.observe(viewLifecycleOwner) {
-                binding.viewpagerButton.isEnabled = it.isNotEmpty()
-                binding.nicknameLength.text = it.length.toString()
-                if(it.isNotEmpty()) {
-                    binding.viewpagerButton.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
-                } else {
-                    binding.viewpagerButton.setTextColor(ContextCompat.getColor(requireContext(), R.color.grey_909090))
-                }
+                setViewPagerButton(it)
             }
 
             returnLogin.observe(viewLifecycleOwner) {
@@ -43,4 +37,16 @@ class NickNameFragment: BaseFragment<FragmentNickNameBinding, NickNameViewModel>
             }
         }
     }
+
+    fun setViewPagerButton(nickname: String) {
+        val isInputted = nickname.isNotEmpty()
+        with(binding.viewpagerButton) {
+            isEnabled = isInputted
+            if(isInputted) {
+                setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+            } else {
+                setTextColor(ContextCompat.getColor(requireContext(), R.color.grey_909090))
+            }
+        }
+    }
 }

app/src/main/java/com/owori/android/auth/ui/viewmodel/AgreeServiceViewModel.kt

@@ -0,0 +1,14 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+
+class AgreeServiceViewModel : BaseViewModel() {
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+}

app/src/main/java/com/owori/android/auth/ui/viewmodel/BirthDateViewModel.kt

@@ -0,0 +1,15 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+import javax.inject.Inject
+
+class BirthDateViewModel @Inject constructor() : BaseViewModel() {
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+}

app/src/main/java/com/owori/android/auth/ui/viewmodel/FamilyConnectViewModel.kt

@@ -0,0 +1,22 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+import javax.inject.Inject
+
+class FamilyConnectViewModel @Inject constructor() : BaseViewModel() {
+
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+    private val _returnLogin: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val returnLogin: LiveData<Unit> = _returnLogin
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+
+    fun onClickBackButton() {
+        _returnLogin.call()
+    }
+}

app/src/main/java/com/owori/android/auth/ui/viewmodel/GroupViewModel.kt

@@ -0,0 +1,15 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+import javax.inject.Inject
+
+class GroupViewModel @Inject constructor() : BaseViewModel() {
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+}

app/src/main/java/com/owori/android/auth/ui/viewmodel/InputFamilyCodeViewModel.kt

@@ -0,0 +1,16 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+import javax.inject.Inject
+
+class InputFamilyCodeViewModel @Inject constructor() : BaseViewModel() {
+
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+}

app/src/main/res/layout/fragment_agree_service_condition.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.owori.android.auth.ui.viewmodel.NickNameViewModel" />
+            type="com.owori.android.auth.ui.viewmodel.AgreeServiceViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_birth_date.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.owori.android.auth.ui.viewmodel.NickNameViewModel" />
+            type="com.owori.android.auth.ui.viewmodel.BirthDateViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_family_connect.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.owori.android.auth.ui.viewmodel.NickNameViewModel" />
+            type="com.owori.android.auth.ui.viewmodel.FamilyConnectViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_group.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.owori.android.auth.ui.viewmodel.NickNameViewModel" />
+            type="com.owori.android.auth.ui.viewmodel.GroupViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/fragment_input_family_code.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.owori.android.auth.ui.viewmodel.NickNameViewModel" />
+            type="com.owori.android.auth.ui.viewmodel.InputFamilyCodeViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout