🛠️ 뒤로가기 수정 (#104)

* [fix] 뒤로가기 수정 * [fix] 날짜선택 -> home 화면 뒤로가기 수정 * [fix] 일기 보기 - 날짜선택 페이지 주말 색 변경
MJU-SW-Contest-2024 · Aug 15, 2024 · 66b2eb5 · 66b2eb5
1 parent 5415932
commit 66b2eb5
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 107 deletions.
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiaryFragment.kt
@@ -117,6 +117,8 @@ class AddDiaryFragment(
                 }
             } else {
                 requireActivity().supportFragmentManager.popBackStack()
+//                if (isEdit){ requireActivity().supportFragmentManager.popBackStack() }
+//                else {(requireActivity() as MainActivity).replaceFragment(AddDiarySelectDateFragment(), false) }
             }
         }
 
@@ -185,9 +187,13 @@ class AddDiaryFragment(
                 is UiState.Success -> {
                     currentDiaryId = it.data.diaryId
                     LoggerUtils.d("일기 수정 성공")
-                    (requireActivity() as MainActivity).replaceFragment(
-                        EmotionLoadingDialog(isEdit, currentDiaryId!!),
-                        false
+//                    (requireActivity() as MainActivity).replaceFragment(
+//                        EmotionLoadingDialog(isEdit, currentDiaryId!!),
+//                        false
+//                    )
+
+                    EmotionLoadingDialog(isEdit, currentDiaryId!!).show(
+                        requireActivity().supportFragmentManager, "emotion loading"
                     )
                 }
             }

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/EmotionLoadingDialog.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/EmotionLoadingDialog.kt
@@ -76,8 +76,8 @@ class EmotionLoadingDialog(private val isEdit: Boolean, private val diaryId: Int
                             DetailDiaryFragment(diaryId, "EmotionLoadingDialog"),
                             false
                         )
-                        dismiss()
                     }
+                    dismiss()
                 }
             }
         }

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
@@ -161,6 +161,7 @@ class DetailDiaryFragment(
 
     private fun popBackStack() {
         val bundle = Bundle()
+        LoggerUtils.d(entryPoint.toString())
 
         when (entryPoint) {
             "SelectDiaryMonthFragment" -> {
@@ -171,7 +172,10 @@ class DetailDiaryFragment(
                 (requireActivity() as MainActivity).replaceFragment(SelectDiaryFragment().apply { arguments = bundle }, false)
             }
             "EmotionLoadingDialog" -> {
-                (requireActivity() as MainActivity).replaceFragment(SelectDiaryFragment(), false)
+                bundle.apply {
+                    putString("date", binding.tvDiaryDate.text.toString())
+                }
+                (requireActivity() as MainActivity).replaceFragment(SelectDiaryFragment().apply { arguments = bundle }, false)
             }
             "SearchDiaryFragment" -> {
                 (requireActivity() as MainActivity).replaceFragment(SearchDiaryFragment(), 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
@@ -3,15 +3,19 @@ package com.nabi.nabi.views.diary.view
 import android.app.AlertDialog
 import android.view.LayoutInflater
 import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.activityViewModels
 import androidx.viewpager2.widget.ViewPager2
 import com.nabi.nabi.R
 import com.nabi.nabi.base.BaseFragment
 import com.nabi.nabi.databinding.DialogNonDayDatePickerBinding
 import com.nabi.nabi.databinding.FragmentSelectDiaryBinding
 import com.nabi.nabi.extension.dialogResize
+import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.views.MainActivity
+import com.nabi.nabi.views.diary.add.SharedDateViewModel
 import com.nabi.nabi.views.diary.search.SearchDiaryFragment
 import com.nabi.nabi.views.diary.statistics.DiaryStatisticsFragment
+import com.nabi.nabi.views.home.HomeFragment
 import com.skydoves.balloon.ArrowPositionRules
 import com.skydoves.balloon.Balloon
 import com.skydoves.balloon.BalloonAnimation
@@ -27,6 +31,8 @@ import java.util.Locale
 @AndroidEntryPoint
 class SelectDiaryFragment :
     BaseFragment<FragmentSelectDiaryBinding>(R.layout.fragment_select_diary) {
+    private val sharedViewModel: SharedDateViewModel by activityViewModels()
+
     private lateinit var calendarAdapter: SelectDiaryMonthCalendarStateAdapter
 
     private val minYear = 1950
@@ -114,7 +120,9 @@ class SelectDiaryFragment :
         }
 
         binding.ibBack.setOnClickListener {
-            requireActivity().supportFragmentManager.popBackStack()
+            sharedViewModel.clearData()
+//            requireActivity().supportFragmentManager.popBackStack()
+            (requireActivity() as MainActivity).replaceFragment(HomeFragment(),false)
         }
 
         binding.ibPreviousMonth.setOnClickListener {

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
@@ -44,7 +44,7 @@ class SelectDiaryMonthFragment: BaseFragment<FragmentSelectDiaryMonthBinding>(R.
             setRvItemClickListener(object : OnRvItemClickListener<Int> {
                 override fun onClick(item: Int) {
                     viewModel.isUpdateFlag = true
-                    (requireActivity() as MainActivity).replaceFragment(DetailDiaryFragment(item, "SelectDiaryMonthFragment"), true)
+                    (requireActivity() as MainActivity).replaceFragment(DetailDiaryFragment(item, "SelectDiaryMonthFragment"), false)
                 }
             })
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                                 DetailDiaryFragment(diaryId, "EmotionLoadingDialog"),
                                 false
                             )
-                            dismiss()
                         }
+                        dismiss()
                     }
                 }
             }
@@ Expand Down @@