v1.0.6 - 달력 월간 이동 깜빡임 완전 제거, 하루 메모 고가독성 색상 적용, 부가기능 및 근무 관리 아이콘/색상 개편

2026-08-14 09:54:17 +09:00
parent 696083060d
commit 975413a2d6
13 changed files with 217 additions and 170 deletions
@@ -270,118 +270,121 @@ 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)
-            
-            // 전체 사용자 알람 로드 (일원화된 Room DB 사용)
-            val allCustomAlarms = repo.getAllCustomAlarms()
+        val db = AppDatabase.getDatabase(this@MainActivity)
+        val dao = db.shiftDao()
+        val repo = ShiftRepository(this@MainActivity)
+        
+        // 전체 사용자 알람 로드 (일원화된 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 {
+            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(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 +754,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 +783,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 {
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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
@@ -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"