diff --git a/app/src/main/java/com/example/shiftalarm/MainActivity.kt b/app/src/main/java/com/example/shiftalarm/MainActivity.kt index f9e0e19..00c8123 100644 --- a/app/src/main/java/com/example/shiftalarm/MainActivity.kt +++ b/app/src/main/java/com/example/shiftalarm/MainActivity.kt @@ -10,6 +10,7 @@ import android.os.Build import android.os.Bundle import android.view.GestureDetector import android.view.MotionEvent +import android.view.animation.AccelerateDecelerateInterpolator import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -708,7 +709,7 @@ class MainActivity : AppCompatActivity() { private fun animateMonthTransition(direction: Int) { val card = binding.calendarCard val width = card.width.toFloat() - + if (width == 0f) { currentViewMonth = if (direction > 0) { currentViewMonth.plusMonths(1) @@ -718,11 +719,14 @@ class MainActivity : AppCompatActivity() { updateCalendar() return } - + card.animate() .translationX(if (direction > 0) -width else width) - .alpha(0.5f) - .setDuration(200) + .alpha(0.7f) + .scaleX(0.95f) + .scaleY(0.95f) + .setDuration(280) + .setInterpolator(AccelerateDecelerateInterpolator()) .withEndAction { currentViewMonth = if (direction > 0) { currentViewMonth.plusMonths(1) @@ -730,12 +734,18 @@ class MainActivity : AppCompatActivity() { currentViewMonth.minusMonths(1) } updateCalendar() - + card.translationX = if (direction > 0) width else -width + card.scaleX = 0.95f + card.scaleY = 0.95f + card.animate() .translationX(0f) .alpha(1f) - .setDuration(200) + .scaleX(1f) + .scaleY(1f) + .setDuration(280) + .setInterpolator(AccelerateDecelerateInterpolator()) .start() } .start()