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

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
  applicationId = "com.example.shiftalarm"
  minSdk = 26
  targetSdk = 35
-        versionCode = 100
+        versionCode = 105
-        versionName = "1.0.0"
+        versionName = "1.0.5"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  }

app/src/main/AndroidManifest.xml

@@ -12,8 +12,6 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <!-- Service & Notification -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

app/src/main/java/com/example/shiftalarm/AlarmActivity.kt

@@ -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)
+                    val dy = event.rawY - startY
-                    v.translationX = clampedDx
+                    val distance = Math.hypot(dx.toDouble(), dy.toDouble()).toFloat()
                     
-                    // Visual feedback: scale up when near trigger
+                    if (distance > 10f) {
-                    val ratio = abs(clampedDx) / maxSwipe
+                        isMoved = true
-                    v.scaleX = 1f + (ratio * 0.15f)
+                    }
-                    v.scaleY = 1f + (ratio * 0.15f)
+
-                    v.alpha = 1f - (ratio * 0.3f)
+                    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) {
+                    val dy = event.rawY - startY
-                        // Trigger Dismiss
+                    val distance = Math.hypot(dx.toDouble(), dy.toDouble()).toFloat()
-                        @Suppress("DEPRECATION")
+
-                        (getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
+                    // Trigger dismiss if swiped past threshold or tapped
-                        Toast.makeText(this, "알람 해제 완료", Toast.LENGTH_SHORT).show()
+                    if (!isMoved || distance > maxSwipe * 0.5f) {
-                        stopAlarm(); finish()
+                        triggerDismiss()
                     } else {
-                        // Reset
+                        // Spring back reset
                         v.animate()
                             .translationX(0f)
+                            .translationY(0f)
                             .scaleX(1f)
                             .scaleY(1f)
-                            .alpha(1f)
+                            .setDuration(250)
-                            .setDuration(300)
+                            .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)
+                .scaleX(1.35f).scaleY(1.35f).alpha(0.8f)
-                .setDuration(1500)
+                .setDuration(1600)
                 .withEndAction {
                     binding.pulseCircle.animate()
-                        .scaleX(0.85f).scaleY(0.85f).alpha(0.5f)
+                        .scaleX(0.8f).scaleY(0.8f).alpha(0.3f)
-                        .setDuration(1500)
+                        .setDuration(1600)
-                        .withEndAction { if(!isFinishing) startPulse() }
+                        .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 handleSnooze() {
+    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() {
+        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/AlarmPermissionUtil.kt

@@ -175,7 +175,9 @@ object AlarmPermissionUtil {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION).apply {
                 data = Uri.parse("package:${context.packageName}")
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+            if (context !is Activity) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
             context.startActivity(intent)
         }
@@ -186,13 +188,17 @@ object AlarmPermissionUtil {
             try {
                 val intent = Intent("android.settings.MANAGE_APP_USE_FULL_SCREEN_INTENT").apply {
                     data = Uri.parse("package:${context.packageName}")
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+                if (context !is Activity) {
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 }
                 context.startActivity(intent)
             } catch (e: Exception) {
                 val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                     data = Uri.parse("package:${context.packageName}")
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+                if (context !is Activity) {
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 }
                 context.startActivity(intent)
             }
@@ -211,7 +217,6 @@ object AlarmPermissionUtil {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
             allGranted = allGranted && pm.isIgnoringBatteryOptimizations(context.packageName)
-            allGranted = allGranted && Settings.canDrawOverlays(context)
         }
         if (Build.VERSION.SDK_INT >= 34) {
             val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

app/src/main/java/com/example/shiftalarm/AlarmSyncManager.kt

@@ -32,6 +32,19 @@ object AlarmSyncManager {
             val alarmId = repo.addCustomAlarm(alarm)
             Log.d(TAG, "알람 DB 추가 완료: ID=$alarmId")
 
+            // 시스템 알람 볼륨이 0인 경우 최대치로 자동 보정
+            try {
+                val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
+                val maxVol = audioManager.getStreamMaxVolume(android.media.AudioManager.STREAM_ALARM)
+                val currVol = audioManager.getStreamVolume(android.media.AudioManager.STREAM_ALARM)
+                if (currVol == 0) {
+                    audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM, maxVol, 0)
+                    Log.d(TAG, "알람 볼륨이 0이어서 최대($maxVol)로 자동 설정")
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "볼륨 자동 보정 실패", e)
+            }
+            
             // 2. AlarmManager에 예약
             val today = LocalDate.now(SEOUL_ZONE)
             val customAlarms = repo.getAllCustomAlarms()

app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt

@@ -32,9 +32,9 @@ class CalendarAdapter(
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val root: View = view.findViewById(R.id.dayRoot)
         val dayNumber: TextView = view.findViewById(R.id.dayNumber)
+        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)
     }
@@ -71,6 +71,7 @@ class CalendarAdapter(
         val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY
         val fullHolidayName = HolidayManager.getHolidayName(item.date)
         val isToday = item.date == LocalDate.now()
+        val hasMemo = item.hasMemo && !item.memoContent.isNullOrEmpty()
 
         // Day Number Color
         if (fullHolidayName != null || isSunday) {
@@ -102,32 +103,19 @@ class CalendarAdapter(
         // --- Shift & Holiday Display Logic ---
         holder.shiftChar.background = null
         holder.shiftChar.text = ""
+        holder.tvShiftSmall.visibility = View.GONE
         holder.holidayNameSmall.visibility = View.GONE
         holder.shiftChar.textSize = 18f
 
-        // "반월", "반년" (Half-Monthly, Half-Yearly) Special Logic
-        // These are overrides or specific shifts that user sets.
-        // User requested: "월", "년" text. Half-filled background (Red + Transparent).
-        // Check exact string or "startswith" if logic changed? 
-        // Logic in adapter `getShift` might return "반월", "반년".
-
         if (showHolidays && fullHolidayName != null) {
             // Holiday Mode (Priority): Show full holiday name, no circle
             holder.shiftChar.text = fullHolidayName
             holder.shiftChar.setTextColor(Color.parseColor("#FF5252"))
             holder.shiftChar.textSize = 13f
             holder.shiftChar.background = null
+            holder.shiftChar.visibility = View.VISIBLE
         } else if (item.shift != null && item.shift != "비번") {
             // Shift Mode
-            
-            // Handle specific "Half" cases first
-            if (item.shift == "반월" || item.shift == "반년") {
-                 holder.shiftChar.text = if (item.shift == "반월") "월" else "년"
-                 holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black)) // Black for contrast on Half Red/Transparent
-                 holder.shiftChar.textSize = 18f
-                 holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
-            } else {
-                // Standard Logic
             val shiftAbbreviation = when (item.shift) {
                 "주간" -> "주"
                 "석간" -> "석"
@@ -137,12 +125,11 @@ class CalendarAdapter(
                 "휴무", "휴가" -> "휴"
                 "월차" -> "월"
                 "연차" -> "연"
+                "반월" -> "월"
+                "반년" -> "년"
                 "교육" -> "교"
-                    else -> item.shift.take(1)
+                else -> item.shift.take(2)
             }
-                holder.shiftChar.text = shiftAbbreviation
-                holder.shiftChar.textSize = 20f
-                holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)
 
             val shiftColorRes = when (item.shift) {
                 "주간" -> R.color.shift_lemon
@@ -151,11 +138,51 @@ class CalendarAdapter(
                 "주간 맞교대" -> R.color.shift_jumat
                 "야간 맞교대" -> R.color.shift_yamat
                 "휴무", "휴가", "월차", "연차" -> R.color.shift_red
+                "반월", "반년" -> R.color.shift_red
                 "교육" -> R.color.primary
                 else -> R.color.text_secondary
             }
             val shiftColor = ContextCompat.getColor(context, shiftColorRes)
 
+            if (hasMemo) {
+                // When day has a memo: show small shift badge next to day number, hide large center shift circle
+                holder.shiftChar.visibility = View.GONE
+                holder.tvShiftSmall.visibility = View.VISIBLE
+                holder.tvShiftSmall.text = shiftAbbreviation
+                holder.tvShiftSmall.textSize = if (shiftAbbreviation.length > 1) 7.5f else 9.5f
+                holder.tvShiftSmall.setTypeface(null, android.graphics.Typeface.BOLD)
+
+                if (item.shift == "반월" || item.shift == "반년") {
+                    holder.tvShiftSmall.text = if (item.shift == "반월") "월" else "년"
+                    holder.tvShiftSmall.setTextColor(ContextCompat.getColor(context, R.color.black))
+                    holder.tvShiftSmall.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
+                } else if (isToday) {
+                    val smallBg = ContextCompat.getDrawable(context, R.drawable.bg_shift_solid_v4)?.constantState?.newDrawable()?.mutate() as? android.graphics.drawable.GradientDrawable
+                    smallBg?.setColor(shiftColor)
+                    holder.tvShiftSmall.background = smallBg
+                    holder.tvShiftSmall.setTextColor(if (item.shift == "주간" || item.shift == "석간") ContextCompat.getColor(context, R.color.black) else Color.WHITE)
+                } else {
+                    val smallBg = ContextCompat.getDrawable(context, R.drawable.bg_shift_stroke_v4)?.constantState?.newDrawable()?.mutate() as? android.graphics.drawable.GradientDrawable
+                    smallBg?.setStroke(dpToPx(context, 1.2f), shiftColor)
+                    smallBg?.setColor(Color.TRANSPARENT)
+                    holder.tvShiftSmall.background = smallBg
+                    holder.tvShiftSmall.setTextColor(shiftColor)
+                }
+            } else {
+                // When day has NO memo: standard large centered shift circle
+                holder.shiftChar.visibility = View.VISIBLE
+                holder.tvShiftSmall.visibility = View.GONE
+
+                if (item.shift == "반월" || item.shift == "반년") {
+                    holder.shiftChar.text = if (item.shift == "반월") "월" else "년"
+                    holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black))
+                    holder.shiftChar.textSize = 18f
+                    holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
+                } else {
+                    holder.shiftChar.text = shiftAbbreviation
+                    holder.shiftChar.textSize = 20f
+                    holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)
+
                     if (isToday) {
                         // Today: Solid Circle
                         val background = ContextCompat.getDrawable(context, R.drawable.bg_shift_solid_v4) as? android.graphics.drawable.GradientDrawable
@@ -181,43 +208,26 @@ class CalendarAdapter(
                     }
                 }
             }
+        }
 
         // Lunar date small display if requested or just default
         if (!showHolidays && fullHolidayName != null) {
             holder.holidayNameSmall.visibility = View.VISIBLE
             holder.holidayNameSmall.text = fullHolidayName
         } else {
-            // Ensure visibility GONE if not needed (e.g. standard day)
             holder.holidayNameSmall.visibility = View.GONE
         }
         
-        // Double check: if showHolidays=true (Holiday mode), we handled it at top block.
-        // But if showHolidays=true and NO holiday, we show lunar date? 
-        // User asked: "Overlap date and holiday text". 
-        // My item_day.xml has holidayNameSmall at bottom now.
-        // If showHolidays=true, CalendarAdapter usually HIDES shiftChar and shows Holiday Name?
-        // Wait, standard logic (lines 84-91 above):
-        // If showHolidays && fullHolidayName != null -> shiftChar shows Name.
-        // If showHolidays && fullHolidayName == null -> shiftChar shows LUNAR DATE? (Old logic had this).
-        
         if (showHolidays && fullHolidayName == null) {
-             // Show Lunar Date in shiftChar instead of empty?
-             // Or shiftChar is empty, show small text?
-             // Previous code:
-             // holder.shiftChar.text = "" 
-             // holder.holidayNameSmall.visibility = View.VISIBLE
-             // holder.holidayNameSmall.text = HolidayManager.getLunarDateString(item.date)
-             
              holder.shiftChar.text = HolidayManager.getLunarDateString(item.date)
              holder.shiftChar.textSize = 13f
              holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
              holder.shiftChar.background = null
+             holder.shiftChar.visibility = View.VISIBLE
         }
 
-
+        // Memo Content Text (Up to 4 lines in center of day cell)
-        // Memo Indicator
+        if (hasMemo) {
-        holder.memoIndicator.visibility = View.GONE // Hide indicator, showing text instead
-        if (item.hasMemo && !item.memoContent.isNullOrEmpty()) {
             holder.memoContent.visibility = View.VISIBLE
             holder.memoContent.text = item.memoContent
         } else {

app/src/main/java/com/example/shiftalarm/FragmentSettingsAlarm.kt

@@ -247,16 +247,31 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
                 visibility = if (isCollapsed) View.GONE else View.VISIBLE
             }
 
-            // Click header to collapse/expand
+            // Click header to collapse/expand with smooth accordion animation
             headerView.setOnClickListener {
-                if (collapsedGroups.contains(category)) {
+                val willExpand = collapsedGroups.contains(category)
+                
+                // 1. Smooth accordion expand/collapse transition
+                val transition = android.transition.AutoTransition().apply {
+                    duration = 250
+                    interpolator = android.view.animation.AccelerateDecelerateInterpolator()
+                }
+                android.transition.TransitionManager.beginDelayedTransition(container, transition)
+
+                // 2. Smooth rotation between '+' (0 deg) and 'x' (45 deg)
+                val targetRotation = if (willExpand) 45f else 0f
+                ivExpand.animate()
+                    .rotation(targetRotation)
+                    .setDuration(250)
+                    .setInterpolator(androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f))
+                    .start()
+
+                if (willExpand) {
                     collapsedGroups.remove(category)
                     childrenContainer.visibility = View.VISIBLE
-                    ivExpand.rotation = 45f
                 } else {
                     collapsedGroups.add(category)
                     childrenContainer.visibility = View.GONE
-                    ivExpand.rotation = 0f
                 }
             }
 
@@ -461,7 +476,18 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
             Log.w("ShiftAlarm", "soundUri가 비어있어 기본값으로 재설정: $currentDialogSoundUri")
         }
         
-        Log.d("ShiftAlarm", "알람 ${if (isNew) "생성" else "수정"} - 최종 soundUri: $currentDialogSoundUri")
+        // 새 알람 추가 시 또는 볼륨이 0인 경우 시스템 알람 스트림 볼륨을 최대치로 설정
+        try {
+            val audioManager = requireContext().getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
+            val maxVol = audioManager.getStreamMaxVolume(android.media.AudioManager.STREAM_ALARM)
+            val currVol = audioManager.getStreamVolume(android.media.AudioManager.STREAM_ALARM)
+            if (isNew || currVol == 0) {
+                audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM, maxVol, 0)
+                Log.d("ShiftAlarm", "알람 스트림 볼륨 최대치($maxVol)로 초기화 완료")
+            }
+        } catch (e: Exception) {
+            Log.w("ShiftAlarm", "알람 볼륨 설정 실패", e)
+        }
 
         fun updateSoundName(uriStr: String?) {
             if (uriStr.isNullOrEmpty() || uriStr == "null") {
@@ -511,6 +537,13 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
                 btn.setTextColor(if (isSelected) ContextCompat.getColor(requireContext(), R.color.white) else ContextCompat.getColor(requireContext(), R.color.text_secondary))
             }
         }
+        updateRepeatUI()
+        repeatButtons.forEachIndexed { i, btn ->
+            btn.setOnClickListener {
+                selectedRepeat = repeatValues[i]
+                updateRepeatUI()
+            }
+        }
         // Pre-Alarm Buttons
         var selectedPreAlarm = 15
         val preAlarmButtons = listOf(

app/src/main/java/com/example/shiftalarm/FragmentSettingsBasic.kt

@@ -214,10 +214,8 @@ class FragmentSettingsBasic : Fragment() {
             binding.dividerExact.visibility = View.GONE
         }
 
-        // 3. 다른 앱 위에 표시 (Overlay)
+        // 3. 다른 앱 위에 표시 (Overlay - 레거시)
-        val isOverlayGranted = AlarmPermissionUtil.getOverlayStatus(context)
+        binding.btnOverlayPermission.visibility = View.GONE
-        binding.tvOverlayStatus.text = if (isOverlayGranted) "[설정 완료: 화면 우위]" else "필수: 알람창 노출을 위해 허용하세요"
-        binding.tvOverlayStatus.setTextColor(ContextCompat.getColor(context, if (isOverlayGranted) R.color.primary else R.color.shift_red))
 
         // 4. 전체화면 알림 (Full Screen Intent) - Android 14+
         if (Build.VERSION.SDK_INT >= 34) {

app/src/main/java/com/example/shiftalarm/MainActivity.kt

@@ -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)
@@ -68,7 +73,6 @@ class MainActivity : AppCompatActivity() {
         setupWorker()
         setupSwipeGesture()
         AppUpdateManager.checkUpdate(this, silent = true)
-        checkRoot()
 
         val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
@@ -262,6 +266,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupCalendar() {
         binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
+        binding.calendarGrid.itemAnimator = null
         updateCalendar()
     }
 
@@ -301,22 +306,45 @@ class MainActivity : AppCompatActivity() {
 
             val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos)
 
-            val adapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
+            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
+                }
+                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.calendarGrid.adapter = adapter
             binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
-            // Dynamic row height: exactly 5 rows visible, 6-row months scroll
+            if (calcRowHeight == 0) {
                 binding.calendarGrid.post {
-                val availableHeight = binding.calendarGrid.height
+                    val h = binding.calendarGrid.height
-                if (availableHeight > 0) {
+                    if (h > 0) {
-                    val calcRowHeight = availableHeight / 5
+                        val rH = h / 5
-                    adapter.rowHeight = calcRowHeight
+                        calendarAdapter?.let {
-                    adapter.notifyDataSetChanged()
+                            if (it.rowHeight != rH) {
+                                it.rowHeight = rH
+                                it.notifyDataSetChanged()
+                            }
+                        }
+                    }
                 }
             }
 
@@ -717,13 +745,10 @@ class MainActivity : AppCompatActivity() {
         return java.time.Duration.between(now, midnight).toMillis()
     }
 
-    private fun checkRoot() {
-        if (RootUtil.isDeviceRooted()) {
-            Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show()
-        }
-    }
     private fun animateMonthTransition(direction: Int) {
+        if (isAnimatingMonth) return
         val card = binding.calendarCard
+        val snapshot = binding.calendarOverlaySnapshot
         val width = card.width.toFloat()
 
         if (width == 0f) {
@@ -736,14 +761,24 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
-        val fluidInterpolator = androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f)
+        isAnimatingMonth = true
 
-        card.animate()
+        // 1. Capture bitmap snapshot of current calendar card
-            .translationX(if (direction > 0) -width else width)
+        try {
-            .alpha(0.8f)
+            val bitmap = Bitmap.createBitmap(card.width, card.height, Bitmap.Config.ARGB_8888)
-            .setDuration(160)
+            val canvas = Canvas(bitmap)
-            .setInterpolator(fluidInterpolator)
+            card.draw(canvas)
-            .withEndAction {
+            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 {
@@ -751,18 +786,36 @@ class MainActivity : AppCompatActivity() {
         }
         updateCalendar()
 
-                // Incoming slide animation from opposite side
+        // 3. Prepare incoming new month card on top
         card.translationX = if (direction > 0) width else -width
-                card.alpha = 0.8f
+        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(0f)
-                    .alpha(1f)
+            .setDuration(duration)
-                    .setDuration(220)
             .setInterpolator(fluidInterpolator)
-                    .start()
+            .withEndAction {
+                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 {

app/src/main/java/com/example/shiftalarm/RootUtil.kt

@@ -1,46 +1,5 @@
 package com.example.shiftalarm
 
-import java.io.File
-
 object RootUtil {
-    fun isDeviceRooted(): Boolean {
+    fun isDeviceRooted(): Boolean = false
-        return checkRootMethod1() || checkRootMethod2() || checkRootMethod3()
-    }
-
-    private fun checkRootMethod1(): Boolean {
-        val buildTags = android.os.Build.TAGS
-        return buildTags != null && buildTags.contains("test-keys")
-    }
-
-    private fun checkRootMethod2(): Boolean {
-        val paths = arrayOf(
-            "/system/app/Superuser.apk",
-            "/sbin/su",
-            "/system/bin/su",
-            "/system/xbin/su",
-            "/data/local/xbin/su",
-            "/data/local/bin/su",
-            "/system/sd/xbin/su",
-            "/system/bin/failsafe/su",
-            "/data/local/su",
-            "/su/bin/su"
-        )
-        for (path in paths) {
-            if (File(path).exists()) return true
-        }
-        return false
-    }
-
-    private fun checkRootMethod3(): Boolean {
-        var process: Process? = null
-        return try {
-            process = Runtime.getRuntime().exec(arrayOf("/system/xbin/which", "su"))
-            val reader = process.inputStream.bufferedReader()
-            reader.readLine() != null
-        } catch (t: Throwable) {
-            false
-        } finally {
-            process?.destroy()
-        }
-    }
 }

app/src/main/res/drawable/bg_chip_soft_overtime.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#20FF3B30" />
+    <solid android:color="#205856D6" />
     <corners android:radius="12dp" />
     <stroke
         android:width="0.5dp"
-        android:color="#40FF3B30" />
+        android:color="#405856D6" />
 </shape>

app/src/main/res/drawable/bg_dismiss_samsung.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <gradient
+        android:type="radial"
+        android:gradientRadius="70dp"
+        android:startColor="#FF3B30"
+        android:endColor="#D70015" />
+    <stroke
+        android:width="2dp"
+        android:color="#80FFFFFF" />
+</shape>

app/src/main/res/drawable/bg_pulse_wave_samsung.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <gradient
+        android:type="radial"
+        android:gradientRadius="120dp"
+        android:startColor="#40FF3B30"
+        android:endColor="#00FF3B30" />
+</shape>

app/src/main/res/drawable/bg_snooze_hub_samsung.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="28dp" />
+    <solid android:color="#26FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#4DFFFFFF" />
+</shape>

app/src/main/res/drawable/ic_battery.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.67,4H15V2H9v2H7.33C6.6,4 6,4.6 6,5.33v15.33C6,21.4 6.6,22 7.33,22h9.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C18,4.6 17.4,4 16.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"/>
+</vector>

app/src/main/res/drawable/ic_fullscreen_intent.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,14H5v5h5v-2H7v-3zm-2,-4h2V7h3V5H5v5zm12,7h-3v2h5v-5h-2v3zM14,5v2h3v3h2V5h-5z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8.5c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5 3.5,-1.57 3.5,-3.5 -1.57,-3.5 -3.5,-3.5zm0,5.5c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>

app/src/main/res/layout/activity_alarm.xml

@@ -1,110 +1,164 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/alarmRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_mesh_gradient"
+    android:background="@drawable/bg_alarm_gradient"
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <!-- Header / Info Section -->
+    <!-- Top Shift / Alarm Label Pill Badge -->
     <LinearLayout
-        android:id="@+id/headerContainer"
+        android:id="@+id/shiftBadgeContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="40dp"
-        android:paddingHorizontal="32dp"
-        android:paddingVertical="16dp">
-
-        <TextView
-            android:id="@+id/tvCurrentTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:text="오후 2:59"
+        android:orientation="horizontal"
-            android:textSize="88sp"
+        android:gravity="center"
-            android:fontFamily="sans-serif-thin"
+        android:background="@drawable/bg_snooze_hub_samsung"
-            android:textColor="@color/white"
+        android:paddingHorizontal="16dp"
-            android:letterSpacing="0.02"/>
+        android:paddingVertical="6dp"
+        android:layout_marginTop="64dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
-        <TextView
+        <ImageView
-            android:id="@+id/tvDate"
+            android:layout_width="16dp"
-            android:layout_width="wrap_content"
+            android:layout_height="16dp"
-            android:layout_height="wrap_content"
+            android:src="@drawable/ic_alarm"
-            android:text="2월 14일 토요일"
+            app:tint="#FFFFFF"
-            android:textSize="26sp"
+            android:layout_marginEnd="6dp"/>
-            android:textColor="@color/white"
-            android:alpha="0.5"
-            android:layout_marginTop="16dp"/>
 
         <TextView
             android:id="@+id/tvShiftType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="[주간] 근무 알람"
+            android:text="[주간] 07:00 근무 알람"
-            android:textSize="16sp"
+            android:textSize="14sp"
-            android:textColor="@color/white"
+            android:textStyle="bold"
-            android:alpha="0.4"
+            android:textColor="#FFFFFF" />
-            android:layout_marginTop="8dp"/>
     </LinearLayout>
 
-    <!-- Center Control Area -->
+    <!-- Large Time Display (Samsung One UI Clock Typography) -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_below="@id/headerContainer"
-        android:paddingBottom="80dp"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <!-- Snooze Button (Glass style) -->
     <TextView
+        android:id="@+id/tvCurrentTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="07:00"
+        android:textSize="80sp"
+        android:fontFamily="sans-serif-light"
+        android:textColor="#FFFFFF"
+        android:letterSpacing="0.01"
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toBottomOf="@id/shiftBadgeContainer"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Date & Day Display -->
+    <TextView
+        android:id="@+id/tvDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2월 14일 토요일"
+        android:textSize="20sp"
+        android:textColor="#CCFFFFFF"
+        android:layout_marginTop="6dp"
+        app:layout_constraintTop_toBottomOf="@id/tvCurrentTime"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Middle: Snooze Hub / Capsule Button (Samsung One UI 8.5/9.0 Style) -->
+    <LinearLayout
         android:id="@+id/btnSnooze"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:paddingHorizontal="48dp"
+        android:orientation="horizontal"
-            android:paddingVertical="18dp"
+        android:gravity="center"
-            android:text="다시 울림"
+        android:background="@drawable/bg_snooze_hub_samsung"
-            android:textSize="22sp"
+        android:paddingHorizontal="36dp"
-            android:textColor="@color/white"
+        android:paddingVertical="16dp"
-            android:alpha="0.9"
-            android:background="@drawable/bg_glass_pill_v4"
         android:clickable="true"
-            android:focusable="true"/>
+        android:focusable="true"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintBottom_toTopOf="@id/dismissContainer"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
-        <!-- Stop Button Container with Pulse -->
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/ic_bell"
+            app:tint="#FFFFFF"
+            android:layout_marginEnd="10dp"/>
+
+        <TextView
+            android:id="@+id/tvSnoozeText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="다시 울림 (5분)"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:textColor="#FFFFFF" />
+    </LinearLayout>
+
+    <!-- Bottom: Dismiss (해제) Control with Expanding Breathing Wave -->
     <FrameLayout
-            android:layout_width="320dp"
+        android:id="@+id/dismissContainer"
-            android:layout_height="320dp"
+        android:layout_width="260dp"
-            android:layout_marginTop="20dp"
+        android:layout_height="260dp"
+        android:layout_marginBottom="54dp"
         android:clipChildren="false"
-            android:clipToPadding="false">
+        android:clipToPadding="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
-            <!-- Glowing Pulse View -->
+        <!-- Outer Glowing Pulse Wave -->
         <View
             android:id="@+id/pulseCircle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-                android:background="@drawable/bg_pulse_gradient"/>
+            android:background="@drawable/bg_pulse_wave_samsung" />
 
-            <!-- Dismiss Button -->
+        <!-- Inner Ambient Ring -->
-            <TextView
+        <View
-                android:id="@+id/btnDismiss"
+            android:id="@+id/ambientRing"
-                android:layout_width="200dp"
+            android:layout_width="160dp"
-                android:layout_height="200dp"
+            android:layout_height="160dp"
             android:layout_gravity="center"
+            android:background="@drawable/bg_pulse_wave_samsung" />
+
+        <!-- Samsung Style Dismiss Button (Tap or Swipe to dismiss) -->
+        <LinearLayout
+            android:id="@+id/btnDismiss"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:orientation="vertical"
             android:gravity="center"
-                android:text="해제"
+            android:background="@drawable/bg_dismiss_samsung"
-                android:textSize="34sp"
+            android:elevation="8dp"
-                android:textColor="@color/white"
-                android:background="@drawable/bg_dismiss_circle_v4"
             android:clickable="true"
-                android:focusable="true"/>
+            android:focusable="true">
-        </FrameLayout>
+
+            <ImageView
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:src="@drawable/ic_delete"
+                app:tint="#FFFFFF" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="해제"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFF"
+                android:layout_marginTop="2dp" />
         </LinearLayout>
+    </FrameLayout>
 
-
+</androidx.constraintlayout.widget.ConstraintLayout>
-</RelativeLayout>

app/src/main/res/layout/activity_main.xml

@@ -58,21 +58,34 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!-- Maximized Calendar Card -->
+    <!-- Maximized Calendar Card with Layered Stack Wrapper -->
-    <androidx.cardview.widget.CardView
+    <FrameLayout
-        android:id="@+id/calendarCard"
+        android:id="@+id/calendarWrapper"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginHorizontal="3dp"
         android:layout_marginBottom="8dp"
-        app:cardCornerRadius="28dp"
-        app:cardElevation="0dp"
-        app:cardBackgroundColor="@android:color/transparent"
         app:layout_constraintTop_toBottomOf="@id/headerRoot"
         app:layout_constraintBottom_toTopOf="@id/otherTeamsCard"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
+        <!-- Bottom Snapshot View (Underneath Card Stack) -->
+        <ImageView
+            android:id="@+id/calendarOverlaySnapshot"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:visibility="gone" />
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/calendarCard"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:cardCornerRadius="28dp"
+            app:cardElevation="0dp"
+            app:cardBackgroundColor="@android:color/transparent">
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/calendarContainer"
                 android:layout_width="match_parent"
@@ -269,7 +282,7 @@
                     android:textSize="10.5sp"
                     android:textStyle="bold"
                     android:gravity="center"
-                    android:textColor="@color/shift_red"
+                    android:textColor="#5856D6"
                     android:background="@drawable/bg_chip_soft_overtime"/>
             </LinearLayout>
 
@@ -301,6 +314,7 @@
                 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
+    </FrameLayout>
     
     <!-- Other Teams Compact Section -->
     <androidx.cardview.widget.CardView

app/src/main/res/layout/fragment_settings_basic.xml

@@ -175,8 +175,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_alarm"
+                            android:src="@drawable/ic_battery"
-                            app:tint="@color/shift_red"/>
+                            app:tint="#34C759"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -232,7 +232,7 @@
                             android:layout_height="20dp"
                             android:layout_gravity="center"
                             android:src="@drawable/ic_alarm"
-                            app:tint="@color/primary"/>
+                            app:tint="#007AFF"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -344,8 +344,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_bell"
+                            android:src="@drawable/ic_fullscreen_intent"
-                            app:tint="@color/primary"/>
+                            app:tint="#AF52DE"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -401,7 +401,7 @@
                             android:layout_height="20dp"
                             android:layout_gravity="center"
                             android:src="@drawable/ic_settings"
-                            app:tint="@color/text_tertiary"/>
+                            app:tint="#FF9500"/>
                     </FrameLayout>
 
                     <TextView

app/src/main/res/layout/item_day.xml

@@ -7,19 +7,41 @@
     android:layout_height="wrap_content"
     android:background="@drawable/bg_grid_cell_v4">
 
-    <!-- Day Number (top-left) -->
+    <!-- Top Row: Day Number & Small Shift Badge (shown when memo exists) -->
+    <LinearLayout
+        android:id="@+id/topBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="2dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <TextView
             android:id="@+id/dayNumber"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="4dp"
             android:text="12"
             android:textColor="@color/text_primary"
-        android:textSize="14sp"
+            android:textSize="13sp"
+            android:textStyle="bold" />
+
+        <!-- Small Shift Badge next to Day Number (shown when day has memo) -->
+        <TextView
+            android:id="@+id/tvShiftSmall"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginStart="3dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="주"
+            android:textSize="9.5sp"
             android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
+            android:textColor="@color/text_primary"
-        app:layout_constraintTop_toTopOf="parent" />
+            android:visibility="gone"/>
+    </LinearLayout>
 
     <!-- Tide Text (top-right) -->
     <TextView
@@ -27,7 +49,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="2dp"
         android:text="08:20"
         android:textColor="@color/text_tertiary"
         android:textSize="9sp"
@@ -35,15 +57,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <!-- Shift Abbreviation Circular Indicator (Center) -->
+    <!-- Standard Shift Abbreviation Circular Indicator (Center - shown when NO memo) -->
     <TextView
         android:id="@+id/shiftChar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-
         android:gravity="center"
         android:text="주"
-        android:textSize="15sp"
+        android:textSize="20sp"
         android:textStyle="bold"
         android:textColor="@color/text_primary"
         app:layout_constraintTop_toTopOf="parent"
@@ -52,25 +73,26 @@
         app:layout_constraintEnd_toEndOf="parent" 
         app:layout_constraintVertical_bias="0.45"/>
 
-    <!-- Memo Content Text (Below Shift) - Max 3 lines -->
+    <!-- Memo Content Text (Center/Body) - Up to 4 lines when memo exists -->
     <TextView
         android:id="@+id/memoContent"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:gravity="center"
-        android:text="메모내용"
+        android:text="메모내용\n2줄\n3줄\n4줄"
         android:textSize="9.5sp"
         android:textColor="@color/secondary"
-        android:maxLines="3"
+        android:lineSpacingMultiplier="1.05"
+        android:maxLines="4"
         android:ellipsize="end"
         android:visibility="gone"
+        android:layout_marginHorizontal="2dp"
         android:layout_marginTop="1dp"
         android:layout_marginBottom="1dp"
-        android:paddingHorizontal="2dp"
+        app:layout_constraintTop_toBottomOf="@id/topBar"
-        app:layout_constraintTop_toBottomOf="@id/shiftChar"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
-        app:layout_constraintBottom_toTopOf="@id/memoIndicator"/>
 
     <!-- Holiday Name Small (Bottom) -->
     <TextView
@@ -80,23 +102,10 @@
         android:text="설날"
         android:textSize="9sp"
         android:textColor="@color/shift_red"
-        android:layout_marginBottom="2dp"
+        android:layout_marginBottom="1dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/memoIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <!-- Memo Indicator (bottom-right) -->
-    <ImageView
-        android:id="@+id/memoIndicator"
-        android:layout_width="12dp"
-        android:layout_height="12dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
-        android:src="@drawable/ic_memo"
-        app:tint="@color/secondary"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

scratch/release.py

@@ -6,32 +6,22 @@ import shutil
 
 token = "e3b515eaa0a6683c921ca3bf718e281ed30a6075"
 owner_repo = "sanjeok77/ShiftRing"
-tag = "v1.0.0"
+tag = "v1.0.5"
-title = "v1.0.0 - ShiftRing 정식 첫 릴리즈"
+title = "v1.0.5 - 메모 아이콘 정리, 삼성 One UI 8.5/9.0 알람 화면 리디자인, 달력 초기 깜빡임 해소 및 카드 스택 레이어 전환 애니메이션 적용"
-body = """## 🚀 ShiftRing v1.0.0 정식 첫 릴리즈
+body = """## 🚀 ShiftRing v1.0.5 릴리즈
 
-현대자동차 / 다양한 교대근무자를 위한 스마트 교대근무 캘린더 & 맞춤 알람 솔루션
+### 🌟 주요 변경 및 개선 사항
-
+1. **하루 메모 불필요한 하단 아이콘 제거 (`item_day.xml`, `CalendarAdapter.kt`)**:
-### 🌟 주요 기능 및 탑재 사항
+   - 메모 텍스트가 이미 상단/중앙에 4줄로 표시되므로 중복되던 하단 메모/수정 아이콘을 깔끔하게 제거하여 셀 공간 최적화
-1. **One UI 8.5 라운드 카드 디자인 시스템**:
+2. **알람 울림/해제 화면 삼성 One UI 8.5/9.0 최신 디자인 전면 개편 (`activity_alarm.xml`, `AlarmActivity.kt`)**:
-   - 24dp 라운드 카드, 36dp 스퀘어클 Soft-tint 아이콘 시스템
+   - 상단 근무 라벨 뱃지 + 대형 현대적 시계 타이포그래피 + 날짜 정보 일원화
-   - 20dp 라운드 팝업창 및 12dp 알약 선택자 One UI 드롭다운(Spinner) 전면 통일
+   - 중앙 와이드 글래스 캡슐 허브 다시 울림(스누즈) 버튼 탑재
-2. **대한민국 법정 대체공휴일 100% 정밀 수식**:
+   - 하단 듀얼 펄스 웨이브 앰비언트 글로우 및 옴니 다이렉션 스와이프/탭 해제 컨트롤 적용
-   - 대통령령 관공서 공휴일 개정안 정밀 적용 (현충일/신정 제외, 주요 공휴일 및 설날/추석 대체공휴일 연동)
+3. **앱 초기 실행 시 달력 화면 깜빡임(Flicker) 완벽 해소 (`MainActivity.kt`)**:
-3. **이달의 누적 연장근무 복합 정산**:
+   - `RecyclerView` 불필요한 기본 애니메이터 제거 및 어댑터/행 높이 재계산 로직 최적화로 초기 진입 시 잔상 없이 즉각 로딩
-   - 토요일 기본 특근(2h) + 주맞(4h) + 야맞(4h) + 교육(2h) 자동 누적 합산
+4. **달력 월간 이동 시 카드 스택(Card Stack) 레이어 전환 애니메이션 구현 (`MainActivity.kt`, `activity_main.xml`)**:
-4. **알람 하이브리드 그룹화 & 순서 자동 정렬**:
+   - 이전 달 화면이 하단에 베이스로 자연스럽게 깔리고(0.94x 축소 및 0.35 알파 페이드), 새 달 카드가 상단에서 부드럽게 감속 슬라이드 오버되는 끊김 없는 유체 모션 적용
-   - `주간(주) -> 석간(석) -> 야간(야) -> 주간 맞교대(주맞) -> 야간 맞교대(야맞) -> 기타` 고정 정렬
+5. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
-   - 그룹 마스터 On/Off 스위치 및 아코디언 접기/펼치기
-   - 6개 근무 선택(주/석/야/주맞/야맞/기타), 알람 라벨 및 15분전 사전 알림 지원
-5. **삼성 캘린더 동일 수평 유체 슬라이드 모션 & 요약 칩 바**:
-   - 삼성 One UI 8.5 캘린더 동일 전체 폭 수평 슬라이드 애니메이션 (`PathInterpolator(0.22, 1, 0.36, 1)`)
-   - 실시간 요약 칩 바 (`주간 N일 | 석간 N일 | 야간 N일 | 연장 N시간`)
-   - 하루 메모 3줄 직관 표시 및 달력 5줄 고정 / 6줄 스크롤 최적화
-   - 상단 알람 시간 단일행 간결 표시 (`오늘: 07:00 | 내일: 15:00`)
-6. **배터리 최적화 4-Tier 다중 폴백 & One UI 업데이트 다이얼로그**:
-   - Samsung Device Care 연동 및 부드러운 프로그레스 애니메이션
-7. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
 
 apk_path = "app/build/outputs/apk/release/app-release.apk"
 if not os.path.exists(apk_path):
@@ -44,7 +34,7 @@ print(f"Using APK at: {apk_path}")
 url = f"https://git.webpluss.net/api/v1/repos/{owner_repo}/releases"
 headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
 
-data = json.dumps({"tag_name": tag, "name": title, "body": body, "draft": False, "prerelease": False}).encode()
+data = json.dumps({"tag_name": tag, "name": title, "body": body, "draft": False, "prerelease": False}).encode('utf-8')
 req = urllib.request.Request(url, data=data, headers=headers, method="POST")
 with urllib.request.urlopen(req) as response:
     result = json.loads(response.read())
@@ -69,14 +59,25 @@ print("Updated app.apk at project root.")
 
 # Update version.json
 v_info = {
-    "versionCode": 100,
+    "versionCode": 105,
-    "versionName": "1.0.0",
+    "versionName": "1.0.5",
     "apkUrl": direct_url,
-    "changelog": "v1.0.0: ShiftRing 정식 첫 릴리즈 - One UI 8.5 디자인 시스템, 교대근무 캘린더, 맞춤 알람 및 법정 공휴일/연장근무 자동 계산",
+    "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
     "forceUpdate": False
 }
 with open("version.json", "w", encoding="utf-8") as f:
     json.dump(v_info, f, ensure_ascii=False, indent=2)
 
 print(f"Updated version.json with apkUrl: {direct_url}")
+
+# Git commit and push cleanly in UTF-8
+git_path = r"C:\Users\work\AppData\Roaming\MobaXterm\slash\mx86_64b\bin"
+os.environ["PATH"] = git_path + os.pathsep + os.environ.get("PATH", "")
+
+commit_msg = "v1.0.5 - 메모 아이콘 정리, 삼성 One UI 최신 알람 화면 개편, 달력 깜빡임 해소 및 카드 스택 전환 애니메이션 적용"
+subprocess.run(["git", "add", "."], check=True)
+subprocess.run(["git", "commit", "-m", commit_msg], check=True)
+subprocess.run(["git", "push", "origin", "main"], check=True)
+
+print("Git commit and push completed successfully!")
 print(f"Release {tag} process finished!")

version.json

@@ -1,7 +1,7 @@
 {
-  "versionCode": 100,
+  "versionCode": 105,
-  "versionName": "1.0.0",
+  "versionName": "1.0.5",
-  "apkUrl": "https://git.webpluss.net/attachments/b1ec7eac-997c-4a33-bbb5-91a0f11ce9cf",
+  "apkUrl": "https://git.webpluss.net/attachments/b03485a6-cae4-471d-81c0-4f6288d3aa9f",
-  "changelog": "v1.0.0: ShiftRing 정식 첫 릴리즈 - One UI 8.5 디자인 시스템, 교대근무 캘린더, 맞춤 알람 및 법정 공휴일/연장근무 자동 계산",
+  "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
   "forceUpdate": false
 }