v1.0.5 - 메모 아이콘 정리, 삼성 One UI 최신 알람 화면 개편, 달력 깜빡임 해소 및 카드 스택 전환 애니메이션 적용
This commit is contained in:
@@ -31,6 +31,9 @@ import java.time.YearMonth
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.concurrent.TimeUnit
|
||||
import androidx.recyclerview.widget.GridLayoutManager
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.Canvas
|
||||
import android.util.Log
|
||||
import kotlin.math.abs
|
||||
|
||||
class MainActivity : AppCompatActivity() {
|
||||
@@ -41,6 +44,8 @@ class MainActivity : AppCompatActivity() {
|
||||
private var currentViewMonth: YearMonth = YearMonth.now(ShiftCalculator.SEOUL_ZONE)
|
||||
private var currentViewTeam: String = "A"
|
||||
private lateinit var gestureDetector: GestureDetector
|
||||
private var calendarAdapter: CalendarAdapter? = null
|
||||
private var isAnimatingMonth = false
|
||||
|
||||
override fun onConfigurationChanged(newConfig: android.content.res.Configuration) {
|
||||
super.onConfigurationChanged(newConfig)
|
||||
@@ -261,6 +266,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
private fun setupCalendar() {
|
||||
binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
|
||||
binding.calendarGrid.itemAnimator = null
|
||||
updateCalendar()
|
||||
}
|
||||
|
||||
@@ -300,22 +306,45 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos)
|
||||
|
||||
val adapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
|
||||
override fun onDayClick(date: LocalDate, currentShift: String) {
|
||||
showDaySettingsDialog(date, currentShift)
|
||||
val availableHeight = binding.calendarGrid.height
|
||||
val calcRowHeight = if (availableHeight > 0) availableHeight / 5 else 0
|
||||
|
||||
if (calendarAdapter == null || binding.calendarGrid.adapter == null) {
|
||||
val newAdapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
|
||||
override fun onDayClick(date: LocalDate, currentShift: String) {
|
||||
showDaySettingsDialog(date, currentShift)
|
||||
}
|
||||
}, binding.cbShowHolidays.isChecked)
|
||||
if (calcRowHeight > 0) {
|
||||
newAdapter.rowHeight = calcRowHeight
|
||||
}
|
||||
}, binding.cbShowHolidays.isChecked)
|
||||
|
||||
binding.calendarGrid.adapter = adapter
|
||||
calendarAdapter = newAdapter
|
||||
binding.calendarGrid.adapter = newAdapter
|
||||
} else {
|
||||
calendarAdapter?.let { ad ->
|
||||
ad.days = days
|
||||
ad.showHolidays = binding.cbShowHolidays.isChecked
|
||||
if (calcRowHeight > 0) {
|
||||
ad.rowHeight = calcRowHeight
|
||||
}
|
||||
ad.notifyDataSetChanged()
|
||||
}
|
||||
}
|
||||
|
||||
binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
|
||||
|
||||
// Dynamic row height: exactly 5 rows visible, 6-row months scroll
|
||||
binding.calendarGrid.post {
|
||||
val availableHeight = binding.calendarGrid.height
|
||||
if (availableHeight > 0) {
|
||||
val calcRowHeight = availableHeight / 5
|
||||
adapter.rowHeight = calcRowHeight
|
||||
adapter.notifyDataSetChanged()
|
||||
if (calcRowHeight == 0) {
|
||||
binding.calendarGrid.post {
|
||||
val h = binding.calendarGrid.height
|
||||
if (h > 0) {
|
||||
val rH = h / 5
|
||||
calendarAdapter?.let {
|
||||
if (it.rowHeight != rH) {
|
||||
it.rowHeight = rH
|
||||
it.notifyDataSetChanged()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -717,7 +746,9 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun animateMonthTransition(direction: Int) {
|
||||
if (isAnimatingMonth) return
|
||||
val card = binding.calendarCard
|
||||
val snapshot = binding.calendarOverlaySnapshot
|
||||
val width = card.width.toFloat()
|
||||
|
||||
if (width == 0f) {
|
||||
@@ -730,33 +761,61 @@ class MainActivity : AppCompatActivity() {
|
||||
return
|
||||
}
|
||||
|
||||
val fluidInterpolator = androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f)
|
||||
isAnimatingMonth = true
|
||||
|
||||
// 1. Capture bitmap snapshot of current calendar card
|
||||
try {
|
||||
val bitmap = Bitmap.createBitmap(card.width, card.height, Bitmap.Config.ARGB_8888)
|
||||
val canvas = Canvas(bitmap)
|
||||
card.draw(canvas)
|
||||
snapshot.setImageBitmap(bitmap)
|
||||
snapshot.visibility = android.view.View.VISIBLE
|
||||
snapshot.alpha = 1.0f
|
||||
snapshot.scaleX = 1.0f
|
||||
snapshot.scaleY = 1.0f
|
||||
snapshot.translationX = 0f
|
||||
} catch (e: Exception) {
|
||||
Log.w("MainActivity", "Failed to capture snapshot for month transition", e)
|
||||
}
|
||||
|
||||
// 2. Update to new month immediately
|
||||
currentViewMonth = if (direction > 0) {
|
||||
currentViewMonth.plusMonths(1)
|
||||
} else {
|
||||
currentViewMonth.minusMonths(1)
|
||||
}
|
||||
updateCalendar()
|
||||
|
||||
// 3. Prepare incoming new month card on top
|
||||
card.translationX = if (direction > 0) width else -width
|
||||
card.alpha = 1.0f
|
||||
card.cardElevation = dpToPx(8f).toFloat()
|
||||
|
||||
val fluidInterpolator = androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f)
|
||||
val duration = 280L
|
||||
|
||||
// 4. Slide top new month card smoothly into position
|
||||
card.animate()
|
||||
.translationX(if (direction > 0) -width else width)
|
||||
.alpha(0.8f)
|
||||
.setDuration(160)
|
||||
.translationX(0f)
|
||||
.setDuration(duration)
|
||||
.setInterpolator(fluidInterpolator)
|
||||
.withEndAction {
|
||||
currentViewMonth = if (direction > 0) {
|
||||
currentViewMonth.plusMonths(1)
|
||||
} else {
|
||||
currentViewMonth.minusMonths(1)
|
||||
}
|
||||
updateCalendar()
|
||||
|
||||
// Incoming slide animation from opposite side
|
||||
card.translationX = if (direction > 0) width else -width
|
||||
card.alpha = 0.8f
|
||||
|
||||
card.animate()
|
||||
.translationX(0f)
|
||||
.alpha(1f)
|
||||
.setDuration(220)
|
||||
.setInterpolator(fluidInterpolator)
|
||||
.start()
|
||||
card.cardElevation = 0f
|
||||
snapshot.visibility = android.view.View.GONE
|
||||
snapshot.setImageDrawable(null)
|
||||
isAnimatingMonth = false
|
||||
}
|
||||
.start()
|
||||
|
||||
// 5. Parallax fade & scale down bottom snapshot card
|
||||
snapshot.animate()
|
||||
.scaleX(0.94f)
|
||||
.scaleY(0.94f)
|
||||
.alpha(0.35f)
|
||||
.translationX(if (direction > 0) -width * 0.22f else width * 0.22f)
|
||||
.setDuration(duration)
|
||||
.setInterpolator(fluidInterpolator)
|
||||
.start()
|
||||
}
|
||||
|
||||
private fun formatRemainingDays(days: Float): String {
|
||||
|
||||
Reference in New Issue
Block a user