[fix] 3차 스프린트 QA 수정사항 반영

app/src/main/java/org/sopt/pingle/presentation/ui/main/home/HomeFragment.kt

@@ -19,23 +19,28 @@ import org.sopt.pingle.databinding.FragmentHomeBinding
 import org.sopt.pingle.presentation.model.SearchModel
 import org.sopt.pingle.presentation.type.CategoryType
 import org.sopt.pingle.presentation.type.HomeViewType
+import org.sopt.pingle.presentation.type.SnackbarType
 import org.sopt.pingle.presentation.ui.main.home.mainlist.MainListFragment
 import org.sopt.pingle.presentation.ui.main.home.map.MapFragment
 import org.sopt.pingle.presentation.ui.search.SearchActivity
 import org.sopt.pingle.presentation.ui.search.SearchActivity.Companion.SEARCH_WORD
 import org.sopt.pingle.util.AmplitudeUtils
+import org.sopt.pingle.util.activity.FINISH_INTERVAL_TIME
+import org.sopt.pingle.util.activity.INIT_BACK_PRESSED_TIME
 import org.sopt.pingle.util.base.BindingFragment
 import org.sopt.pingle.util.component.PingleChip
+import org.sopt.pingle.util.component.PingleSnackbar
+import org.sopt.pingle.util.fragment.stringOf
 import org.sopt.pingle.util.view.PingleFragmentStateAdapter
 import org.sopt.pingle.util.view.UiState
 
 @AndroidEntryPoint
 class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home) {
     private val homeViewModel: HomeViewModel by activityViewModels()
+    private var backPressedTime = INIT_BACK_PRESSED_TIME
     private lateinit var fragmentList: ArrayList<Fragment>
     private lateinit var fragmentStateAdapter: PingleFragmentStateAdapter
     private lateinit var resultLauncher: ActivityResultLauncher<Intent>
-    private lateinit var stopSearchCallback: OnBackPressedCallback
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -45,11 +50,12 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
         collectData()
         setFragmentStateAdapter()
         setResultLauncher()
-        setStopSearchCallback()
     }
 
     override fun onResume() {
         super.onResume()
+
+        setOnBackPressedCallback()
         initChip()
     }
 
@@ -74,8 +80,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
                 navigateToSearch()
             }
         }
-
-        initChip()
     }
 
     private fun addListeners() {
@@ -151,7 +155,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
                             if (isSearching) View.VISIBLE else View.INVISIBLE
                         tvHomeGroup.visibility = if (isSearching) View.INVISIBLE else View.VISIBLE
                         ivHomeSearch.visibility = if (isSearching) View.INVISIBLE else View.VISIBLE
-                        if (isSearching) setStopSearchCallback() else stopSearchCallback.remove()
                     }
                 }
             }.launchIn(viewLifecycleOwner.lifecycleScope)
@@ -197,18 +200,29 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
             }
     }
 
-    private fun setStopSearchCallback() {
-        stopSearchCallback =
-            object : OnBackPressedCallback(!homeViewModel.searchWord.value.isNullOrEmpty()) {
+    private fun setOnBackPressedCallback() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+            this.viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    homeViewModel.clearSearchWord()
-                    navigateToSearch()
+                    if (homeViewModel.searchWord.value.isNullOrEmpty()) {
+                        if (System.currentTimeMillis() - backPressedTime <= FINISH_INTERVAL_TIME) {
+                            requireActivity().finish()
+                        } else {
+                            backPressedTime = System.currentTimeMillis()
+                            PingleSnackbar.makeSnackbar(
+                                view = requireView(),
+                                message = stringOf(R.string.all_on_back_pressed_snackbar),
+                                bottomMarin = org.sopt.pingle.util.activity.SNACKBAR_BOTTOM_MARGIN,
+                                snackbarType = SnackbarType.GUIDE
+                            )
+                        }
+                    } else {
+                        homeViewModel.clearSearchWord()
+                        navigateToSearch()
+                    }
                 }
             }
-
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            stopSearchCallback
         )
     }
 

app/src/main/java/org/sopt/pingle/presentation/ui/main/ranking/RankingFragment.kt

@@ -42,7 +42,7 @@ class RankingFragment : BindingFragment<FragmentRankingBinding>(R.layout.fragmen
             addOnScrollListener(object : RecyclerView.OnScrollListener() {
                 override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                     super.onScrollStateChanged(recyclerView, newState)
-                    if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
                         AmplitudeUtils.trackEvent(SCROLL_RANKING)
                     }
                 }

app/src/main/java/org/sopt/pingle/presentation/ui/mygroup/MyGroupActivity.kt

@@ -98,10 +98,11 @@ class MyGroupActivity : BindingActivity<ActivityMyGroupBinding>(R.layout.activit
     private fun showChangeGroupModal(clickedEntity: MyGroupEntity) {
         AmplitudeUtils.trackEvent(CLICK_OTHERGROUP)
         binding.layoutMyGroupSelectedMenu.visibility = View.INVISIBLE
+
         MyGroupModalDialogFragment(
             title = getString(
                 R.string.my_group_modal_move_question,
-                clickedEntity.name
+                makeEllipsisGroupName(clickedEntity.name)
             ),
             buttonText = stringOf(R.string.my_group_modal_change),
             textButtonText = stringOf(R.string.my_group_modal_back),
@@ -142,15 +143,27 @@ class MyGroupActivity : BindingActivity<ActivityMyGroupBinding>(R.layout.activit
         }
     }
 
+    private fun makeEllipsisGroupName(groupName: String): String {
+        return if (groupName.length > GROUP_NAME_MAX_LENGTH) {
+            "${groupName.substring(SUBSTRING_START_INDEX, SUBSTRING_END_INDEX) + ELLIPSIS}"
+        } else {
+            groupName
+        }
+    }
+
     companion object {
         private const val CHANGE_MODAL = "ChangeGroupModal"
         private const val SNACKBAR_BOTTOM_MARGIN = 57
-
-        const val CLICK_INVITECODE = "click_invitecode"
-        const val CLICK_INVITECODE_COPY = "click_invitecode_copy"
-        const val CLICK_INVITECODE_SHARE = "click_invitecode_share"
-        const val CLICK_OTHERGROUP = "click_othergroup"
-        const val CLICK_OTHERGROUP_CHANGE = "click_othergroup_change"
-        const val CLICK_NEWGROUP = "click_newgroup"
+        private const val SUBSTRING_START_INDEX = 0
+        private const val SUBSTRING_END_INDEX = 12
+        private const val GROUP_NAME_MAX_LENGTH = 13
+        private const val ELLIPSIS = "..."
+
+        private const val CLICK_INVITECODE = "click_invitecode"
+        private const val CLICK_INVITECODE_COPY = "click_invitecode_copy"
+        private const val CLICK_INVITECODE_SHARE = "click_invitecode_share"
+        private const val CLICK_OTHERGROUP = "click_othergroup"
+        private const val CLICK_OTHERGROUP_CHANGE = "click_othergroup_change"
+        private const val CLICK_NEWGROUP = "click_newgroup"
     }
 }

app/src/main/java/org/sopt/pingle/util/component/PingleSearch.kt

@@ -44,6 +44,10 @@ class PingleSearch @JvmOverloads constructor(
                     if (text.isNullOrEmpty()) View.GONE else View.VISIBLE
             }
 
+            etSearchPingleEditText.setOnEditorActionListener { textView, _, _ ->
+                textView.text.isEmpty()
+            }
+
             ivSearchPingleClear.setOnClickListener {
                 _binding.etSearchPingleEditText.text.clear()
             }

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

@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                app:layout_constraintGuide_end="@dimen/dialog_all_modal_horizontal_margin" />
+                app:layout_constraintGuide_end="@dimen/dialog_my_group_modal_horizontal_margin" />
 
             <TextView
                 android:id="@+id/tv_my_group_modal_title"

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

@@ -19,7 +19,7 @@
             android:layout_marginTop="16dp"
             android:gravity="center"
             android:minWidth="22dp"
-            android:textAppearance="@style/TextAppearance.Pingle.Cap.Bold.12"
+            android:textAppearance="@style/TextAppearance.Pingle.Sub.Bold.16"
             android:textColor="@color/white"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"

app/src/main/res/values/dimens.xml

@@ -51,7 +51,7 @@
     <dimen name="dialog_horizontal_margin">24dp</dimen>
     <dimen name="dialog_all_modal_horizontal_margin">34dp</dimen>
     <dimen name="dialog_map_modal_horizontal_margin">24dp</dimen>
-    <dimen name="dialog_my_group_modal_horizontal_margin">34dp</dimen>
+    <dimen name="dialog_my_group_modal_horizontal_margin">26dp</dimen>
 
     <!-- card -->
     <dimen name="card_horizontal_margin">24dp</dimen>