v1.0.9 - 메인 및 설정 화면 상단 빈 여백 완전 제거 및 인앱 APK 원클릭 업데이트 복원

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
  applicationId = "com.example.shiftalarm"
  minSdk = 26
  targetSdk = 35
-        versionCode = 105
-        versionName = "1.0.5"
+        versionCode = 109
+        versionName = "1.0.9"
 
  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:exported="false">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="Alarm playback and ringing notification" />
-        </service>
+            android:foregroundServiceType="mediaPlayback"
+            android:exported="false" />
 
         <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,42 @@ 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 {
+            var count = 0
+            while (count < 150 && isActive) { // 최대 60초간 400ms 주기로 체크
+                delay(400)
+                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)
-                // 기존 인스턴스 재사용 및 최상위로 가져오기
-                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)
+                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)
+            }
+            try {
+                context.startActivity(activityIntent)
+                Log.d(TAG, "AlarmActivity 즉시 실행 완료")
+            } catch (e: Exception) {
+                Log.e(TAG, "AlarmActivity 실행 실패", e)
             }
-            
-            // 지연 후 Activity 시작 (ForegroundService가 알림을 먼저 표시하도록)
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-                try {
-                    context.startActivity(activityIntent)
-                    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/FragmentSettingsBasic.kt

@@ -193,6 +193,7 @@ class FragmentSettingsBasic : Fragment() {
 
     override fun onResume() {
         super.onResume()
+        AlarmPermissionUtil.cancelAutoReturn()
         updatePermissionStatuses()
     }
 
@@ -232,7 +233,10 @@ class FragmentSettingsBasic : Fragment() {
         val prefs = requireContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
         binding.btnBatteryOptimize.setOnClickListener {
-            AlarmPermissionUtil.requestBatteryOptimization(requireContext())
+            AlarmPermissionUtil.requestBatteryOptimization(requireActivity())
+            AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                AlarmPermissionUtil.getBatteryOptimizationStatus(requireContext())
+            }
         }
 
         binding.btnExactAlarm.setOnClickListener {
@@ -240,23 +244,35 @@ class FragmentSettingsBasic : Fragment() {
                 val intent = Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM).apply {
                     data = Uri.parse("package:${requireContext().packageName}")
                 }
-                startActivity(intent)
+                requireActivity().startActivity(intent)
+                AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                    AlarmPermissionUtil.getExactAlarmStatus(requireContext())
+                }
             }
         }
 
         binding.btnOverlayPermission.setOnClickListener {
-            AlarmPermissionUtil.requestOverlayPermission(requireContext())
+            AlarmPermissionUtil.requestOverlayPermission(requireActivity())
+            AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                AlarmPermissionUtil.getOverlayStatus(requireContext())
+            }
         }
 
         binding.btnFullScreenIntent.setOnClickListener {
-            AlarmPermissionUtil.requestFullScreenIntentPermission(requireContext())
+            AlarmPermissionUtil.requestFullScreenIntentPermission(requireActivity())
+            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)
+            AlarmPermissionUtil.monitorAndAutoReturn(requireActivity()) {
+                AlarmPermissionUtil.isAllPermissionsGranted(requireContext())
+            }
         }
 
         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
-            val p = (8 * density).toInt()
-            v.setPadding(systemBars.left + p, systemBars.top + p, systemBars.right + p, systemBars.bottom + p)
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
 
@@ -270,118 +268,154 @@ 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)
+        val db = AppDatabase.getDatabase(this@MainActivity)
+        val dao = db.shiftDao()
+        val repo = ShiftRepository(this@MainActivity)
         
-            // 전체 사용자 알람 로드 (일원화된 Room DB 사용)
-            val allCustomAlarms = repo.getAllCustomAlarms()
+        // 전체 사용자 알람 로드 (일원화된 Room DB 사용)
+        val allCustomAlarms = repo.getAllCustomAlarms()
 
-            // 디스플레이 업데이트
-            if (currentViewTeam == selectedTeam) {
-                val shiftForMyTeam = withContext(Dispatchers.IO) { repo.getShift(today, selectedTeam, factory) }
-                updateAlarmTimeDisplay(today, shiftForMyTeam, factory, allCustomAlarms)
-                binding.alarmTimeText.visibility = android.view.View.VISIBLE
-            } else {
-                binding.alarmTimeText.visibility = android.view.View.GONE
+        // 디스플레이 업데이트
+        if (currentViewTeam == selectedTeam) {
+            val shiftForMyTeam = withContext(Dispatchers.IO) { repo.getShift(today, selectedTeam, factory) }
+            updateAlarmTimeDisplay(today, shiftForMyTeam, factory, allCustomAlarms)
+            binding.alarmTimeText.visibility = android.view.View.VISIBLE
+        } else {
+            binding.alarmTimeText.visibility = android.view.View.GONE
+        }
+
+        // Load overrides and memos for the month
+        val monthStr = targetMonth.toString()
+        val overrides = withContext(Dispatchers.IO) { 
+            dao.getOverridesForMonth(factory, currentViewTeam, monthStr).associateBy { overrideItem -> overrideItem.date }
+        }
+        val memos = withContext(Dispatchers.IO) { 
+            dao.getMemosForMonth(monthStr).associateBy { memoItem -> memoItem.date }
+        }
+
+        val days = generateDaysForMonthWithData(targetMonth, currentViewTeam, factory, overrides, memos)
+
+        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
             }
-
-            // Load overrides and memos for the month
-            val monthStr = currentViewMonth.toString()
-            val overrides = withContext(Dispatchers.IO) { 
-                dao.getOverridesForMonth(factory, currentViewTeam, monthStr).associateBy { overrideItem -> overrideItem.date }
-            }
-            val memos = withContext(Dispatchers.IO) { 
-                dao.getMemosForMonth(monthStr).associateBy { memoItem -> memoItem.date }
-            }
-
-            val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos)
-
-            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)
+            calendarAdapter = newAdapter
+            binding.calendarGrid.adapter = newAdapter
+        } else {
+            calendarAdapter?.let { ad ->
+                ad.days = days
+                ad.showHolidays = 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()
+                    ad.rowHeight = calcRowHeight
                 }
+                ad.notifyDataSetChanged()
             }
+        }
 
-            binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
+        binding.monthTitle.text = targetMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
-            if (calcRowHeight == 0) {
-                binding.calendarGrid.post {
-                    val h = binding.calendarGrid.height
-                    if (h > 0) {
-                        val rH = h / 5
-                        calendarAdapter?.let {
-                            if (it.rowHeight != rH) {
-                                it.rowHeight = rH
-                                it.notifyDataSetChanged()
-                            }
+        if (calcRowHeight == 0) {
+            binding.calendarGrid.post {
+                val h = binding.calendarGrid.height
+                if (h > 0) {
+                    val rH = h / 5
+                    calendarAdapter?.let {
+                        if (it.rowHeight != rH) {
+                            it.rowHeight = rH
+                            it.notifyDataSetChanged()
                         }
                     }
                 }
             }
-
-            // 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}반)"
-            
-            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"
-                binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary))
-            }
-
-            // Update Annual Leave display
-            val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
-            annualLeave?.let {
-                binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
-            } ?: run {
-                binding.tvAnnualLeave.text = "연차: --"
-            }
-
-            // Update Shift Summary Chips (v2.2.0)
-            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) }
-
-            binding.chipJu.text = "주간 ${juCount}일"
-            binding.chipSeok.text = "석간 ${seokCount}일"
-            binding.chipYa.text = "야간 ${yaCount}일"
-            binding.chipOvertime.text = "연장 ${monthlyOvertime}h"
         }
+
+        // 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}반)"
+        
+        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 {
+            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))
+        }
+
+        // Update Annual Leave display
+        val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
+        annualLeave?.let {
+            binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
+        } ?: run {
+            binding.tvAnnualLeave.text = "연차: --"
+        }
+
+        // Update Shift Summary Chips (v2.2.0)
+        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(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,
@@ -751,12 +785,14 @@ class MainActivity : AppCompatActivity() {
         val snapshot = binding.calendarOverlaySnapshot
         val width = card.width.toFloat()
 
+        val nextMonth = if (direction > 0) {
+            currentViewMonth.plusMonths(1)
+        } else {
+            currentViewMonth.minusMonths(1)
+        }
+
         if (width == 0f) {
-            currentViewMonth = if (direction > 0) {
-                currentViewMonth.plusMonths(1)
-            } else {
-                currentViewMonth.minusMonths(1)
-            }
+            currentViewMonth = nextMonth
             updateCalendar()
             return
         }
@@ -778,44 +814,37 @@ class MainActivity : AppCompatActivity() {
             Log.w("MainActivity", "Failed to capture snapshot for month transition", e)
         }
 
-        // 2. Update to new month immediately
-        currentViewMonth = if (direction > 0) {
-            currentViewMonth.plusMonths(1)
-        } else {
-            currentViewMonth.minusMonths(1)
-        }
-        updateCalendar()
-
-        // 3. Prepare incoming new month card on top
+        // 2. Position top card offscreen before loading
         card.translationX = if (direction > 0) width else -width
-        card.alpha = 1.0f
-        card.cardElevation = dpToPx(8f).toFloat()
+        currentViewMonth = nextMonth
 
-        val fluidInterpolator = androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f)
-        val duration = 280L
+        // 3. Load next month's data BEFORE starting slide animation to eliminate any flicker
+        lifecycleScope.launch {
+            loadCalendarDataForMonth(currentViewMonth)
 
-        // 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()
+            val fluidInterpolator = androidx.core.view.animation.PathInterpolatorCompat.create(0.22f, 1.0f, 0.36f, 1.0f)
+            val duration = 280L
 
-        // 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()
+            card.animate()
+                .translationX(0f)
+                .setDuration(duration)
+                .setInterpolator(fluidInterpolator)
+                .withEndAction {
+                    snapshot.visibility = android.view.View.GONE
+                    snapshot.setImageDrawable(null)
+                    isAnimatingMonth = false
+                }
+                .start()
+
+            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/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:paddingBottom="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="4dp"
         android:paddingHorizontal="20dp"
         app:layout_constraintTop_toTopOf="parent">
 

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:paddingBottom="16dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="8dp"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         app:layout_constraintTop_toTopOf="parent"

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"
-                        app:tint="@color/primary"/>
+                        android:src="@drawable/ic_tide"
+                        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"
-                        app:tint="@color/primary"/>
+                        android:src="@drawable/ic_palette"
+                        app:tint="#AF52DE"/>
                 </FrameLayout>
 
                 <TextView
@@ -260,7 +260,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 +309,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 +357,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_plus_circle"
-                            app:tint="@color/primary"/>
+                            android:src="@drawable/ic_share"
+                            app:tint="#34C759"/>
                     </FrameLayout>
 
                     <TextView

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"
-                            app:tint="@color/primary"/>
+                            android:src="@drawable/ic_factory"
+                            app:tint="#007AFF"/>
                     </FrameLayout>
 
                     <TextView
@@ -102,8 +102,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_check"
-                            app:tint="@color/primary"/>
+                            android:src="@drawable/ic_user"
+                            app:tint="#34C759"/>
                     </FrameLayout>
 
                     <TextView
@@ -288,8 +288,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_plus_circle"
-                            app:tint="@color/primary"/>
+                            android:src="@drawable/ic_layers"
+                            app:tint="#00C7BE"/>
                     </FrameLayout>
 
                     <LinearLayout
@@ -469,8 +469,8 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_gravity="center"
-                            android:src="@drawable/ic_bell"
-                            app:tint="@color/primary"/>
+                            android:src="@drawable/ic_update"
+                            app:tint="#5856D6"/>
                     </FrameLayout>
 
                     <TextView
@@ -478,7 +478,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/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"

scratch/release.py

@@ -6,22 +6,17 @@ import shutil
 
 token = "e3b515eaa0a6683c921ca3bf718e281ed30a6075"
 owner_repo = "sanjeok77/ShiftRing"
-tag = "v1.0.5"
-title = "v1.0.5 - 메모 아이콘 정리, 삼성 One UI 8.5/9.0 알람 화면 리디자인, 달력 초기 깜빡임 해소 및 카드 스택 레이어 전환 애니메이션 적용"
-body = """## 🚀 ShiftRing v1.0.5 릴리즈
+tag = "v1.0.9"
+title = "v1.0.9 - 메인 및 설정 화면 상단 빈 여백 완전 제거 및 인앱 APK 원클릭 업데이트 복원"
+body = """## 🚀 ShiftRing v1.0.9 릴리즈
 
 ### 🌟 주요 변경 및 개선 사항
-1. **하루 메모 불필요한 하단 아이콘 제거 (`item_day.xml`, `CalendarAdapter.kt`)**:
-   - 메모 텍스트가 이미 상단/중앙에 4줄로 표시되므로 중복되던 하단 메모/수정 아이콘을 깔끔하게 제거하여 셀 공간 최적화
-2. **알람 울림/해제 화면 삼성 One UI 8.5/9.0 최신 디자인 전면 개편 (`activity_alarm.xml`, `AlarmActivity.kt`)**:
-   - 상단 근무 라벨 뱃지 + 대형 현대적 시계 타이포그래피 + 날짜 정보 일원화
-   - 중앙 와이드 글래스 캡슐 허브 다시 울림(스누즈) 버튼 탑재
-   - 하단 듀얼 펄스 웨이브 앰비언트 글로우 및 옴니 다이렉션 스와이프/탭 해제 컨트롤 적용
-3. **앱 초기 실행 시 달력 화면 깜빡임(Flicker) 완벽 해소 (`MainActivity.kt`)**:
-   - `RecyclerView` 불필요한 기본 애니메이터 제거 및 어댑터/행 높이 재계산 로직 최적화로 초기 진입 시 잔상 없이 즉각 로딩
-4. **달력 월간 이동 시 카드 스택(Card Stack) 레이어 전환 애니메이션 구현 (`MainActivity.kt`, `activity_main.xml`)**:
-   - 이전 달 화면이 하단에 베이스로 자연스럽게 깔리고(0.94x 축소 및 0.35 알파 페이드), 새 달 카드가 상단에서 부드럽게 감속 슬라이드 오버되는 끊김 없는 유체 모션 적용
-5. **Android 14/15 호환 및 정식 서명키(release.jks) 적용**"""
+1. **📐 메인화면 상단 '교대링' 글자 위 빈 여백 공간 완전 제거 (`activity_main.xml`, `MainActivity.kt`)**:
+   - WindowInsets 및 헤더 레이아웃의 중복 패딩을 최적화하여 타이틀 상단 불필요한 공백을 완전히 없애고 시각적 안정감을 확보
+2. **📐 설정화면 상단 '설정' 타이틀 위 빈 여백 제거 (`activity_settings.xml`)**:
+   - `settingsHeader`의 과도한 상단 패딩(32dp)을 축소하여 상단 여백을 컴팩트하고 균형 있게 조정
+3. **🔄 인앱 APK 원클릭 다운로드 & 설치 업데이트 방식 복원 (`AppUpdateManager.kt`, `AndroidManifest.xml`)**:
+   - 앱 내에서 바로 업데이트 진행 상태를 확인하고 원클릭으로 즉시 설치할 수 있는 편리한 기존 인앱 업데이트 다이얼로그 방식으로 복원"""
 
 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,
-    "versionName": "1.0.5",
+    "versionCode": 109,
+    "versionName": "1.0.9",
     "apkUrl": direct_url,
-    "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
+    "changelog": "v1.0.9: 메인/설정 상단 빈 여백 제거, 인앱 APK 업데이트 복원",
     "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.0.9 - 메인 및 설정 화면 상단 빈 여백 완전 제거 및 인앱 APK 원클릭 업데이트 복원"
 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,
-  "versionName": "1.0.5",
-  "apkUrl": "https://git.webpluss.net/attachments/b03485a6-cae4-471d-81c0-4f6288d3aa9f",
-  "changelog": "v1.0.5: 메모 아이콘 정리, 삼성 최신 알람 화면 개편, 달력 초기 깜빡임 해소, 카드 스택 레이어 전환 애니메이션 적용",
+  "versionCode": 109,
+  "versionName": "1.0.9",
+  "apkUrl": "https://git.webpluss.net/attachments/f72482fb-9a5f-4572-bacf-955b505b2c2b",
+  "changelog": "v1.0.9: 메인/설정 상단 빈 여백 제거, 인앱 APK 업데이트 복원",
   "forceUpdate": false
 }