[CHORE] #113 : getSelectedDateEvents Private로 변경

pknu-wap · Feb 3, 2024 · 6fa9e04 · 6fa9e04
1 parent fd65c94
commit 6fa9e04
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -117,7 +117,7 @@ private fun handleBottomBarState(
     attendanceManagementNavigationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
-    SurveyRoute.answerRoute("{id}") ->setBottomBarState(false)
+    SurveyRoute.answerRoute("{id}") -> setBottomBarState(false)
     else -> setBottomBarState(true)
 }
 

diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt
@@ -1,5 +1,10 @@
 package com.wap.wapp.feature.notice
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -134,6 +139,7 @@ private fun EventItem(
         Row(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
             modifier = Modifier
+                .animateContentSize(animationSpec = spring(dampingRatio = 0.8f, stiffness = 500f))
                 .padding(vertical = 10.dp)
                 .height(IntrinsicSize.Min)
                 .fillMaxWidth(),
@@ -160,7 +166,11 @@ private fun EventItem(
                     color = WappTheme.colors.white,
                 )
 
-                if (bottomSheetState.currentValue == SheetValue.Expanded) {
+                AnimatedVisibility(
+                    visible = bottomSheetState.currentValue != SheetValue.PartiallyExpanded,
+                    enter = expandVertically(),
+                    exit = shrinkVertically(),
+                ) {
                     Text(
                         text = event.location,
                         style = WappTheme.typography.captionRegular,

diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/NoticeViewModel.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/NoticeViewModel.kt
@@ -42,7 +42,7 @@ class NoticeViewModel @Inject constructor(
         }
     }
 
-    fun getSelectedDateEvents() {
+    private fun getSelectedDateEvents() {
         _selectedDateEvents.value = EventsState.Loading
         viewModelScope.launch {
             getDateEventListUseCase(_selectedDate.value).onSuccess { eventList ->