v1.1.2 - 하루 메모 키보드 가림 완벽 개선 (상단 즉시 저장 버튼, 뒤로가기 시 자동 저장 및 스크롤 지원)

app/build.gradle.kts

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

app/src/main/AndroidManifest.xml

@@ -6,17 +6,15 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     
     <!-- Alarm & Full Screen -->
     <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" />
 
     <!-- Service & Notification -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <application
         android:allowBackup="true"
@@ -42,12 +40,11 @@
             android:name=".AlarmActivity" 
             android:exported="false"
             android:excludeFromRecents="true"
-            android:taskAffinity=""
             android:theme="@style/Theme.AppCompat.NoActionBar"
             android:showWhenLocked="true"
             android:turnScreenOn="true"
             android:screenOrientation="portrait"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:documentLaunchMode="never"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:allowEmbedded="false"
@@ -94,12 +91,8 @@
 
         <service
             android:name=".AlarmForegroundService"
-            android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="mediaPlayback"
-            android:exported="false">
+            android:exported="false" />
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="Alarm playback and ringing notification" />
-        </service>
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -110,6 +103,7 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+
     </application>
 
 </manifest>

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

@@ -71,11 +71,18 @@ class AlarmForegroundService : Service() {
 
         // 4. Foreground 시작
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // Android 14+
-            startForeground(NOTIFICATION_ID, notification, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            startForeground(NOTIFICATION_ID, notification, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
         } else {
             startForeground(NOTIFICATION_ID, notification)
         }
 
+        // 5. 사용 중일 때도 즉시 전체화면 AlarmActivity 화면 띄우기
+        try {
+            startActivity(fullScreenIntent)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
         return START_NOT_STICKY
     }
 

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

@@ -17,9 +17,43 @@ import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import kotlinx.coroutines.*
 
 object AlarmPermissionUtil {
 
+    private var monitorJob: Job? = null
+
+    /**
+     * 시스템 설정 화면에서 사용자가 권한을 허용했을 때 뒤로가기를 누르지 않아도 앱으로 즉시 자동 복귀시킵니다.
+     */
+    fun monitorAndAutoReturn(activity: Activity, isGrantedCheck: () -> Boolean) {
+        monitorJob?.cancel()
+        monitorJob = CoroutineScope(Dispatchers.Main).launch {
+            delay(1000) // 설정 화면 전환 시간 대기
+            var count = 0
+            while (count < 150 && isActive) { // 최대 60초간 500ms 주기로 체크
+                delay(500)
+                count++
+                if (isGrantedCheck()) {
+                    try {
+                        val returnIntent = Intent(activity, SettingsActivity::class.java).apply {
+                            flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_SINGLE_TOP
+                        }
+                        activity.startActivity(returnIntent)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                    break
+                }
+            }
+        }
+    }
+
+    fun cancelAutoReturn() {
+        monitorJob?.cancel()
+        monitorJob = null
+    }
+
     /**
      * 전체 권한 상태를 확인하고 필요한 경우 통합 안내 다이얼로그를 표시합니다.
      */

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

@@ -81,32 +81,20 @@ class AlarmReceiver : BroadcastReceiver() {
 
             Log.d(TAG, "ForegroundService 시작 완료")
 
-            // 2. AlarmActivity 직접 실행 (알람 화면 표시)
+            // 2. AlarmActivity 직접 즉시 실행 (사용 중일 때도 전체화면 알람 창 띄우기)
             val activityIntent = Intent(context, AlarmActivity::class.java).apply {
                 putExtra("EXTRA_SHIFT", intent?.getStringExtra("EXTRA_SHIFT") ?: "근무")
                 putExtra("EXTRA_SOUND", intent?.getStringExtra("EXTRA_SOUND"))
                 putExtra("EXTRA_SNOOZE", intent?.getIntExtra("EXTRA_SNOOZE", 5) ?: 5)
                 putExtra("EXTRA_SNOOZE_REPEAT", intent?.getIntExtra("EXTRA_SNOOZE_REPEAT", 3) ?: 3)
-                // 중요: 새 태스크로 실행 (FLAG_ACTIVITY_NEW_TASK)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                // 기존 인스턴스 재사용 및 최상위로 가져오기
-                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                // 잠금 화면 위에 표시
-                addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
-                // 화면 켜기
-                addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
             }
-            
-            // 지연 후 Activity 시작 (ForegroundService가 알림을 먼저 표시하도록)
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
             try {
                 context.startActivity(activityIntent)
-                    Log.d(TAG, "AlarmActivity 실행 완료")
+                Log.d(TAG, "AlarmActivity 즉시 실행 완료")
             } catch (e: Exception) {
                 Log.e(TAG, "AlarmActivity 실행 실패", e)
             }
-            }, 500)
             
         } catch (e: Exception) {
             Log.e(TAG, "알람 실행 실패", e)

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

@@ -187,21 +187,19 @@ class FragmentSettingsAdditional : Fragment() {
             }
         }
 
+        // 1. 개별 근무/알람 설정 전체 삭제
         binding.btnResetOverrides.setOnClickListener {
             androidx.appcompat.app.AlertDialog.Builder(requireContext())
-                .setTitle("데이터 초기화")
+                .setTitle("개별 근무/알람 설정 전체 삭제")
-                .setMessage("달력에서 개별적으로 바꾼 모든 근무와 알람 설정이 삭제됩니다. 계속하시겠습니까?")
+                .setMessage("달력에서 개별 변경한 모든 근무와 알람 일정이 삭제되고 기본값으로 복원됩니다. 계속하시겠습니까?")
-                .setPositiveButton("초기화") { _, _ ->
+                .setPositiveButton("삭제") { _, _ ->
                     lifecycleScope.launch {
                         try {
                             val db = AppDatabase.getDatabase(requireContext())
                             val dao = db.shiftDao()
                             dao.clearOverrides()
-                            
-                            // Immediately re-sync all alarms
                             syncAllAlarms(requireContext())
-                            
+                            Toast.makeText(requireContext(), "개별 근무 및 알람 설정이 초기화되었습니다.", Toast.LENGTH_SHORT).show()
-                            Toast.makeText(requireContext(), "모든 개별 설정이 삭제되고 알람이 재설정되었습니다.", Toast.LENGTH_SHORT).show()
                         } catch (e: Exception) {
                             Toast.makeText(requireContext(), "초기화 실패: ${e.message}", Toast.LENGTH_LONG).show()
                         }
@@ -210,6 +208,75 @@ class FragmentSettingsAdditional : Fragment() {
                 .setNegativeButton("취소", null)
                 .show()
         }
+
+        // 2. 개별 근무 삭제
+        binding.btnResetShifts.setOnClickListener {
+            androidx.appcompat.app.AlertDialog.Builder(requireContext())
+                .setTitle("개별 근무 삭제")
+                .setMessage("달력에서 개별 변경한 교대근무 일정만 삭제되고 기본 근무표로 복원됩니다. 계속하시겠습니까?")
+                .setPositiveButton("삭제") { _, _ ->
+                    lifecycleScope.launch {
+                        try {
+                            val db = AppDatabase.getDatabase(requireContext())
+                            val dao = db.shiftDao()
+                            dao.clearOverrides()
+                            syncAllAlarms(requireContext())
+                            Toast.makeText(requireContext(), "개별 근무 변경 내역이 초기화되었습니다.", Toast.LENGTH_SHORT).show()
+                        } catch (e: Exception) {
+                            Toast.makeText(requireContext(), "초기화 실패: ${e.message}", Toast.LENGTH_LONG).show()
+                        }
+                    }
+                }
+                .setNegativeButton("취소", null)
+                .show()
+        }
+
+        // 3. 알람 삭제
+        binding.btnResetAlarms.setOnClickListener {
+            androidx.appcompat.app.AlertDialog.Builder(requireContext())
+                .setTitle("알람 삭제")
+                .setMessage("등록된 모든 사용자 지정 알람이 삭제되고 기본 알람으로 초기화됩니다. 계속하시겠습니까?")
+                .setPositiveButton("삭제") { _, _ ->
+                    lifecycleScope.launch {
+                        try {
+                            val db = AppDatabase.getDatabase(requireContext())
+                            val dao = db.shiftDao()
+                            dao.clearCustomAlarms()
+                            syncAllAlarms(requireContext())
+                            Toast.makeText(requireContext(), "등록된 알람이 모두 삭제되었습니다.", Toast.LENGTH_SHORT).show()
+                        } catch (e: Exception) {
+                            Toast.makeText(requireContext(), "삭제 실패: ${e.message}", Toast.LENGTH_LONG).show()
+                        }
+                    }
+                }
+                .setNegativeButton("취소", null)
+                .show()
+        }
+
+        // 4. 전체 삭제 (완전 초기화)
+        binding.btnResetAll.setOnClickListener {
+            androidx.appcompat.app.AlertDialog.Builder(requireContext())
+                .setTitle("전체 데이터 초기화")
+                .setMessage("⚠️ 주의: 메모, 연차, 개별 근무, 알람을 포함한 모든 앱 데이터가 완전히 초기화됩니다.\n\n정말 전체 데이터를 초기화하시겠습니까?")
+                .setPositiveButton("전체 초기화") { _, _ ->
+                    lifecycleScope.launch {
+                        try {
+                            val db = AppDatabase.getDatabase(requireContext())
+                            val dao = db.shiftDao()
+                            dao.clearOverrides()
+                            dao.clearMemos()
+                            dao.clearCustomAlarms()
+                            dao.clearAnnualLeave()
+                            syncAllAlarms(requireContext())
+                            Toast.makeText(requireContext(), "모든 데이터가 완전히 초기화되었습니다.", Toast.LENGTH_LONG).show()
+                        } catch (e: Exception) {
+                            Toast.makeText(requireContext(), "전체 초기화 실패: ${e.message}", Toast.LENGTH_LONG).show()
+                        }
+                    }
+                }
+                .setNegativeButton("취소", null)
+                .show()
+        }
     }
 
     

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

@@ -134,32 +134,72 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
     }
 
     private val soundTitleCache = mutableMapOf<String?, String>()
+    private var isUpdatingMasterSwitch = false
 
     private fun updateMasterToggleUI(isEnabled: Boolean) {
+        if (_binding == null) return
+        isUpdatingMasterSwitch = true
+        binding.masterSwitch.isChecked = isEnabled
+        isUpdatingMasterSwitch = false
+
         if (isEnabled) {
             binding.tvMasterStatus.text = "전체 알람 켜짐"
-            binding.tvMasterStatus.setTextColor(ContextCompat.getColor(requireContext(), R.color.primary))
+            binding.tvMasterStatus.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_primary))
-            binding.tvMasterStatus.backgroundTintList = android.content.res.ColorStateList.valueOf(Color.parseColor("#E3F2FD"))
+            binding.ivMasterBell.imageTintList = android.content.res.ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.primary))
         } else {
             binding.tvMasterStatus.text = "전체 알람 꺼짐"
-            binding.tvMasterStatus.setTextColor(ContextCompat.getColor(requireContext(), R.color.shift_red))
+            binding.tvMasterStatus.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_secondary))
-            binding.tvMasterStatus.backgroundTintList = android.content.res.ColorStateList.valueOf(Color.parseColor("#FFEBEE"))
+            binding.ivMasterBell.imageTintList = android.content.res.ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.text_secondary))
         }
     }
 
+    private fun showMasterAlarmOffConfirmationDialog() {
+        val prefs = requireContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+        androidx.appcompat.app.AlertDialog.Builder(requireContext())
+            .setTitle("전체 알람 끄기")
+            .setMessage("전체 알람을 끄시겠습니까?\n모든 교대근무 알람 및 개별 알람이 정시에 울리지 않게 됩니다.")
+            .setPositiveButton("끄기") { _, _ ->
+                prefs.edit().putBoolean("master_alarm_enabled", false).apply()
+                updateMasterToggleUI(false)
+                Toast.makeText(requireContext(), "전체 알람이 꺼졌습니다.", Toast.LENGTH_SHORT).show()
+                lifecycleScope.launch { syncAllAlarms(requireContext()) }
+            }
+            .setNegativeButton("취소") { dialog, _ ->
+                // 스위치 원래대로 ON 복귀
+                isUpdatingMasterSwitch = true
+                binding.masterSwitch.isChecked = true
+                isUpdatingMasterSwitch = false
+                dialog.dismiss()
+            }
+            .setOnCancelListener {
+                // 바깥 터치 시에도 원래대로 ON 복귀
+                isUpdatingMasterSwitch = true
+                binding.masterSwitch.isChecked = true
+                isUpdatingMasterSwitch = false
+            }
+            .show()
+    }
+
     private fun setupListeners() {
         val prefs = requireContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
-        binding.tvMasterStatus.setOnClickListener {
+        binding.masterAlarmCard.setOnClickListener {
-            val isEnabled = !ShiftAlarmDefaults.isMasterAlarmEnabled(prefs)
+            binding.masterSwitch.performClick()
-            prefs.edit().putBoolean("master_alarm_enabled", isEnabled).apply()
+        }
-            updateMasterToggleUI(isEnabled)
 
-            val message = if (isEnabled) "전체 알람이 켜졌습니다." else "전체 알람이 꺼졌습니다."
+        binding.masterSwitch.setOnCheckedChangeListener { _, isChecked ->
-            Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+            if (isUpdatingMasterSwitch) return@setOnCheckedChangeListener
 
-            // Resync immediately
+            if (isChecked) {
+                // 바로 켜기
+                prefs.edit().putBoolean("master_alarm_enabled", true).apply()
+                updateMasterToggleUI(true)
+                Toast.makeText(requireContext(), "전체 알람이 켜졌습니다.", Toast.LENGTH_SHORT).show()
                 lifecycleScope.launch { syncAllAlarms(requireContext()) }
+            } else {
+                // 끌 때는 모달 확인 팝업
+                showMasterAlarmOffConfirmationDialog()
+            }
         }
 
         binding.btnAddCustomAlarm.setOnClickListener {

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

@@ -193,6 +193,7 @@ class FragmentSettingsBasic : Fragment() {
 
     override fun onResume() {
         super.onResume()
+        AlarmPermissionUtil.cancelAutoReturn()
         updatePermissionStatuses()
     }
 
@@ -232,31 +233,56 @@ class FragmentSettingsBasic : Fragment() {
         val prefs = requireContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
         binding.btnBatteryOptimize.setOnClickListener {
-            AlarmPermissionUtil.requestBatteryOptimization(requireContext())
+            val isAlreadyGranted = AlarmPermissionUtil.getBatteryOptimizationStatus(requireContext())
+            AlarmPermissionUtil.requestBatteryOptimization(requireActivity())
+            if (!isAlreadyGranted) {
+                AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                    AlarmPermissionUtil.getBatteryOptimizationStatus(requireContext())
+                }
+            }
         }
 
         binding.btnExactAlarm.setOnClickListener {
              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                val isAlreadyGranted = AlarmPermissionUtil.getExactAlarmStatus(requireContext())
                 val intent = Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM).apply {
                     data = Uri.parse("package:${requireContext().packageName}")
                 }
-                startActivity(intent)
+                requireActivity().startActivity(intent)
+                if (!isAlreadyGranted) {
+                    AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                        AlarmPermissionUtil.getExactAlarmStatus(requireContext())
+                    }
+                }
             }
         }
 
         binding.btnOverlayPermission.setOnClickListener {
-            AlarmPermissionUtil.requestOverlayPermission(requireContext())
+            val isAlreadyGranted = AlarmPermissionUtil.getOverlayStatus(requireContext())
+            AlarmPermissionUtil.requestOverlayPermission(requireActivity())
+            if (!isAlreadyGranted) {
+                AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                    AlarmPermissionUtil.getOverlayStatus(requireContext())
+                }
+            }
         }
 
         binding.btnFullScreenIntent.setOnClickListener {
-            AlarmPermissionUtil.requestFullScreenIntentPermission(requireContext())
+            val isAlreadyGranted = AlarmPermissionUtil.getFullScreenIntentStatus(requireContext())
+            AlarmPermissionUtil.requestFullScreenIntentPermission(requireActivity())
+            if (!isAlreadyGranted) {
+                AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                    AlarmPermissionUtil.getFullScreenIntentStatus(requireContext())
+                }
+            }
         }
 
         binding.btnPermissionSettings.setOnClickListener {
+            // 앱 정보 상세 설정 화면은 일반 열람용이므로 자동 복귀를 걸지 않음
             val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                 data = Uri.parse("package:${requireContext().packageName}")
             }
-            startActivity(intent)
+            requireActivity().startActivity(intent)
         }
 
         binding.btnCheckUpdate.setOnClickListener {

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

@@ -63,9 +63,7 @@ class MainActivity : AppCompatActivity() {
 
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val density = resources.displayMetrics.density
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            val p = (8 * density).toInt()
-            v.setPadding(systemBars.left + p, systemBars.top + p, systemBars.right + p, systemBars.bottom + p)
             insets
         }
 
@@ -270,15 +268,12 @@ class MainActivity : AppCompatActivity() {
         updateCalendar()
     }
 
-    private fun updateCalendar() {
+    private suspend fun loadCalendarDataForMonth(targetMonth: YearMonth) {
         val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         val selectedTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
         val factory = prefs.getString("selected_factory", "Jeonju") ?: "Jeonju"
-        
-        // Today's Shift
         val today = LocalDate.now(ShiftCalculator.SEOUL_ZONE)
         
-        lifecycleScope.launch {
         val db = AppDatabase.getDatabase(this@MainActivity)
         val dao = db.shiftDao()
         val repo = ShiftRepository(this@MainActivity)
@@ -296,7 +291,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         // Load overrides and memos for the month
-            val monthStr = currentViewMonth.toString()
+        val monthStr = targetMonth.toString()
         val overrides = withContext(Dispatchers.IO) { 
             dao.getOverridesForMonth(factory, currentViewTeam, monthStr).associateBy { overrideItem -> overrideItem.date }
         }
@@ -304,7 +299,7 @@ class MainActivity : AppCompatActivity() {
             dao.getMemosForMonth(monthStr).associateBy { memoItem -> memoItem.date }
         }
 
-            val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos)
+        val days = generateDaysForMonthWithData(targetMonth, currentViewTeam, factory, overrides, memos)
 
         val availableHeight = binding.calendarGrid.height
         val calcRowHeight = if (availableHeight > 0) availableHeight / 5 else 0
@@ -331,7 +326,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-            binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
+        binding.monthTitle.text = targetMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
         if (calcRowHeight == 0) {
             binding.calendarGrid.post {
@@ -350,13 +345,46 @@ class MainActivity : AppCompatActivity() {
 
         // Update Header Status Text with Permission Warning if needed
         val shiftForViewingTeam = withContext(Dispatchers.IO) { repo.getShift(today, currentViewTeam, factory) }
-            val teamSuffix = if (currentViewTeam == selectedTeam) " (내 반)" else " (${currentViewTeam}반)"
+        val teamSuffix = if (currentViewTeam == selectedTeam) "" else " (${currentViewTeam}반)"
         
         if (currentViewTeam == selectedTeam && !AlarmPermissionUtil.getExactAlarmStatus(this@MainActivity)) {
             binding.todayStatusText.text = "⚠️ 정확한 알람 권한이 필요합니다 (설정 필요)"
             binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.warning_red))
         } else {
-                binding.todayStatusText.text = "오늘의 근무: $shiftForViewingTeam$teamSuffix"
+            val prefix = "오늘의 근무: "
+            val fullText = "$prefix$shiftForViewingTeam$teamSuffix"
+            val spannable = android.text.SpannableStringBuilder(fullText)
+            
+            val shiftColorRes = when (shiftForViewingTeam) {
+                "주간", "주" -> R.color.shift_ju
+                "석간", "석" -> R.color.shift_seok
+                "야간", "야" -> R.color.shift_ya
+                "주간 맞교대" -> R.color.shift_jumat
+                "야간 맞교대" -> R.color.shift_yamat
+                "휴무", "휴가" -> R.color.shift_off
+                "월차", "연차" -> R.color.secondary
+                "반월", "반년" -> R.color.shift_red
+                "교육" -> R.color.primary
+                else -> R.color.text_primary
+            }
+            val shiftColor = androidx.core.content.ContextCompat.getColor(this@MainActivity, shiftColorRes)
+            val startIndex = prefix.length
+            val endIndex = startIndex + shiftForViewingTeam.length
+            
+            spannable.setSpan(
+                android.text.style.ForegroundColorSpan(shiftColor),
+                startIndex,
+                endIndex,
+                android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            spannable.setSpan(
+                android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
+                startIndex,
+                endIndex,
+                android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            
+            binding.todayStatusText.text = spannable
             binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary))
         }
 
@@ -372,16 +400,22 @@ class MainActivity : AppCompatActivity() {
         val juCount = days.count { it.date != null && (it.shift == "주간" || it.shift == "주") }
         val seokCount = days.count { it.date != null && (it.shift == "석간" || it.shift == "석") }
         val yaCount = days.count { it.date != null && (it.shift == "야간" || it.shift == "야") }
-            val monthlyOvertime = withContext(Dispatchers.IO) { repo.getMonthlyOvertimeHours(currentViewMonth) }
+        val monthlyOvertime = withContext(Dispatchers.IO) { repo.getMonthlyOvertimeHours(targetMonth) }
 
         binding.chipJu.text = "주간 ${juCount}일"
         binding.chipSeok.text = "석간 ${seokCount}일"
         binding.chipYa.text = "야간 ${yaCount}일"
         binding.chipOvertime.text = "연장 ${monthlyOvertime}h"
-        }
+
         updateOtherTeamsLayout(today, factory, prefs)
     }
 
+    private fun updateCalendar() {
+        lifecycleScope.launch {
+            loadCalendarDataForMonth(currentViewMonth)
+        }
+    }
+
     private fun updateOtherTeamsLayout(today: LocalDate, factory: String, prefs: android.content.SharedPreferences) {
         val teamColors = mapOf(
             "A" to R.color.team_a_color,
@@ -623,6 +657,20 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        val saveAndCloseMemo = {
+            val content = etMemo.text.toString().trim()
+            lifecycleScope.launch {
+                repo.setMemo(date, content)
+                updateCalendar()
+            }
+            dialog.dismiss()
+        }
+
+        dialogView.findViewById<android.view.View>(R.id.btnQuickSaveMemo).setOnClickListener {
+            saveAndCloseMemo()
+            Toast.makeText(this@MainActivity, "메모가 저장되었습니다.", Toast.LENGTH_SHORT).show()
+        }
+
         dialogView.findViewById<android.view.View>(R.id.btnClearMemo).setOnClickListener {
             etMemo.setText("")
             lifecycleScope.launch {
@@ -633,15 +681,22 @@ class MainActivity : AppCompatActivity() {
         }
 
         dialogView.findViewById<android.view.View>(R.id.btnClose).setOnClickListener {
-            lifecycleScope.launch {
+            saveAndCloseMemo()
+        }
+
+        // Auto-save when dialog is dismissed (e.g., Back key or touching outside)
+        dialog.setOnDismissListener {
             val content = etMemo.text.toString().trim()
+            lifecycleScope.launch {
                 repo.setMemo(date, content)
                 updateCalendar()
-                dialog.dismiss()
             }
         }
 
         dialog.show()
+
+        // Keyboard adjust resize
+        dialog.window?.setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
     }
     
     private suspend fun handleDaySettingAction(date: LocalDate, selected: String, team: String, factory: String) {
@@ -751,12 +806,14 @@ class MainActivity : AppCompatActivity() {
         val snapshot = binding.calendarOverlaySnapshot
         val width = card.width.toFloat()
 
-        if (width == 0f) {
+        val nextMonth = if (direction > 0) {
-            currentViewMonth = if (direction > 0) {
             currentViewMonth.plusMonths(1)
         } else {
             currentViewMonth.minusMonths(1)
         }
+
+        if (width == 0f) {
+            currentViewMonth = nextMonth
             updateCalendar()
             return
         }
@@ -778,36 +835,28 @@ class MainActivity : AppCompatActivity() {
             Log.w("MainActivity", "Failed to capture snapshot for month transition", e)
         }
 
-        // 2. Update to new month immediately
+        // 2. Position top card offscreen before loading
-        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
+        currentViewMonth = nextMonth
-        card.cardElevation = dpToPx(8f).toFloat()
+
+        // 3. Load next month's data BEFORE starting slide animation to eliminate any flicker
+        lifecycleScope.launch {
+            loadCalendarDataForMonth(currentViewMonth)
 
             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)
                 .setDuration(duration)
                 .setInterpolator(fluidInterpolator)
                 .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)
@@ -817,6 +866,7 @@ class MainActivity : AppCompatActivity() {
                 .setInterpolator(fluidInterpolator)
                 .start()
         }
+    }
 
     private fun formatRemainingDays(days: Float): String {
         return if (days == days.toInt().toFloat()) {

app/src/main/res/drawable/ic_factory.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="M12,7V3H2v18h20V7H12zM6,19H4v-2h2v2zm0,-4H4v-2h2v2zm0,-4H4V9h2v2zm0,-4H4V5h2v2zm4,12H8v-2h2v2zm0,-4H8v-2h2v2zm0,-4H8V9h2v2zm0,-4H8V5h2v2zm10,12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2,-8h-2v2h2V11zm0,4h-2v2h2v-2z"/>
+</vector>

app/src/main/res/drawable/ic_layers.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="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9.07l-9,-7 -9,7 1.63,1.2L12,16z"/>
+</vector>

app/src/main/res/drawable/ic_palette.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="M12,3c-4.97,0 -9,4.03 -9,9 0,2.12 0.74,4.07 1.97,5.61L4.35,18.4c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l0.79,-0.79C8.07,20.26 10.02,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-5.5,9c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zm3,-4C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zm5,0c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zm3,4c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>

app/src/main/res/drawable/ic_share.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="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92z"/>
+</vector>

app/src/main/res/drawable/ic_tide.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="M12,2c-5.33,4.55 -8,8.48 -8,11.8c0,4.98 3.8,8.2 8,8.2s8,-3.22 8,-8.2c0,-3.32 -2.67,-7.25 -8,-11.8zM12,20c-3.31,0 -6,-2.63 -6,-6.2c0,-2.36 1.83,-5.3 6,-9.05c4.17,3.75 6,6.69 6,9.05c0,3.57 -2.69,6.2 -6,6.2z"/>
+</vector>

app/src/main/res/drawable/ic_update.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="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79s7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,2.49 -0.95,4.83 -2.73,6.6 -3.76,3.73 -9.85,3.73 -13.6,0 -3.76,-3.73 -3.76,-9.78 0,-13.51 3.76,-3.73 9.84,-3.73 13.6,0L21,2.42v7.7z"/>
+</vector>

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

@@ -12,8 +12,8 @@
         android:id="@+id/headerRoot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
+        android:paddingTop="2dp"
-        android:paddingBottom="8dp"
+        android:paddingBottom="4dp"
         android:paddingHorizontal="20dp"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -35,7 +35,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="오늘의 근무"
-            android:textSize="13sp"
+            android:textSize="18sp"
+            android:textStyle="bold"
             android:textColor="@color/text_secondary"
             android:fontFamily="sans-serif-medium"
             android:layout_marginStart="12dp"

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

@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:paddingTop="32dp"
+        android:paddingTop="4dp"
-        android:paddingBottom="16dp"
+        android:paddingBottom="8dp"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         app:layout_constraintTop_toTopOf="parent"

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

@@ -7,6 +7,12 @@
     app:cardElevation="8dp"
     app:cardBackgroundColor="@android:color/transparent">
 
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:overScrollMode="never">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,8 +26,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center"
-            android:paddingTop="8dp"
+                android:paddingTop="4dp"
-            android:paddingBottom="20dp">
+                android:paddingBottom="16dp">
 
                 <TextView
                     android:id="@+id/dialogSubtitle"
@@ -105,23 +111,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="@color/grid_divider"
-            android:layout_marginTop="20dp"/>
+                android:layout_marginTop="16dp"/>
 
-        <!-- Memo Section -->
+            <!-- Memo Section with Quick Save Bar -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-            android:layout_marginTop="16dp"
+                android:layout_marginTop="12dp"
                 android:background="@drawable/bg_glass_button_light"
-            android:padding="16dp">
+                android:padding="14dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:gravity="center_vertical"
-                android:layout_marginBottom="12dp">
+                    android:layout_marginBottom="8dp">
 
                     <TextView
                         android:id="@+id/memoTitle"
@@ -139,15 +145,35 @@
                         android:layout_height="28dp"
                         android:src="@drawable/ic_delete"
                         app:tint="@color/shift_red"
-                    android:padding="6dp"
+                        android:padding="5dp"
-                    android:background="?attr/selectableItemBackgroundBorderless"/>
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:layout_marginEnd="8dp"/>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnQuickSaveMemo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="32dp"
+                        android:text="저장"
+                        android:textSize="13sp"
+                        android:textStyle="bold"
+                        android:textColor="#FFFFFF"
+                        app:cornerRadius="16dp"
+                        android:backgroundTint="@color/primary"
+                        android:paddingHorizontal="12dp"
+                        android:paddingVertical="0dp"
+                        android:minHeight="0dp"
+                        android:minWidth="0dp"
+                        app:icon="@drawable/ic_check"
+                        app:iconSize="14dp"
+                        app:iconTint="#FFFFFF"
+                        app:iconPadding="4dp"/>
                 </LinearLayout>
 
                 <EditText
                     android:id="@+id/etMemo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:hint="여기에 메모를 입력하세요"
+                    android:hint="여기에 메모를 입력하세요 (최대 4줄)"
                     android:inputType="textMultiLine|textNoSuggestions"
                     android:minLines="2"
                     android:maxLines="4"
@@ -155,21 +181,22 @@
                     android:textSize="15sp"
                     android:textColor="@color/text_primary"
                     android:background="@android:color/transparent"
-                android:padding="0dp"/>
+                    android:padding="2dp"/>
             </LinearLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnClose"
                 android:layout_width="match_parent"
-            android:layout_height="56dp"
+                android:layout_height="52dp"
                 android:text="저장 및 닫기"
-            android:layout_marginTop="24dp"
+                android:layout_marginTop="16dp"
                 android:textSize="16sp"
                 android:textStyle="bold"
                 android:textColor="#FFFFFF"
-            app:cornerRadius="28dp"
+                app:cornerRadius="26dp"
                 android:backgroundTint="@color/primary"
                 android:elevation="2dp"/>
 
         </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </androidx.cardview.widget.CardView>

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

@@ -49,8 +49,8 @@
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_plus_circle"
+                        android:src="@drawable/ic_tide"
-                        app:tint="@color/primary"/>
+                        app:tint="#0EA5E9"/>
                 </FrameLayout>
 
                 <LinearLayout
@@ -120,8 +120,8 @@
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_gravity="center"
-                        android:src="@drawable/ic_settings"
+                        android:src="@drawable/ic_palette"
-                        app:tint="@color/primary"/>
+                        app:tint="#AF52DE"/>
                 </FrameLayout>
 
                 <TextView
@@ -139,8 +139,7 @@
                     android:layout_height="40dp"
                     android:background="@drawable/bg_spinner_oneui"
                     android:popupBackground="@drawable/bg_spinner_popup_oneui"
-                    android:dropDownVerticalOffset="6dp"
+                    android:dropDownVerticalOffset="6dp"/>
-                    android:paddingStart="12dp"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 
@@ -260,7 +259,7 @@
                             android:layout_height="20dp"
                             android:layout_gravity="center"
                             android:src="@drawable/ic_memo"
-                            app:tint="@color/primary"/>
+                            app:tint="#0284C7"/>
                     </FrameLayout>
 
                     <TextView
@@ -309,7 +308,7 @@
                             android:layout_height="20dp"
                             android:layout_gravity="center"
                             android:src="@drawable/ic_bell"
-                            app:tint="@color/primary"/>
+                            app:tint="#FF9500"/>
                     </FrameLayout>
 
                     <TextView
@@ -357,8 +356,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_plus_circle"
+                            android:src="@drawable/ic_share"
-                            app:tint="@color/primary"/>
+                            app:tint="#34C759"/>
                     </FrameLayout>
 
                     <TextView
@@ -398,32 +397,116 @@
             app:cardCornerRadius="24dp"
             app:cardElevation="0dp"
             app:cardBackgroundColor="@android:color/transparent"
-            android:layout_marginBottom="40dp">
+            android:layout_marginBottom="32dp">
             
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:background="@drawable/bg_oneui_settings_card"
-                android:padding="20dp">
+                android:padding="16dp">
 
+                <!-- 1. 개별 근무/알람 설정 전체 삭제 -->
                 <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btnResetOverrides"
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:text="개별 근무/알람 설정 전체 삭제"
-                    android:textColor="@color/shift_red"
+                    android:textColor="@color/text_primary"
                     android:textStyle="bold"
-                    android:textSize="15sp"
+                    android:textSize="14sp"
                     android:background="@drawable/bg_glass_button_light"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="달력에서 개별적으로 바꾼 근무와 알람 시간이 모두 기본값으로 복구됩니다."
+                    android:text="달력에서 개별 변경한 근무와 알람 시간을 모두 기본값으로 복구합니다."
                     android:textSize="11sp"
                     android:textColor="@color/text_tertiary"
-                    android:layout_marginTop="8dp"/>
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginStart="4dp"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/divider_subtle"
+                    android:layout_marginBottom="12dp"/>
+
+                <!-- 2. 개별 근무 삭제 -->
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnResetShifts"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:text="개별 근무 삭제"
+                    android:textColor="@color/text_primary"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:background="@drawable/bg_glass_button_light"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="달력에서 개별 변경한 교대근무 일정만 기본값으로 복구합니다."
+                    android:textSize="11sp"
+                    android:textColor="@color/text_tertiary"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginStart="4dp"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/divider_subtle"
+                    android:layout_marginBottom="12dp"/>
+
+                <!-- 3. 알람 삭제 -->
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnResetAlarms"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:text="알람 삭제"
+                    android:textColor="@color/text_primary"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:background="@drawable/bg_glass_button_light"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="추가된 사용자 지정 알람을 모두 삭제하고 기본 설정으로 복원합니다."
+                    android:textSize="11sp"
+                    android:textColor="@color/text_tertiary"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginStart="4dp"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="@color/divider_subtle"
+                    android:layout_marginBottom="12dp"/>
+
+                <!-- 4. 전체 삭제 (완전 초기화) -->
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnResetAll"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:text="전체 삭제"
+                    android:textColor="@color/shift_red"
+                    android:textStyle="bold"
+                    android:textSize="14sp"
+                    android:background="@drawable/bg_glass_button_light"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="메모, 연차, 개별 근무, 알람 등 앱의 모든 데이터를 완전히 초기화합니다."
+                    android:textSize="11sp"
+                    android:textColor="@color/shift_red"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="4dp"/>
+
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 

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

@@ -12,33 +12,44 @@
         android:background="@color/surface"
         android:padding="16dp">
 
+        <!-- Master Alarm Header with Switch -->
         <LinearLayout
+            android:id="@+id/masterAlarmCard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:paddingHorizontal="8dp"
+            android:background="@drawable/bg_group_header"
-            android:layout_marginBottom="8dp">
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="12dp"
+            android:layout_marginBottom="12dp"
+            android:clickable="true"
+            android:focusable="true">
+
+            <ImageView
+                android:id="@+id/ivMasterBell"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_bell"
+                app:tint="@color/primary"
+                android:layout_marginEnd="10dp"/>
 
             <TextView
                 android:id="@+id/tvMasterStatus"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="전체 알람 켜짐"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/text_primary"/>
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/masterSwitch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="전체 알람 켜짐"
+                app:thumbTint="@color/white"
-                android:textSize="13sp"
+                app:trackTint="@color/sl_switch_track"/>
-                android:textStyle="bold"
-                android:textColor="@color/primary"
-                android:background="@drawable/bg_glass_pill_v4"
-                android:backgroundTint="#F2F2F7"
-                android:paddingHorizontal="12dp"
-                android:paddingVertical="6dp"
-                android:clickable="true"
-                android:focusable="true"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
         </LinearLayout>
 
         <!-- Unified Alarm List Container (Background removed as items are now individual cards) -->

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

@@ -55,8 +55,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_settings"
+                            android:src="@drawable/ic_factory"
-                            app:tint="@color/primary"/>
+                            app:tint="#007AFF"/>
                     </FrameLayout>
 
                     <TextView
@@ -75,8 +75,7 @@
                         android:entries="@array/factory_array"
                         android:background="@drawable/bg_spinner_oneui"
                         android:popupBackground="@drawable/bg_spinner_popup_oneui"
-                        android:dropDownVerticalOffset="6dp"
+                        android:dropDownVerticalOffset="6dp"/>
-                        android:paddingStart="12dp"/>
                 </LinearLayout>
 
                 <View
@@ -102,8 +101,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_check"
+                            android:src="@drawable/ic_user"
-                            app:tint="@color/primary"/>
+                            app:tint="#34C759"/>
                     </FrameLayout>
 
                     <TextView
@@ -121,8 +120,7 @@
                         android:layout_height="40dp"
                         android:background="@drawable/bg_spinner_oneui"
                         android:popupBackground="@drawable/bg_spinner_popup_oneui"
-                        android:dropDownVerticalOffset="6dp"
+                        android:dropDownVerticalOffset="6dp"/>
-                        android:paddingStart="12dp"/>
                 </LinearLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
@@ -288,8 +286,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_plus_circle"
+                            android:src="@drawable/ic_layers"
-                            app:tint="@color/primary"/>
+                            app:tint="#00C7BE"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -469,8 +467,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_bell"
+                            android:src="@drawable/ic_update"
-                            app:tint="@color/primary"/>
+                            app:tint="#5856D6"/>
                     </FrameLayout>
 
                     <TextView
@@ -478,7 +476,7 @@
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:text="최신 버전 확인"
-                        android:textColor="@color/primary"
+                        android:textColor="@color/text_primary"
                         android:textSize="16sp"
                         android:textStyle="bold"/>
 

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

@@ -86,8 +86,7 @@
                         android:layout_height="40dp"
                         android:background="@drawable/bg_spinner_oneui"
                         android:popupBackground="@drawable/bg_spinner_popup_oneui"
-                        android:dropDownVerticalOffset="6dp"
+                        android:dropDownVerticalOffset="6dp"/>
-                        android:paddingStart="12dp"/>
                 </LinearLayout>
 
                 <View

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

@@ -81,7 +81,8 @@
         android:gravity="center"
         android:text="메모내용\n2줄\n3줄\n4줄"
         android:textSize="9.5sp"
-        android:textColor="@color/secondary"
+        android:textStyle="bold"
+        android:textColor="@color/text_primary"
         android:lineSpacingMultiplier="1.05"
         android:maxLines="4"
         android:ellipsize="end"

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

@@ -3,9 +3,9 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:gravity="center_vertical|end"
+    android:gravity="center"
-    android:paddingStart="12dp"
+    android:textAlignment="center"
-    android:paddingEnd="16dp"
+    android:paddingHorizontal="4dp"
     android:textColor="@color/text_primary"
     android:textSize="14sp"
     android:textStyle="bold"

scratch/release.py

@@ -6,22 +6,17 @@ import shutil
 
 token = "e3b515eaa0a6683c921ca3bf718e281ed30a6075"
 owner_repo = "sanjeok77/ShiftRing"
-tag = "v1.0.5"
+tag = "v1.1.2"
-title = "v1.0.5 - 메모 아이콘 정리, 삼성 One UI 8.5/9.0 알람 화면 리디자인, 달력 초기 깜빡임 해소 및 카드 스택 레이어 전환 애니메이션 적용"
+title = "v1.1.2 - 하루 메모 키보드 가림 완벽 개선 (상단 즉시 저장 버튼, 뒤로가기 시 자동 저장 및 스크롤 지원)"
-body = """## 🚀 ShiftRing v1.0.5 릴리즈
+body = """## 🚀 ShiftRing v1.1.2 릴리즈
 
 ### 🌟 주요 변경 및 개선 사항
-1. **하루 메모 불필요한 하단 아이콘 제거 (`item_day.xml`, `CalendarAdapter.kt`)**:
+1. **📝 하루 메모 입력창 상단 '즉시 저장' 버튼 탑재 (`dialog_day_settings.xml`, `MainActivity.kt`)**:
-   - 메모 텍스트가 이미 상단/중앙에 4줄로 표시되므로 중복되던 하단 메모/수정 아이콘을 깔끔하게 제거하여 셀 공간 최적화
+   - 가상 키보드가 올라와도 항상 키보드 바로 위에 노출되는 메모 섹션 상단에 파란색 [저장] 액션 버튼을 신설하여 키보드를 내리지 않고도 원터치로 즉시 저장 가능
-2. **알람 울림/해제 화면 삼성 One UI 8.5/9.0 최신 디자인 전면 개편 (`activity_alarm.xml`, `AlarmActivity.kt`)**:
+2. **🔄 뒤로가기/바깥 터치 시 메모 자동 저장(Auto-Save) 기능 구현 (`MainActivity.kt`)**:
-   - 상단 근무 라벨 뱃지 + 대형 현대적 시계 타이포그래피 + 날짜 정보 일원화
+   - 사용자가 백키(Back)를 누르거나 팝업 바깥을 터치하여 닫더라도 작성 중이던 메모 내용이 Room DB에 100% 자동 저장되어 내용 유실을 원천 방지
-   - 중앙 와이드 글래스 캡슐 허브 다시 울림(스누즈) 버튼 탑재
+3. **📜 다이얼로그 전체 스크롤 및 가상 키보드 동적 리사이징 지원 (`dialog_day_settings.xml`, `MainActivity.kt`)**:
-   - 하단 듀얼 펄스 웨이브 앰비언트 글로우 및 옴니 다이렉션 스와이프/탭 해제 컨트롤 적용
+   - `NestedScrollView` 및 `SOFT_INPUT_ADJUST_RESIZE`를 적용하여 4줄 메모를 입력하더라도 화면이 잘리지 않고 부드럽게 스크롤되도록 개선"""
-3. **앱 초기 실행 시 달력 화면 깜빡임(Flicker) 완벽 해소 (`MainActivity.kt`)**:
-   - `RecyclerView` 불필요한 기본 애니메이터 제거 및 어댑터/행 높이 재계산 로직 최적화로 초기 진입 시 잔상 없이 즉각 로딩
-4. **달력 월간 이동 시 카드 스택(Card Stack) 레이어 전환 애니메이션 구현 (`MainActivity.kt`, `activity_main.xml`)**:
-   - 이전 달 화면이 하단에 베이스로 자연스럽게 깔리고(0.94x 축소 및 0.35 알파 페이드), 새 달 카드가 상단에서 부드럽게 감속 슬라이드 오버되는 끊김 없는 유체 모션 적용
-5. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
 
 apk_path = "app/build/outputs/apk/release/app-release.apk"
 if not os.path.exists(apk_path):
@@ -59,10 +54,10 @@ print("Updated app.apk at project root.")
 
 # Update version.json
 v_info = {
-    "versionCode": 105,
+    "versionCode": 112,
-    "versionName": "1.0.5",
+    "versionName": "1.1.2",
     "apkUrl": direct_url,
-    "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
+    "changelog": "v1.1.2: 하루 메모 키보드 가림 완벽 개선 (상단 즉시 저장 버튼, 뒤로가기 자동 저장, 스크롤 지원)",
     "forceUpdate": False
 }
 with open("version.json", "w", encoding="utf-8") as f:
@@ -74,7 +69,7 @@ print(f"Updated version.json with apkUrl: {direct_url}")
 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 최신 알람 화면 개편, 달력 깜빡임 해소 및 카드 스택 전환 애니메이션 적용"
+commit_msg = "v1.1.2 - 하루 메모 키보드 가림 완벽 개선 (상단 즉시 저장 버튼, 뒤로가기 시 자동 저장 및 스크롤 지원)"
 subprocess.run(["git", "add", "."], check=True)
 subprocess.run(["git", "commit", "-m", commit_msg], check=True)
 subprocess.run(["git", "push", "origin", "main"], check=True)

version.json

@@ -1,7 +1,7 @@
 {
-  "versionCode": 105,
+  "versionCode": 112,
-  "versionName": "1.0.5",
+  "versionName": "1.1.2",
-  "apkUrl": "https://git.webpluss.net/attachments/b03485a6-cae4-471d-81c0-4f6288d3aa9f",
+  "apkUrl": "https://git.webpluss.net/attachments/0232d016-9a38-413e-96a8-4bea1138b645",
-  "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
+  "changelog": "v1.1.2: 하루 메모 키보드 가림 완벽 개선 (상단 즉시 저장 버튼, 뒤로가기 자동 저장, 스크롤 지원)",
   "forceUpdate": false
 }