diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e852993..8eb9914 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,8 +20,8 @@ android { applicationId = "com.example.shiftalarm" minSdk = 26 targetSdk = 35 - versionCode = 1147 - versionName = "1.4.7" + versionCode = 1148 + versionName = "1.4.8" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/shiftalarm/MainActivity.kt b/app/src/main/java/com/example/shiftalarm/MainActivity.kt index 7f2b55e..aa4471a 100644 --- a/app/src/main/java/com/example/shiftalarm/MainActivity.kt +++ b/app/src/main/java/com/example/shiftalarm/MainActivity.kt @@ -80,8 +80,7 @@ class MainActivity : AppCompatActivity() { } binding.prevMonth.setOnClickListener { - currentViewMonth = currentViewMonth.minusMonths(1) - updateCalendar() + animateMonthTransition(-1) } binding.monthTitle.setOnClickListener { @@ -89,8 +88,7 @@ class MainActivity : AppCompatActivity() { } binding.nextMonth.setOnClickListener { - currentViewMonth = currentViewMonth.plusMonths(1) - updateCalendar() + animateMonthTransition(1) } binding.btnToday.setOnClickListener { @@ -707,11 +705,40 @@ class MainActivity : AppCompatActivity() { Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show() } } - /** - * 남은 연차 표시 형식 개선 - * - 정수면 정수로 표시 (예: 22) - * - 소숫점 있으면 소숫점 표시 (예: 21.5) - */ + private fun animateMonthTransition(direction: Int) { + val slideOut = if (direction > 0) { + android.view.animation.TranslateAnimation(0f, -binding.calendarCard.width.toFloat(), 0f, 0f) + } else { + android.view.animation.TranslateAnimation(0f, binding.calendarCard.width.toFloat(), 0f, 0f) + } + slideOut.duration = 150 + slideOut.fillAfter = false + + val slideIn = if (direction > 0) { + android.view.animation.TranslateAnimation(binding.calendarCard.width.toFloat(), 0f, 0f, 0f) + } else { + android.view.animation.TranslateAnimation(-binding.calendarCard.width.toFloat(), 0f, 0f, 0f) + } + slideIn.duration = 150 + slideIn.fillAfter = true + + binding.calendarCard.startAnimation(slideOut) + + slideOut.setAnimationListener(object : android.view.animation.Animation.AnimationListener { + override fun onAnimationStart(animation: android.view.animation.Animation?) {} + override fun onAnimationRepeat(animation: android.view.animation.Animation?) {} + override fun onAnimationEnd(animation: android.view.animation.Animation?) { + currentViewMonth = if (direction > 0) { + currentViewMonth.plusMonths(1) + } else { + currentViewMonth.minusMonths(1) + } + updateCalendar() + binding.calendarCard.startAnimation(slideIn) + } + }) + } + private fun formatRemainingDays(days: Float): String { return if (days == days.toInt().toFloat()) { // 정수인 경우 diff --git a/version.json b/version.json index 49b9a20..0cfc6ac 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { - "versionCode": 1147, - "versionName": "1.4.7", - "apkUrl": "https://git.webpluss.net/attachments/eb7f2a8d-3243-4c23-a833-f9864a4686a3", - "changelog": "v1.4.7: 버전업 오류 수정, 휴가관리→근무관리 명칭 변경, 기능추가중 표시", + "versionCode": 1148, + "versionName": "1.4.8", + "apkUrl": "https://git.webpluss.net/attachments/731ca456-b7f3-4634-8b8d-05dbf21e3895", + "changelog": "v1.4.8: 달력 월 이동 시 부드러운 화면 전환 애니메이션 추가", "forceUpdate": false }