🛠️ 일기 작성 후 뒤로가기 수정 (#91)

* [fix] 홈화면 뒤로가기 토스트 변경, cleanup * [feat] 일기 작성 후 뒤로가기 로직 수정
MJU-SW-Contest-2024 · Aug 14, 2024 · fefb568 · fefb568
1 parent e938b23
commit fefb568
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 37 deletions.
diff --git a/Nabi/presentation/src/main/AndroidManifest.xml b/Nabi/presentation/src/main/AndroidManifest.xml
@@ -2,15 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <!-- Devices running Android 12L (API level 32) or lower  -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <!-- Devices running Android 13 (API level 33) or higher -->
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:ignore="SelectedPhotoAccess" />
+    <uses-permission
+        android:name="android.permission.READ_MEDIA_IMAGES"
+        tools:ignore="SelectedPhotoAccess" />
 
     <application
         android:name=".base.NabiApplication"
@@ -40,7 +44,7 @@
             android:theme="@style/Theme.Nabi.TransparentStatusBar"
             android:windowSoftInputMode="adjustResize" />
 
-        <activity android:name=".views.MainActivity"/>
+        <activity android:name=".views.MainActivity" />
 
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt
@@ -153,7 +153,7 @@ class AddDiarySelectDateFragment :
             tempDiary?.diaryTempContent,
             selectedDate.diaryEntryDate
         )
-        (requireActivity() as MainActivity).replaceFragment(fragment, true)
+        (requireActivity() as MainActivity).replaceFragment(fragment, false)
     }
 
     private fun updateCalendarMonth(monthDifference: Int) {

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt
@@ -11,6 +11,7 @@ import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.utils.UiState
 import com.nabi.nabi.views.MainActivity
 import com.nabi.nabi.views.diary.add.AddDiaryFragment
+import com.nabi.nabi.views.diary.view.SelectDiaryFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -27,7 +28,7 @@ class DetailDiaryFragment(
         super.initListener()
 
         binding.ibBack.setOnClickListener {
-            popBackStack(true)
+            popBackStack()
         }
 
         binding.btnEdit.setOnClickListener {
@@ -130,7 +131,7 @@ class DetailDiaryFragment(
 
                 is UiState.Success -> {
                     LoggerUtils.d(it.data.message)
-                    popBackStack(true)
+                    requireActivity().supportFragmentManager.popBackStack()
                 }
             }
         }
@@ -145,15 +146,15 @@ class DetailDiaryFragment(
         return "${year}년 ${month}월 ${day}일"
     }
 
-    private fun popBackStack(isUpdateFlag: Boolean = false) {
-        val fm = requireActivity().supportFragmentManager
-        if (isUpdateFlag) {
-            val result = Bundle().apply {
-                putBoolean("isUpdateFlag", true)
-                putString("date", binding.tvDiaryDate.text.toString())
-            }
-            fm.setFragmentResult("isUpdateFlag", result)
+    private fun popBackStack() {
+        val result = Bundle().apply {
+            putString("date", binding.tvDiaryDate.text.toString())
+        }
+
+        val fragment = SelectDiaryFragment().apply {
+            arguments = result
         }
-        fm.popBackStack()
+
+        (requireActivity() as MainActivity).replaceFragment(fragment, false)
     }
 }
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt
@@ -25,7 +25,8 @@ import java.util.Date
 import java.util.Locale
 
 @AndroidEntryPoint
-class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fragment_select_diary) {
+class SelectDiaryFragment :
+    BaseFragment<FragmentSelectDiaryBinding>(R.layout.fragment_select_diary) {
     private lateinit var calendarAdapter: SelectDiaryMonthCalendarStateAdapter
 
     private val minYear = 1950
@@ -34,13 +35,31 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
     private var lastVisibleDate: Calendar? = null
 
     override fun initView() {
-        calendarAdapter = SelectDiaryMonthCalendarStateAdapter(requireActivity())
-        binding.vpCalendarMonth.adapter = calendarAdapter
-        binding.vpCalendarMonth.setCurrentItem(Int.MAX_VALUE / 2, false)
-        binding.vpCalendarMonth.offscreenPageLimit = 1
+        if (arguments?.getString("date") != null) {
+
+            arguments?.let { bundle ->
+                val date = bundle.getString("date")
+                val dateParts = date!!.split("년", "월", "일")
+                val currentCalendar = Calendar.getInstance()
+                currentCalendar.set(dateParts[0].trim().toInt(), dateParts[1].trim().toInt() - 1, 1)
+
+                val position = calculatePositionFromDate(currentCalendar)
+                calendarAdapter =
+                    SelectDiaryMonthCalendarStateAdapter(requireActivity()) // Reinitialize adapter
+                binding.vpCalendarMonth.adapter = calendarAdapter
+                binding.vpCalendarMonth.setCurrentItem(position, false)
+                updateCurrentMonthText(position)
+            }
+        } else {
 
-        val currentMonth = SimpleDateFormat("MMMM yyyy", Locale.ENGLISH).format(Date())
-        binding.tvCurrentMonth.text = currentMonth
+            calendarAdapter = SelectDiaryMonthCalendarStateAdapter(requireActivity())
+            binding.vpCalendarMonth.adapter = calendarAdapter
+            binding.vpCalendarMonth.setCurrentItem(Int.MAX_VALUE / 2, false)
+            binding.vpCalendarMonth.offscreenPageLimit = 1
+
+            val currentMonth = SimpleDateFormat("MMMM yyyy", Locale.ENGLISH).format(Date())
+            binding.tvCurrentMonth.text = currentMonth
+        }
     }
 
     override fun onResume() {
@@ -50,7 +69,8 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
 
         lastVisibleDate?.let { date ->
             val position = calculatePositionFromDate(date)
-            calendarAdapter = SelectDiaryMonthCalendarStateAdapter(requireActivity()) // Reinitialize adapter
+            calendarAdapter =
+                SelectDiaryMonthCalendarStateAdapter(requireActivity()) // Reinitialize adapter
             binding.vpCalendarMonth.adapter = calendarAdapter
             binding.vpCalendarMonth.setCurrentItem(position, false)
             updateCurrentMonthText(position)
@@ -77,7 +97,8 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
     override fun initListener() {
         super.initListener()
 
-        binding.vpCalendarMonth.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+        binding.vpCalendarMonth.registerOnPageChangeCallback(object :
+            ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
                 updateCurrentMonthText(position)
@@ -107,10 +128,26 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
         }
 
         binding.ivEmotionAnger.setOnClickListener { createEmotionTooltip("화나").showAlignTop(binding.ivEmotionAnger) }
-        binding.ivEmotionHappiness.setOnClickListener { createEmotionTooltip("행복해").showAlignTop(binding.ivEmotionHappiness) }
-        binding.ivEmotionBoredom.setOnClickListener { createEmotionTooltip("지루해").showAlignTop(binding.ivEmotionBoredom) }
-        binding.ivEmotionSadness.setOnClickListener { createEmotionTooltip("슬퍼").showAlignTop(binding.ivEmotionSadness) }
-        binding.ivEmotionAnxiety.setOnClickListener { createEmotionTooltip("불안해").showAlignTop(binding.ivEmotionAnxiety) }
+        binding.ivEmotionHappiness.setOnClickListener {
+            createEmotionTooltip("행복해").showAlignTop(
+                binding.ivEmotionHappiness
+            )
+        }
+        binding.ivEmotionBoredom.setOnClickListener {
+            createEmotionTooltip("지루해").showAlignTop(
+                binding.ivEmotionBoredom
+            )
+        }
+        binding.ivEmotionSadness.setOnClickListener {
+            createEmotionTooltip("슬퍼").showAlignTop(
+                binding.ivEmotionSadness
+            )
+        }
+        binding.ivEmotionAnxiety.setOnClickListener {
+            createEmotionTooltip("불안해").showAlignTop(
+                binding.ivEmotionAnxiety
+            )
+        }
 
         binding.tvCurrentMonth.setOnClickListener {
             showNumberPickerDialog()
@@ -132,7 +169,12 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
             setText(text)
             setTextSize(12f)
             setTextColorResource(R.color.white)
-            setTextTypeface(ResourcesCompat.getFont(requireContext(), R.font.pretendard_semi_bold)!!)
+            setTextTypeface(
+                ResourcesCompat.getFont(
+                    requireContext(),
+                    R.font.pretendard_semi_bold
+                )!!
+            )
             setArrowPositionRules(ArrowPositionRules.ALIGN_BALLOON)
             setArrowSize(10)
             setArrowPosition(0.5f)
@@ -157,7 +199,8 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
         val year = currentCalendar.get(Calendar.YEAR)
         val month = currentCalendar.get(Calendar.MONTH)
 
-        val dialogBinding = DialogNonDayDatePickerBinding.inflate(LayoutInflater.from(requireContext()))
+        val dialogBinding =
+            DialogNonDayDatePickerBinding.inflate(LayoutInflater.from(requireContext()))
 
         dialogBinding.npYear.minValue = minYear
         dialogBinding.npYear.maxValue = maxYear
@@ -182,7 +225,8 @@ class SelectDiaryFragment : BaseFragment<FragmentSelectDiaryBinding>(R.layout.fr
                 binding.vpCalendarMonth.setCurrentItem(newPosition, false)
 
                 currentCalendar.set(selectedYear, selectedMonth, 1)
-                binding.tvCurrentMonth.text = SimpleDateFormat("MMMM yyyy", Locale.ENGLISH).format(currentCalendar.time)
+                binding.tvCurrentMonth.text =
+                    SimpleDateFormat("MMMM yyyy", Locale.ENGLISH).format(currentCalendar.time)
             }
             .setNegativeButton("취소") { _, _ -> }
             .create()

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryMonthFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryMonthFragment.kt
@@ -43,9 +43,8 @@ class SelectDiaryMonthFragment: BaseFragment<FragmentSelectDiaryMonthBinding>(R.
         dayAdapter = SelectDiaryDayCalendarAdapter().apply {
             setRvItemClickListener(object : OnRvItemClickListener<Int> {
                 override fun onClick(item: Int) {
-                    LoggerUtils.i("click: $item")
                     viewModel.isUpdateFlag = true
-                    (requireActivity() as MainActivity).replaceFragment(DetailDiaryFragment(item), true)
+                    (requireActivity() as MainActivity).replaceFragment(DetailDiaryFragment(item), false)
                 }
             })
         }

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeFragment.kt
@@ -175,8 +175,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
             override fun handleOnBackPressed() {
                 if (System.currentTimeMillis() - backPressedTime >= 2000) {
                     backPressedTime = System.currentTimeMillis()
-                    Toast.makeText(requireContext(), "한번 더 누르면 앱을 종료합니다.", Toast.LENGTH_SHORT)
-                        .show()
+                    showToast("한번 더 누르면 앱을 종료합니다")
                 } else if (System.currentTimeMillis() - backPressedTime < 2000) {
                     requireActivity().finish()
                 }