feat: 사용자의 닉네임 입력을 위한 화면 구성 #14

TeamOwori · posite · Oct 7, 2023 · Oct 22, 2023 · Oct 23, 2023 · Oct 23, 2023
commit ac5dbc60fe1484198d376757c39f4cf66d4218f7
diff --git a/app/src/main/AndroidManifest.xml b/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" />
 

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/AgreeServiceConditionFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/AgreeServiceConditionFragment.kt
@@ -0,0 +1,24 @@
+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.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()
+    override fun setBindingVariables() {
+        with(binding) {
+            vm = viewModel
+        }
+    }
+
+    override fun initView() {
+
+    }
+
+    override fun initObserver() {
+
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/BirthDateFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/BirthDateFragment.kt
@@ -0,0 +1,32 @@
+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.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()
+    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)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/FamilyConnectFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/FamilyConnectFragment.kt
@@ -0,0 +1,34 @@
+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.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()
+    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)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/GroupFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/GroupFragment.kt
@@ -0,0 +1,31 @@
+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.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()
+    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)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/InputFamilyCodeFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/InputFamilyCodeFragment.kt
@@ -0,0 +1,31 @@
+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.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()
+    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)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/LoginFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/LoginFragment.kt
@@ -27,11 +27,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)
             }
         }
     }

diff --git a/app/src/main/java/com/owori/android/auth/ui/view/NickNameFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/NickNameFragment.kt
@@ -0,0 +1,46 @@
+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.common.navigateTo
+import com.owori.android.common.ui.view.BaseFragment
+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) {
+                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))
+                }
+            }
+
+            returnLogin.observe(viewLifecycleOwner) {
+                requireActivity().onBackPressedDispatcher.onBackPressed()
+            }
+            btnNext.observe(viewLifecycleOwner) {
+                navigateTo(R.id.action_nickNameFragment_to_birthDateFragment)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/view/ShareCodeFragment.kt b/app/src/main/java/com/owori/android/auth/ui/view/ShareCodeFragment.kt
@@ -0,0 +1,31 @@
+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.common.navigateTo
+import com.owori.android.common.ui.view.BaseFragment
+import com.owori.android.databinding.FragmentShareCodeBinding
+
+
+class ShareCodeFragment : BaseFragment<FragmentShareCodeBinding, NickNameViewModel>(R.layout.fragment_share_code) {
+    override val viewModel: NickNameViewModel 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)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/owori/android/auth/ui/viewmodel/NickNameViewModel.kt b/app/src/main/java/com/owori/android/auth/ui/viewmodel/NickNameViewModel.kt
@@ -0,0 +1,28 @@
+package com.owori.android.auth.ui.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.owori.android.common.SingleLiveEvent
+import com.owori.android.common.ui.viewmodel.BaseViewModel
+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()
+    }
+}
diff --git a/app/src/main/res/drawable/arrow_back.xml b/app/src/main/res/drawable/arrow_back.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/check_btn_ripple.xml b/app/src/main/res/drawable/check_btn_ripple.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/white">
+    <item android:drawable="@drawable/check_btn_selector"/>
+</ripple>
diff --git a/app/src/main/res/drawable/check_btn_selector.xml b/app/src/main/res/drawable/check_btn_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_enabled="true"
+        android:drawable="@color/owori_red"/>
+    <item
+        android:state_enabled="false"
+        android:drawable="@color/grey_e9e9e9"/>
+</selector>
diff --git a/app/src/main/res/drawable/check_text_selector.xml b/app/src/main/res/drawable/check_text_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_enabled="true"
+        android:drawable="@color/white"/>
+    <item
+        android:state_enabled="false"
+        android:drawable="@color/grey_909090"/>
+</selector>
diff --git a/app/src/main/res/drawable/focused_agree.xml b/app/src/main/res/drawable/focused_agree.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#FA7B53"/>
+  <path
+      android:pathData="M10.994,15.117C9.389,15.117 8.182,14.133 8.123,12.785H9.377C9.447,13.512 10.139,14.039 10.994,14.039C12.025,14.039 12.764,13.289 12.764,12.281C12.764,11.25 12.002,10.5 10.936,10.488C10.256,10.488 9.74,10.711 9.447,11.238H8.229L8.779,6.516H13.584V7.617H9.846L9.564,9.996H9.646C9.998,9.656 10.596,9.422 11.24,9.422C12.834,9.422 14.018,10.606 14.018,12.246C14.018,13.922 12.764,15.117 10.994,15.117Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/focused_birthdate.xml b/app/src/main/res/drawable/focused_birthdate.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#FA7B53"/>
+  <path
+      android:pathData="M8.182,15V14.063L11.123,11.098C12.049,10.125 12.518,9.586 12.518,8.848C12.518,8.016 11.838,7.477 10.947,7.477C10.01,7.477 9.4,8.074 9.4,8.977H8.182C8.17,7.43 9.354,6.398 10.971,6.398C12.611,6.398 13.736,7.43 13.748,8.813C13.736,9.762 13.291,10.512 11.697,12.082L9.975,13.828V13.898H13.889V15H8.182Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/focused_connect.xml b/app/src/main/res/drawable/focused_connect.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23dp"
+    android:height="22dp"
+    android:viewportWidth="23"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11.5,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#FA7B53"/>
+  <path
+      android:pathData="M11.518,15.117C9.76,15.117 8.506,14.168 8.459,12.785H9.771C9.818,13.535 10.557,14.004 11.506,14.004C12.525,14.004 13.275,13.441 13.275,12.621C13.275,11.789 12.572,11.18 11.365,11.18H10.639V10.125H11.365C12.326,10.125 13.006,9.586 13.006,8.777C13.006,8.004 12.432,7.477 11.529,7.477C10.674,7.477 9.924,7.945 9.889,8.719H8.646C8.682,7.336 9.959,6.398 11.541,6.398C13.205,6.398 14.26,7.453 14.248,8.707C14.26,9.668 13.662,10.371 12.748,10.594V10.652C13.908,10.816 14.576,11.59 14.576,12.668C14.576,14.086 13.275,15.117 11.518,15.117Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/focused_group.xml b/app/src/main/res/drawable/focused_group.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#FA7B53"/>
+  <path
+      android:pathData="M7.754,13.348V12.305L11.504,6.516H13.098V12.258H14.258V13.348H13.098V15H11.879V13.348H7.754ZM9.113,12.258H11.879V8.051H11.785L9.113,12.188V12.258Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/focused_nickname.xml b/app/src/main/res/drawable/focused_nickname.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#FA7B53"/>
+  <path
+      android:pathData="M12.283,6.516V15H10.982V7.805H10.936L8.908,9.129V7.898L11.018,6.516H12.283Z"
+      android:fillColor="#ffffff"/>
+</vector>