Merge branch 'develop' into feature/comet/norippleclickable

yourssu · Jan 15, 2024 · 0b27fa4 · 0b27fa4
2 parents 6ce1ff2 + cb30c8d
commit 0b27fa4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/BottomSheet.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/BottomSheet.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yourssu.design.system.compose.YdsTheme
 import com.yourssu.design.system.compose.rule.Duration
-import com.yourssu.design.system.compose.rule.YdsInAndOutEasing
+import com.yourssu.design.system.compose.rule.YdsEasing
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -23,7 +23,7 @@ fun rememberYdsBottomSheetState(): ModalBottomSheetState {
         initialValue = ModalBottomSheetValue.Hidden,
         animationSpec = tween(
             durationMillis = Duration.Medium.millis,
-            easing = YdsInAndOutEasing
+            easing = YdsEasing
         ),
         skipHalfExpanded = true
     )

diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/Toggle.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/Toggle.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yourssu.design.system.compose.YdsTheme
 import com.yourssu.design.system.compose.base.ydsClickable
-import com.yourssu.design.system.compose.rule.YdsInAndOutEasing
+import com.yourssu.design.system.compose.rule.YdsEasing
 import com.yourssu.design.system.compose.rule.YdsBorder
 
 @Composable
@@ -49,7 +49,7 @@ fun Toggle(
         transitionSpec = {
             tween(
                 durationMillis = 100,
-                easing = YdsInAndOutEasing
+                easing = YdsEasing
             )
         }
     ) { selected ->

diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/BottomBar.kt
@@ -49,7 +49,7 @@ import com.yourssu.design.system.compose.base.Surface
 import com.yourssu.design.system.compose.base.YdsScaffold
 import com.yourssu.design.system.compose.base.YdsText
 import com.yourssu.design.system.compose.component.topbar.TopBar
-import com.yourssu.design.system.compose.rule.YdsInAndOutEasing
+import com.yourssu.design.system.compose.rule.YdsEasing
 
 /**
  * 하단 네비게이션 바
@@ -126,7 +126,7 @@ fun RowScope.BottomBarItem(
         targetValue = if (isAnimating) 1.2f else 1f, // isAnimating 에 따라 scale 기본값(1f) ~ 1.2배 까지 변화
         animationSpec = tween(
             durationMillis = 25,
-            easing = YdsInAndOutEasing,
+            easing = YdsEasing,
         ),
         finishedListener = {// animating 끝나면 false로 변경. scale 1.2f -> 1f로 변화
             if (isAnimating) {

diff --git a/compose/src/main/java/com/yourssu/design/system/compose/component/toast/ToastAnimation.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/toast/ToastAnimation.kt
@@ -17,7 +17,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import com.yourssu.design.system.compose.rule.Duration
-import com.yourssu.design.system.compose.rule.YdsInAndOutEasing
+import com.yourssu.design.system.compose.rule.YdsEasing
 
 data class ToastTransitionItem(
     val toastData: ToastData?,
@@ -62,7 +62,7 @@ fun FadeInFadeOut(
                     val isVisible = appearedToastData == newToastData
                     val opacity = animatedOpacity(
                         animation = tween(
-                            easing = YdsInAndOutEasing,
+                            easing = YdsEasing,
                             delayMillis = 0,
                             durationMillis = Duration.Medium.millis
                         ),

diff --git a/compose/src/main/java/com/yourssu/design/system/compose/rule/Animation.kt b/compose/src/main/java/com/yourssu/design/system/compose/rule/Animation.kt
@@ -2,7 +2,7 @@ package com.yourssu.design.system.compose.rule
 
 import androidx.compose.animation.core.CubicBezierEasing
 
-internal val YdsInAndOutEasing = CubicBezierEasing(0.25f, 0.1f, 0.25f, 1f)
+val YdsEasing = CubicBezierEasing(0.25f, 0.1f, 0.25f, 1f)
 
 enum class Duration(val millis: Int) {
     Short(100),