sanjeok77/ShiftRing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 19 Wiki Activity

v1.0.5 - 메모 아이콘 정리, 삼성 One UI 최신 알람 화면 개편, 달력 깜빡임 해소 및 카드 스택 전환 애니메이션 적용

Browse Source
This commit is contained in:
sanjeok77
2026-08-14 09:48:22 +09:00
parent d245aeb7d5
commit 696083060d
13 changed files with 395 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/example/shiftalarm/AlarmActivity.kt
+87 -29
View File
@@ -185,50 +185,68 @@ class AlarmActivity : AppCompatActivity() {
}
private fun setupControls() {
val snoozeInterval = intent.getIntExtra("EXTRA_SNOOZE_INTERVAL", 5)
binding.tvSnoozeText.text = "다시 울림 (${snoozeInterval}분)"
binding.btnSnooze.setOnClickListener {
handleSnooze()
}
// Swipe-to-dismiss for Stop Button
// Omni-directional Swipe & Tap to Dismiss (Samsung One UI Clock Style)
var startX = 0f
var startY = 0f
var isMoved = false
val dismissBtn = binding.btnDismiss
val maxSwipe = dpToPx(100f).toFloat()
val maxSwipe = dpToPx(80f).toFloat()
dismissBtn.setOnTouchListener { v, event ->
when (event.action) {
MotionEvent.ACTION_DOWN -> {
startX = event.rawX
startY = event.rawY
isMoved = false
v.animate().cancel()
v.scaleX = 0.96f
v.scaleY = 0.96f
true
}
MotionEvent.ACTION_MOVE -> {
val dx = event.rawX - startX
val clampedDx = if (dx > 0) dx.coerceAtMost(maxSwipe) else dx.coerceAtLeast(-maxSwipe)
v.translationX = clampedDx
val dy = event.rawY - startY
val distance = Math.hypot(dx.toDouble(), dy.toDouble()).toFloat()
// Visual feedback: scale up when near trigger
val ratio = abs(clampedDx) / maxSwipe
v.scaleX = 1f + (ratio * 0.15f)
v.scaleY = 1f + (ratio * 0.15f)
v.alpha = 1f - (ratio * 0.3f)
if (distance > 10f) {
isMoved = true
}
val clampedDx = dx.coerceIn(-maxSwipe, maxSwipe)
val clampedDy = dy.coerceIn(-maxSwipe, maxSwipe)
v.translationX = clampedDx
v.translationY = clampedDy
val ratio = (distance / maxSwipe).coerceAtMost(1f)
v.scaleX = 0.96f + (ratio * 0.18f)
v.scaleY = 0.96f + (ratio * 0.18f)
binding.pulseCircle.alpha = 0.4f + (ratio * 0.6f)
true
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
val dx = event.rawX - startX
if (abs(dx) > maxSwipe * 0.8f) {
// Trigger Dismiss
@Suppress("DEPRECATION")
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
Toast.makeText(this, "알람 해제 완료", Toast.LENGTH_SHORT).show()
stopAlarm(); finish()
val dy = event.rawY - startY
val distance = Math.hypot(dx.toDouble(), dy.toDouble()).toFloat()
// Trigger dismiss if swiped past threshold or tapped
if (!isMoved || distance > maxSwipe * 0.5f) {
triggerDismiss()
} else {
// Reset
// Spring back reset
v.animate()
.translationX(0f)
.translationY(0f)
.scaleX(1f)
.scaleY(1f)
.alpha(1f)
.setDuration(300)
.setDuration(250)
.setInterpolator(android.view.animation.OvershootInterpolator(1.5f))
.start()
}
true
@@ -237,17 +255,35 @@ class AlarmActivity : AppCompatActivity() {
}
}
// Pulse logic with enhanced glow
// Dual Wave Breathing Animation (Samsung Ambient Glow)
fun startPulse() {
binding.pulseCircle.scaleX = 0.85f; binding.pulseCircle.scaleY = 0.85f; binding.pulseCircle.alpha = 0.5f
binding.pulseCircle.scaleX = 0.8f
binding.pulseCircle.scaleY = 0.8f
binding.pulseCircle.alpha = 0.3f
binding.ambientRing.scaleX = 0.9f
binding.ambientRing.scaleY = 0.9f
binding.ambientRing.alpha = 0.5f
binding.pulseCircle.animate()
.scaleX(1.3f).scaleY(1.3f).alpha(1.0f)
.setDuration(1500)
.withEndAction {
.scaleX(1.35f).scaleY(1.35f).alpha(0.8f)
.setDuration(1600)
.withEndAction {
binding.pulseCircle.animate()
.scaleX(0.85f).scaleY(0.85f).alpha(0.5f)
.setDuration(1500)
.withEndAction { if(!isFinishing) startPulse() }
.scaleX(0.8f).scaleY(0.8f).alpha(0.3f)
.setDuration(1600)
.withEndAction { if (!isFinishing) startPulse() }
.start()
}
.start()
binding.ambientRing.animate()
.scaleX(1.15f).scaleY(1.15f).alpha(0.85f)
.setDuration(1600)
.withEndAction {
binding.ambientRing.animate()
.scaleX(0.9f).scaleY(0.9f).alpha(0.5f)
.setDuration(1600)
.start()
}
.start()
@@ -255,13 +291,35 @@ class AlarmActivity : AppCompatActivity() {
startPulse()
}
private fun triggerDismiss() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(
VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
)
} else {
@Suppress("DEPRECATION")
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
}
Toast.makeText(this, "알람이 해제되었습니다.", Toast.LENGTH_SHORT).show()
stopAlarm()
finish()
}
private fun handleSnooze() {
@Suppress("DEPRECATION")
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(
VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
)
} else {
@Suppress("DEPRECATION")
(getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
}
val snoozeRepeat = intent.getIntExtra("EXTRA_SNOOZE_REPEAT", 3)
val text = if (snoozeRepeat == 99) "다시 울림 설정됨" else "다시 울림 (${snoozeRepeat}회 남음)"
Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
snoozeAlarm(); stopAlarm(); finish()
snoozeAlarm()
stopAlarm()
finish()
}
private fun dpToPx(dp: Float): Int {
app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
-3
View File
@@ -35,7 +35,6 @@ class CalendarAdapter(
val tvShiftSmall: TextView = view.findViewById(R.id.tvShiftSmall)
val shiftChar: TextView = view.findViewById(R.id.shiftChar)
val holidayNameSmall: TextView = view.findViewById(R.id.holidayNameSmall)
val memoIndicator: ImageView = view.findViewById(R.id.memoIndicator)
val tvTide: TextView = view.findViewById(R.id.tvTide)
val memoContent: TextView = view.findViewById(R.id.memoContent)
}
@@ -231,10 +230,8 @@ class CalendarAdapter(
if (hasMemo) {
holder.memoContent.visibility = View.VISIBLE
holder.memoContent.text = item.memoContent
holder.memoIndicator.visibility = View.VISIBLE
} else {
holder.memoContent.visibility = View.GONE
holder.memoIndicator.visibility = View.GONE
}
// Today Border or Highlight
app/src/main/java/com/example/shiftalarm/MainActivity.kt
+93 -34
View File
@@ -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 {