From ac903df34ad689e67b0340105eef2b22cbc5dc1b Mon Sep 17 00:00:00 2001 From: moondev03 Date: Thu, 15 Aug 2024 02:49:26 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20=EB=8B=89=EB=84=A4?= =?UTF-8?q?=EC=9E=84=20=EC=84=A4=EC=A0=95=20|=20=EC=A7=84=EC=9E=85?= =?UTF-8?q?=EC=A0=90=20=EB=B6=84=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt | 2 +- .../com/nabi/nabi/views/sign/SignInNicknameFragment.kt | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt index e756f7c..a1101b3 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/myPage/MyPageFragment.kt @@ -64,7 +64,7 @@ class MyPageFragment : BaseFragment(R.layout.fragment_myp } binding.btnChangeNickname.setOnClickListener { - (requireActivity() as MainActivity).replaceFragment(SignInNicknameFragment(), true) + (requireActivity() as MainActivity).replaceFragment(SignInNicknameFragment(false), true) } binding.btnLoadDiary.setOnClickListener { diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt index 981891c..6a817b8 100644 --- a/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt +++ b/Nabi/presentation/src/main/java/com/nabi/nabi/views/sign/SignInNicknameFragment.kt @@ -9,6 +9,7 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.fragment.app.viewModels import com.nabi.nabi.R +import com.nabi.nabi.base.BaseActivity import com.nabi.nabi.base.BaseFragment import com.nabi.nabi.base.NabiApplication.Companion.nickname import com.nabi.nabi.databinding.FragmentSignNicknameBinding @@ -25,7 +26,11 @@ class SignInNicknameFragment( private val viewModel: SignNicknameViewModel by viewModels() override fun initView() { - (requireActivity() as SignActivity).setStatusBarColor(R.color.white, false) + if(isSignUp) { + (requireActivity() as SignActivity).setStatusBarColor(R.color.white, false) + } else { + (requireActivity() as MainActivity).setStatusBarColor(R.color.white, false) + } binding.etNick.filters = arrayOf(InputFilter { source, _, _, _, _, _ -> val ps: Pattern = Pattern.compile("^[a-zA-Z0-9가-힣ㄱ-ㅎㅏ-ㅣ\\u318D\\u119E\\u11A2\\u2022\\u2025a\\u00B7\\uFE55]+$")