🐛 Fix: 일정 다이얼로그 상단 휴지통 버튼 노출여부 설정

- 카테고리 설정 화면에서는 휴지통 버튼 숨기기 - 일정 화면에서는 생성/편집 모드에 따라 노출 여부 결정하기 Related to: #346
Namo-log · Feb 9, 2025 · e6298b8 · e6298b8
1 parent a6a6611
commit e6298b8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/...rc/main/java/com/mongmong/namo/presentation/ui/home/schedule/PersonalScheduleViewModel.kt b/...rc/main/java/com/mongmong/namo/presentation/ui/home/schedule/PersonalScheduleViewModel.kt
@@ -63,6 +63,10 @@ class PersonalScheduleViewModel @Inject constructor(
     private val _isDailyScheduleEmptyPair = MutableLiveData<Pair<Boolean, Boolean>>()
     var isDailyScheduleEmptyPair: LiveData<Pair<Boolean, Boolean>> = _isDailyScheduleEmptyPair
 
+    // 다이얼로그 상단 휴지통 버튼 노출 여부
+    private val _isShowTopDeleteBtn = MutableLiveData<Boolean>()
+    var isShowTopDeleteBtn: LiveData<Boolean> = _isShowTopDeleteBtn
+
     init {
         getCategories() // 최초 카테고리 목록 조회
     }
@@ -301,6 +305,10 @@ class PersonalScheduleViewModel @Inject constructor(
         return null
     }
 
+    fun setDeleteBtnVisibility(isVisible: Boolean) {
+        _isShowTopDeleteBtn.value = isVisible
+    }
+
     fun isInvalidDate(): Boolean {
         // 시작일 > 종료일
         return schedule.value!!.period.startDate > schedule.value!!.period.endDate

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleActivity.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleActivity.kt
@@ -30,15 +30,13 @@ import org.joda.time.LocalDateTime
 @AndroidEntryPoint
 class ScheduleActivity : BaseActivity<ActivityScheduleBinding>(R.layout.activity_schedule), ConfirmDialogInterface {
 
-    private val navController: NavController by lazy {
-        val navHostFragment = supportFragmentManager.findFragmentById(R.id.schedule_nav_host) as NavHostFragment
-        navHostFragment.navController
-    }
     private val viewModel : PersonalScheduleViewModel by viewModels()
 
     override fun setup() {
         var schedule : Schedule? = null
 
+        binding.viewModel = this@ScheduleActivity.viewModel
+
         // intent가 넘어왔는지 확인
         intent.getStringExtra("schedule")?.let { scheduleJson ->
             // GsonBuilder에 커스텀 TypeAdapter 등록
@@ -52,10 +50,8 @@ class ScheduleActivity : BaseActivity<ActivityScheduleBinding>(R.layout.activity
         val nowDay = intent.getLongExtra("nowDay", 0)
 
         if (schedule != null) { // 생성 모드
-            binding.scheduleDeleteBtn.visibility = View.VISIBLE
             viewModel.setSchedule(schedule)
         } else { // 편집 모드
-            binding.scheduleDeleteBtn.visibility = View.GONE
             viewModel.setSchedule(
                 Schedule(
                     period = SchedulePeriod(

diff --git a/.../main/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleDialogBasicFragment.kt b/.../main/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleDialogBasicFragment.kt
@@ -68,6 +68,7 @@ class ScheduleDialogBasicFragment : BaseFragment<FragmentScheduleDialogBasicBind
     override fun onResume() {
         super.onResume()
         mapView.resume()
+        viewModel.setDeleteBtnVisibility(!viewModel.isCreateMode())
     }
 
     override fun onPause() {

diff --git a/...in/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleDialogCategoryFragment.kt b/...in/java/com/mongmong/namo/presentation/ui/home/schedule/ScheduleDialogCategoryFragment.kt
@@ -21,6 +21,7 @@ class ScheduleDialogCategoryFragment
     override fun setup() {
         binding.viewModel = viewModel
 
+        viewModel.setDeleteBtnVisibility(false)
         initClickListeners()
         initObserve()
     }

diff --git a/app/src/main/res/layout/activity_schedule.xml b/app/src/main/res/layout/activity_schedule.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="viewModel"
+            type="com.mongmong.namo.presentation.ui.home.schedule.PersonalScheduleViewModel" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/schedule_background_layout"
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -14,13 +21,14 @@
             android:layout_width="65dp"
             android:layout_height="70dp"
             android:layout_marginBottom="10dp"
-            app:layout_constraintBottom_toTopOf="@id/schedule_container_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:visibility="@{(viewModel.isShowTopDeleteBtn == true) ? View.VISIBLE : View.GONE}"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="25dp"
             app:cardElevation="5dp"
-            app:cardUseCompatPadding="true">
+            app:cardUseCompatPadding="true"
+            app:layout_constraintBottom_toTopOf="@id/schedule_container_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="24dp"