🐞 QA 반영 | 검색어 유지, 뷰 겹치는 문제 수정, 오류 신고 SoftKeyboard hide 기능 추가 (#38)

* 🫡 뷰 겹치는 문제 수정 & 검색어 Clear 제거 * 🫡 오류 신고 | Hide SoftKeyboard 기능 추가
Team-Never-Land · Sep 25, 2024 · b4ae534 · b4ae534
1 parent ba89e67
commit b4ae534
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 10 deletions.
diff --git a/.../presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt b/.../presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt
@@ -237,15 +237,14 @@ class CommonNoticeFragment(
                 binding.spinnerCampus.visibility = View.GONE
                 binding.groupNoticeSearchView.visibility = View.GONE
                 binding.btnBack.visibility = View.GONE
-                binding.etSearch.text.clear()
             }
             is UiState.Success -> {
                 commonNoticeAdapter.submitList(state.data)
                 binding.groupNoticeSearchView.visibility = View.VISIBLE
+                binding.tvEmptyView.visibility = View.GONE
                 binding.btnBack.visibility = View.VISIBLE
                 binding.llNoticePage.visibility = View.GONE
                 binding.tvSearchNoticeResult.text = "'${binding.etSearch.text}'이(가) 포함된 공지사항 (${state.data.size}개)"
-                binding.etSearch.text.clear()
             }
         }
     }

diff --git a/.../presentation/src/main/java/com/neverland/thinkerbell/view/setting/ErrorReportFragment.kt b/.../presentation/src/main/java/com/neverland/thinkerbell/view/setting/ErrorReportFragment.kt
@@ -2,8 +2,10 @@ package com.neverland.thinkerbell.view.setting
 
 import android.graphics.drawable.ColorDrawable
 import android.text.Editable
+import android.text.InputType
 import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import com.neverland.thinkerbell.R
@@ -23,18 +25,20 @@ class ErrorReportFragment : BaseFragment<FragmentErrorReportBinding>() {
             hideBottomNavigation()
             setStatusBarColor(R.color.primary1, true)
         }
+        binding.etReport.setRawInputType(InputType.TYPE_CLASS_TEXT)
     }
 
     override fun setObserver() {
         super.setObserver()
 
-        viewModel.uiState.observe(viewLifecycleOwner){
-            when(it){
+        viewModel.uiState.observe(viewLifecycleOwner) {
+            when (it) {
                 is UiState.Loading -> {}
                 is UiState.Empty -> {}
                 is UiState.Error -> {
                     showToast(it.exception.message ?: "Unknown error")
                 }
+
                 is UiState.Success -> {
                     showToast(it.data)
                     requireActivity().supportFragmentManager.popBackStack()
@@ -46,8 +50,22 @@ class ErrorReportFragment : BaseFragment<FragmentErrorReportBinding>() {
     override fun initListener() {
         super.initListener()
 
+        binding.root.setOnClickListener {
+            hideKeyboard()
+            binding.etReport.clearFocus()
+        }
         binding.btnBack.setOnClickListener { requireActivity().supportFragmentManager.popBackStack() }
 
+        binding.etReport.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                hideKeyboard()
+                binding.etReport.clearFocus()
+                true
+            } else {
+                false
+            }
+        }
+
         binding.etReport.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
@@ -56,14 +74,32 @@ class ErrorReportFragment : BaseFragment<FragmentErrorReportBinding>() {
                 if (len >= 10) {
                     binding.tvReportComment.visibility = View.GONE
 
-                    binding.btnSendReport.setTextColor(ContextCompat.getColor(requireContext(), R.color.primary2))
-                    binding.btnSendReport.background = ContextCompat.getDrawable(requireContext(), R.drawable.shape_keyword_add_button_bg)
+                    binding.btnSendReport.setTextColor(
+                        ContextCompat.getColor(
+                            requireContext(),
+                            R.color.primary2
+                        )
+                    )
+                    binding.btnSendReport.background = ContextCompat.getDrawable(
+                        requireContext(),
+                        R.drawable.shape_keyword_add_button_bg
+                    )
                     binding.btnSendReport.isClickable = true
                 } else {
                     binding.tvReportComment.visibility = View.VISIBLE
 
-                    binding.btnSendReport.setTextColor(ContextCompat.getColor(requireContext(), R.color.red_gray_100))
-                    binding.btnSendReport.background = ColorDrawable(ContextCompat.getColor(requireContext(), R.color.red_gray_300))
+                    binding.btnSendReport.setTextColor(
+                        ContextCompat.getColor(
+                            requireContext(),
+                            R.color.red_gray_100
+                        )
+                    )
+                    binding.btnSendReport.background = ColorDrawable(
+                        ContextCompat.getColor(
+                            requireContext(),
+                            R.color.red_gray_300
+                        )
+                    )
                     binding.btnSendReport.isClickable = false
                 }
             }

diff --git a/ThinkerBell/presentation/src/main/res/layout/fragment_error_report.xml b/ThinkerBell/presentation/src/main/res/layout/fragment_error_report.xml
@@ -67,14 +67,16 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle_report"
         android:layout_marginTop="12dp"
 
+        android:imeOptions="actionDone"
+        android:inputType="textMultiLine"
+        android:maxLength="200"
+
         android:padding="12dp"
         android:gravity="top|start"
         style="@style/Paragraph_Medium"
         android:textColor="@color/primary3"
         android:hint="어떤 오류가 발생했나요?"
         android:textColorHint="@color/red_gray_400"
-        android:inputType="textMultiLine"
-        android:maxLength="300"
 
         android:background="@drawable/shape_error_report_bg"/>