Merge pull request #41 from TeamOwori/feat/#14-닉네임-입력-화면-개발

Feat/#14 닉네임 입력 화면 개발

app/src/main/AndroidManifest.xml

@@ -18,7 +18,8 @@
             android:exported="true"
             android:screenOrientation="portrait"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Owori">
+            android:theme="@style/Theme.Owori"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt

@@ -26,11 +26,11 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(R.layou
         with(viewModel) {
             // TODO : PolicyFragment를 위해 작성한 부분이라 수정 필요.
             callKakaoLogin.observe(viewLifecycleOwner) {
-                navigateTo(R.id.action_loginFragment_to_PolicyFragment)
+                navigateTo(R.id.action_LoginFragment_to_nickNameFragment)
             }
 
             callGoogleLogin.observe(viewLifecycleOwner) {
-                navigateTo(R.id.action_loginFragment_to_PolicyFragment)
+                navigateTo(R.id.action_LoginFragment_to_nickNameFragment)
             }
         }
     }

app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionFragment.kt

@@ -0,0 +1,23 @@
+package com.owori.android.presenter.policy
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.databinding.FragmentAgreeServiceConditionBinding
+
+class AgreeServiceConditionFragment : BaseFragment<FragmentAgreeServiceConditionBinding, AgreeServiceConditionViewModel>(R.layout.fragment_agree_service_condition) {
+    override val viewModel: AgreeServiceConditionViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionViewModel.kt

@@ -0,0 +1,17 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class AgreeServiceConditionViewModel @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/presenter/policy/BirthDateFragment.kt

@@ -0,0 +1,30 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentBirthDateBinding
+
+
+class BirthDateFragment : BaseFragment<FragmentBirthDateBinding, BirthDateViewModel>(R.layout.fragment_birth_date) {
+    override val viewModel: BirthDateViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_birthDateFragment_to_familyConnectFragment)
+            }
+        }
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/BirthDateViewModel.kt

@@ -0,0 +1,17 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+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/presenter/policy/FamilyConnectFragment.kt

@@ -0,0 +1,33 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentFamilyConnectBinding
+
+
+class FamilyConnectFragment : BaseFragment<FragmentFamilyConnectBinding, FamilyConnectViewModel>(R.layout.fragment_family_connect) {
+    override val viewModel: FamilyConnectViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            returnLogin.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_familyConnectFragment_to_inputFamilyCodeFragment)
+            }
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_familyConnectFragment_to_groupFragment)
+            }
+        }
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/FamilyConnectViewModel.kt

@@ -0,0 +1,24 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+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/presenter/policy/GroupFragment.kt

@@ -0,0 +1,30 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentGroupBinding
+
+
+class GroupFragment : BaseFragment<FragmentGroupBinding, GroupViewModel>(R.layout.fragment_group) {
+    override val viewModel: GroupViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_groupFragment_to_shareCodeFragment)
+            }
+        }
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/GroupViewModel.kt

@@ -0,0 +1,17 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+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/presenter/policy/InputFamilyCodeFragment.kt

@@ -0,0 +1,30 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentInputFamilyCodeBinding
+
+
+class InputFamilyCodeFragment : BaseFragment<FragmentInputFamilyCodeBinding, InputFamilyCodeViewModel>(R.layout.fragment_input_family_code) {
+    override val viewModel: InputFamilyCodeViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_inputFamilyCodeFragment_to_agreeServiceConditionFragment)
+            }
+        }
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeViewModel.kt

@@ -0,0 +1,17 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class InputFamilyCodeViewModel @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/presenter/policy/NickNameFragment.kt

@@ -0,0 +1,51 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentNickNameBinding
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class NickNameFragment: BaseFragment<FragmentNickNameBinding, NickNameViewModel>(R.layout.fragment_nick_name) {
+    override val viewModel: NickNameViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            nickname.observe(viewLifecycleOwner) {
+                setViewPagerButton(it)
+            }
+
+            returnLogin.observe(viewLifecycleOwner) {
+                requireActivity().onBackPressedDispatcher.onBackPressed()
+            }
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_nickNameFragment_to_birthDateFragment)
+            }
+        }
+    }
+
+    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/presenter/policy/NickNameViewModel.kt

@@ -0,0 +1,27 @@
+package com.owori.android.presenter.policy
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.owori.android.core.BaseViewModel
+import com.owori.android.presenter.util.SingleLiveEvent
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class NickNameViewModel @Inject constructor(): BaseViewModel(){
+    val _nickname: MutableLiveData<String> = MutableLiveData("")
+    val nickname: LiveData<String> = _nickname
+
+    private val _returnLogin: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val returnLogin: LiveData<Unit> = _returnLogin
+    private val _btnNext: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val btnNext: LiveData<Unit> = _btnNext
+
+    fun onClickCheckButton() {
+        _btnNext.call()
+    }
+
+    fun onClickBackButton() {
+        _returnLogin.call()
+    }
+}

app/src/main/java/com/owori/android/presenter/policy/ShareCodeFragment.kt

@@ -0,0 +1,30 @@
+package com.owori.android.presenter.policy
+
+
+import androidx.fragment.app.viewModels
+import com.owori.android.R
+import com.owori.android.core.BaseFragment
+import com.owori.android.core.navigateTo
+import com.owori.android.databinding.FragmentShareCodeBinding
+
+
+class ShareCodeFragment : BaseFragment<FragmentShareCodeBinding, ShareCodeViewModel>(R.layout.fragment_share_code) {
+    override val viewModel: ShareCodeViewModel by viewModels()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+        with(viewModel) {
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_shareCodeFragment_to_agreeServiceConditionFragment)
+            }
+        }
+    }
+}