fix: 버전업 오류 수정 및 UI 개선

- 난부 버전 1147 (1.4.7)로 업데이트 (중복 버전 코드 제거)
- 휴가 관리 탭 → 근무 관리로 명칭 변경
- 남은 연차 하단에 '기능추가중' 표시 추가

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

GITEA_RELEASE_GUIDE.md

@@ -0,0 +1,206 @@
+# Gitea 릴리즈 작업 가이드
+
+> ShiftRing 프로젝트 Gitea 릴리즈 자동화 문서
+> 저장소: https://git.webpluss.net/sanjeok77/ShiftRing
+
+---
+
+## 🔐 인증 정보
+
+**Personal Access Token (PAT)**
+- 위치: `.env.local` 파일
+- 형식: `e3b515eaa0a6683c921ca3bf718e281ed30a6075`
+- 사용자: `sanjeok77`
+
+**인증 헤더**
+```bash
+-u "sanjeok77:TOKEN"
+```
+
+---
+
+## 📋 릴리즈 생성 절차
+
+### 1. 버전 업데이트 (3곳)
+
+#### 1.1 `app/build.gradle.kts` - 앱 날부 버전
+```kotlin
+defaultConfig {
+    versionCode = 1125        // ← 이전: 1124
+    versionName = "1.2.5"     // ← 이전: "1.2.4"
+}
+```
+
+#### 1.2 `version.json` - 서버 버전 정보
+```json
+{
+  "versionCode": 1125,
+  "versionName": "1.2.5",
+  "apkUrl": "https://git.webpluss.net/attachments/{UUID}",
+  "changelog": "v1.2.5: 변경사항 요약",
+  "forceUpdate": false
+}
+```
+
+#### 1.3 Git 태그 및 릴리즈
+- 태그: `v1.2.5`
+- 브랜치: `dev` (개발) → `main` (배포)
+
+---
+
+### 2. 릴리즈 생성 (API)
+
+**엔드포인트**
+```bash
+POST https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases
+```
+
+**요청 예시**
+```bash
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -u "sanjeok77:TOKEN" \
+  "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases" \
+  -d '{
+    "tag_name": "v1.2.5",
+    "name": "v1.2.5 - 릴리즈 제목",
+    "body": "## 변경사항\n\n- 기능1\n- 기능2",
+    "prerelease": false,
+    "target_commitish": "dev"
+  }'
+```
+
+**응답 예시**
+```json
+{
+  "id": 30,
+  "tag_name": "v1.2.5",
+  "upload_url": "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases/30/assets"
+}
+```
+
+---
+
+### 3. APK 빌드
+
+**릴리즈 빌드**
+```bash
+./gradlew :app:assembleRelease
+```
+
+**출력 경로**
+```
+app/build/outputs/apk/release/app-release.apk
+```
+
+**서명 설정** (`keystore.properties`)
+```properties
+storePassword=비밀번호
+keyAlias=별칭
+keyPassword=비밀번호
+storeFile=../release.jks
+```
+
+---
+
+### 4. APK 업로드 (API)
+
+**엔드포인트**
+```bash
+POST https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases/{release_id}/assets
+```
+
+**요청 예시**
+```bash
+curl -X POST \
+  -u "sanjeok77:TOKEN" \
+  -H "Content-Type: multipart/form-data" \
+  -F "attachment=@app/build/outputs/apk/release/app-release.apk" \
+  "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases/30/assets?name=app.apk"
+```
+
+**응답 예시**
+```json
+{
+  "id": 37,
+  "name": "app.apk",
+  "size": 5236988,
+  "browser_download_url": "https://git.webpluss.net/attachments/b8f53c11-743f-416c-87ae-bd478c781abf"
+}
+```
+
+---
+
+### 5. version.json 업데이트
+
+**APK URL 업데이트**
+```json
+{
+  "apkUrl": "https://git.webpluss.net/attachments/{UUID}"
+}
+```
+
+**주의**: `releases/download/v1.2.5/app.apk` 형식이 아닌 `attachments/{UUID}` 형식 사용
+
+---
+
+## 🔧 유틸리티 명령어
+
+### 릴리즈 조회
+```bash
+curl -s -u "sanjeok77:TOKEN" \
+  "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases" | jq '.[].tag_name'
+```
+
+### 특정 릴리즈 조회
+```bash
+curl -s -u "sanjeok77:TOKEN" \
+  "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases/30"
+```
+
+### 첨부파일 삭제
+```bash
+curl -s -u "sanjeok77:TOKEN" \
+  -X DELETE \
+  "https://git.webpluss.net/api/v1/repos/sanjeok77/ShiftRing/releases/30/assets/{asset_id}"
+```
+
+---
+
+## ⚠️ 주의사항
+
+1. **버전 일치**: `build.gradle.kts`, `version.json`, Git 태그 3곳 모두 동일 버전 사용
+2. **APK 파일명**: 반드시 `app.apk`로 업로드 (클리어 이름 지정)
+3. **UUID**: 업로드 후 반환된 UUID를 `version.json`에 반영
+4. **브랜치**: 
+   - 개발: `dev` 브랜치에 커밋
+   - 배포: `main` 브랜치에 cherry-pick
+
+---
+
+## 📁 관련 파일
+
+| 파일 | 설명 |
+|------|------|
+| `app/build.gradle.kts` | 앱 날부 버전 설정 |
+| `version.json` | 서버 버전 정보 |
+| `keystore.properties` | 서명 키 설정 |
+| `release.jks` | 서명 키스토어 |
+| `.env.local` | API 토큰 저장 |
+
+---
+
+## 📝 변경 이력
+
+| 날짜 | 버전 | 작업 |
+|------|------|------|
+| 2026-02-28 | v1.2.5 | 알람 시스템 단순화 릴리즈 |
+| 2026-02-28 | v1.2.4 | 버그 수정 릴리즈 |
+
+---
+
+## 🔗 참고 링크
+
+- 릴리즈 페이지: https://git.webpluss.net/sanjeok77/ShiftRing/releases
+- API 문서: https://git.webpluss.net/api/swagger
+- Swagger UI: https://git.webpluss.net/api/swagger#/repository/repoCreateRelease

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
  applicationId = "com.example.shiftalarm"
  minSdk = 26
  targetSdk = 35
-        versionCode = 1120
-        versionName = "1.2.0"
+ versionCode = 1147
+ versionName = "1.4.7"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  }

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

@@ -78,6 +78,14 @@ class AlarmActivity : AppCompatActivity() {
 
         // 알람 시작 (화면 상태와 무관하게 항상 실행)
         startAlarm()
+        
+        // 마스터 알람이 꺼져있으면 알람 화면을 즉시 종료
+        val prefs = getSharedPreferences("ShiftAlarmPrefs", Context.MODE_PRIVATE)
+        if (!ShiftAlarmDefaults.isMasterAlarmEnabled(prefs)) {
+            Toast.makeText(this, "전체 알람이 꺼져있습니다.", Toast.LENGTH_SHORT).show()
+            finish()
+            return
+        }
         setupControls()
 
         // 5분 후 자동 스누즈
@@ -209,6 +217,7 @@ class AlarmActivity : AppCompatActivity() {
                     val dx = event.rawX - startX
                     if (abs(dx) > maxSwipe * 0.8f) {
                         // Trigger Dismiss
+                        @Suppress("DEPRECATION")
                         (getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
                         Toast.makeText(this, "알람 해제 완료", Toast.LENGTH_SHORT).show()
                         stopAlarm(); finish()
@@ -247,6 +256,7 @@ class AlarmActivity : AppCompatActivity() {
     }
 
     private fun handleSnooze() {
+        @Suppress("DEPRECATION")
         (getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator)?.vibrate(50)
         val snoozeRepeat = intent.getIntExtra("EXTRA_SNOOZE_REPEAT", 3)
         val text = if (snoozeRepeat == 99) "다시 울림 설정됨" else "다시 울림 (${snoozeRepeat}회 남음)"
@@ -274,21 +284,25 @@ class AlarmActivity : AppCompatActivity() {
             else android.provider.Settings.System.DEFAULT_ALARM_ALERT_URI
         }
 
-        // AudioAttributes 강화: 화면 켜진 상태에서도 알람음이 울리도록
+        // AudioAttributes 강화: 무음/진동 모드에서도 알람음이 울리도록
         val audioAttrs = AudioAttributes.Builder()
             .setUsage(AudioAttributes.USAGE_ALARM)
             .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-            .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)  // 볼륨 강제 적용
+            .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
             .build()
 
-        // AudioManager를 통해 알람 볼륨 설정
+        // AudioManager를 통해 알람 볼륨 설정 및 무음 모드 우회
         val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        val originalVolume = audioManager.getStreamVolume(AudioManager.STREAM_ALARM)
-        val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM)
+        
+        // 무음 모드에서도 알람음이 울리도록 STREAM_ALARM 사용 (벨소리와 독립)
+        // 알람 스트림은 다른 스트림과 달리 무음 모드에서도 울림
+        val originalRingerMode = audioManager.ringerMode
         
         // 알람 볼륨을 최대로 설정 (사용자가 나중에 조정 가능)
         try {
+            val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM)
             audioManager.setStreamVolume(AudioManager.STREAM_ALARM, maxVolume, 0)
+            Log.d("AlarmActivity", "알람 볼륨 설정: $maxVolume (RingerMode: $originalRingerMode)")
         } catch (e: Exception) {
             Log.w("AlarmActivity", "알람 볼륨 설정 실패", e)
         }

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

@@ -15,6 +15,13 @@ class AlarmReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent?) {
         Log.d(TAG, "===== 알람 수신 (Receiver) =====")
         
+        // 마스터 알람이 꺼져있으면 알람 무시
+        val prefs = context.getSharedPreferences("ShiftAlarmPrefs", Context.MODE_PRIVATE)
+        if (!ShiftAlarmDefaults.isMasterAlarmEnabled(prefs)) {
+            Log.w(TAG, "마스터 알람이 꺼져있어 알람을 무시합니다.")
+            return
+        }
+        
         val alarmId = intent?.getIntExtra("EXTRA_ALARM_ID", -1) ?: -1
         val isCustom = intent?.getBooleanExtra("EXTRA_IS_CUSTOM", false) ?: false
         
@@ -50,6 +57,7 @@ class AlarmReceiver : BroadcastReceiver() {
     private fun startAlarm(context: Context, intent: Intent?) {
         // WakeLock 획득 (화면 켜기 및 Activity 실행 보장)
         val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+        @Suppress("DEPRECATION")
         val wakeLock = pm.newWakeLock(
             PowerManager.PARTIAL_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP,
             "ShiftAlarm::AlarmWakeLock"
@@ -71,6 +79,8 @@ class AlarmReceiver : BroadcastReceiver() {
                 context.startService(serviceIntent)
             }
 
+            Log.d(TAG, "ForegroundService 시작 완료")
+
             // 2. AlarmActivity 직접 실행 (알람 화면 표시)
             val activityIntent = Intent(context, AlarmActivity::class.java).apply {
                 putExtra("EXTRA_SHIFT", intent?.getStringExtra("EXTRA_SHIFT") ?: "근무")
@@ -88,8 +98,15 @@ class AlarmReceiver : BroadcastReceiver() {
                 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 실행 완료")
+                } catch (e: Exception) {
+                    Log.e(TAG, "AlarmActivity 실행 실패", e)
+                }
+            }, 500)
             
         } catch (e: Exception) {
             Log.e(TAG, "알람 실행 실패", e)

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

@@ -16,6 +16,47 @@ import java.util.concurrent.TimeUnit
 val SEOUL_ZONE: ZoneId = ZoneId.of("Asia/Seoul")
 const val TAG = "ShiftAlarm"
 
+/**
+ * 다크모드 지원 커스텀 토스트 표시
+ */
+fun showCustomToast(context: Context, message: String, duration: Int = android.widget.Toast.LENGTH_SHORT) {
+ try {
+ val inflater = android.view.LayoutInflater.from(context)
+ val layout = inflater.inflate(R.layout.custom_toast, null)
+ val textView = layout.findViewById<android.widget.TextView>(R.id.toastText)
+ textView.text = message
+
+ val toast = android.widget.Toast(context)
+ toast.duration = duration
+ toast.view = layout
+ toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 150)
+ toast.show()
+ } catch (e: Exception) {
+ // Fallback to default toast if custom toast fails
+ android.widget.Toast.makeText(context, message, duration).show()
+ }
+}
+ * 다크모드 지원 커스텀 토스트 표시
+ */
+fun showCustomToast(context: Context, message: String, duration: Int = android.widget.Toast.LENGTH_SHORT) {
+ try {
+ // Use application context with theme for proper dark mode support
+ val themedContext = android.view.ContextThemeWrapper(context.applicationContext, R.style.Theme_ShiftAlarm)
+ val inflater = android.view.LayoutInflater.from(themedContext)
+ val layout = inflater.inflate(R.layout.custom_toast, null)
+ val textView = layout.findViewById<android.widget.TextView>(R.id.toastText)
+ textView.text = message
+
+ val toast = android.widget.Toast(context.applicationContext)
+ toast.duration = duration
+ toast.view = layout
+ toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 100)
+ toast.show()
+ } catch (e: Exception) {
+ // Fallback to default toast if custom toast fails
+ android.widget.Toast.makeText(context, message, duration).show()
+ }
+}
 // ============================================
 // 알람 ID 생성
 // ============================================
@@ -137,7 +178,9 @@ private fun cancelAllPendingIntentsForUniqueId(context: Context, uniqueId: Int)
             for (day in 1..31) {
                 try {
                     val alarmId = 200000000 + year * 1000000 + month * 10000 + day * 100 + baseId
-                    val intent = Intent(context, AlarmReceiver::class.java)
+                    val intent = Intent(context, AlarmReceiver::class.java).apply {
+                        action = "com.example.shiftalarm.ALARM_TRIGGER"
+                    }
                     val pendingIntent = PendingIntent.getBroadcast(
                         context, alarmId, intent,
                         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
@@ -200,7 +243,9 @@ private fun cancelTestAlarm(context: Context) {
 
 private fun cancelAlarmInternal(context: Context, alarmId: Int) {
     val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-    val intent = Intent(context, AlarmReceiver::class.java)
+    val intent = Intent(context, AlarmReceiver::class.java).apply {
+        action = "com.example.shiftalarm.ALARM_TRIGGER"
+    }
     val pendingIntent = PendingIntent.getBroadcast(
         context, alarmId, intent,
         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE

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

@@ -1,9 +1,13 @@
 package com.example.shiftalarm
 
 import android.content.Context
-import androidx.room.*
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 
-@Database(entities = [ShiftOverride::class, DailyMemo::class, CustomAlarm::class], version = 3, exportSchema = false)
+@Database(entities = [ShiftOverride::class, DailyMemo::class, CustomAlarm::class, AnnualLeave::class], version = 4, exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun shiftDao(): ShiftDao
 
@@ -11,6 +15,23 @@ abstract class AppDatabase : RoomDatabase() {
         @Volatile
         private var INSTANCE: AppDatabase? = null
 
+        // Migration from version 3 to 4: Add AnnualLeave table
+        private val MIGRATION_3_4 = object : Migration(3, 4) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Create AnnualLeave table
+                database.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS annual_leave (
+                        id INTEGER PRIMARY KEY NOT NULL,
+                        totalDays REAL NOT NULL,
+                        remainingDays REAL NOT NULL,
+                        updatedAt INTEGER NOT NULL
+                    )
+                    """.trimIndent()
+                )
+            }
+        }
+
         fun getDatabase(context: Context): AppDatabase {
             return INSTANCE ?: synchronized(this) {
                 val instance = Room.databaseBuilder(
@@ -18,7 +39,7 @@ abstract class AppDatabase : RoomDatabase() {
                     AppDatabase::class.java,
                     "shift_database"
                 )
-                .fallbackToDestructiveMigration() // Simple for now
+                .addMigrations(MIGRATION_3_4)
                 .build()
                 INSTANCE = instance
                 instance

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

@@ -39,14 +39,21 @@ object AppUpdateManager {
                     reader.close()
 
                     val json = JSONObject(result)
+                    val serverVersionCode = json.getInt("versionCode")
                     val serverVersionName = json.getString("versionName")
                     val apkUrl = json.getString("apkUrl")
                     val changelog = json.optString("changelog", "버그 수정 및 성능 향상")
 
                     val pInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
+                    val currentVersionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        pInfo.longVersionCode.toInt()
+                    } else {
+                        @Suppress("DEPRECATION")
+                        pInfo.versionCode
+                    }
                     val currentVersionName = pInfo.versionName ?: "0.0.0"
 
-                    if (isNewerVersion(serverVersionName, currentVersionName)) {
+                    if (serverVersionCode > currentVersionCode) {
                         activity.runOnUiThread {
                             showUpdateDialog(activity, serverVersionName, changelog, apkUrl)
                         }
@@ -71,29 +78,6 @@ object AppUpdateManager {
         }.start()
     }
 
-    private fun isNewerVersion(server: String, current: String): Boolean {
-        try {
-            // Clean version strings (remove non-numeric suffixes if any)
-            val sClean = server.split("-")[0].split(" ")[0]
-            val cClean = current.split("-")[0].split(" ")[0]
-            
-            val sParts = sClean.split(".").map { it.filter { char -> char.isDigit() }.let { p -> if (p.isEmpty()) 0 else p.toInt() } }
-            val cParts = cClean.split(".").map { it.filter { char -> char.isDigit() }.let { p -> if (p.isEmpty()) 0 else p.toInt() } }
-            
-            val length = Math.max(sParts.size, cParts.size)
-            for (i in 0 until length) {
-                val s = if (i < sParts.size) sParts[i] else 0
-                val c = if (i < cParts.size) cParts[i] else 0
-                if (s > c) return true
-                if (s < c) return false
-            }
-        } catch (e: Exception) {
-            android.util.Log.e("AppUpdateManager", "Version comparison failed: ${e.message}")
-            return false
-        }
-        return false
-    }
-
     private fun showUpdateDialog(activity: Activity, version: String, changelog: String, apkUrl: String) {
         com.google.android.material.dialog.MaterialAlertDialogBuilder(activity)
             .setTitle("새로운 업데이트 발견 (v$version)")

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

@@ -24,7 +24,6 @@ class CalendarAdapter(
     private val listener: OnDayClickListener,
     var showHolidays: Boolean = true
 ) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
-
     interface OnDayClickListener {
         fun onDayClick(date: LocalDate, currentShift: String)
     }
@@ -61,7 +60,6 @@ class CalendarAdapter(
 
         // Day Number
         holder.dayNumber.text = item.date.dayOfMonth.toString()
-        
         // Holiday / Weekend logic
         val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY
         val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY
@@ -99,7 +97,7 @@ class CalendarAdapter(
         holder.shiftChar.background = null
         holder.shiftChar.text = ""
         holder.holidayNameSmall.visibility = View.GONE
-        holder.shiftChar.textSize = 13f
+        holder.shiftChar.textSize = 15f
 
         // "반월", "반년" (Half-Monthly, Half-Yearly) Special Logic
         // These are overrides or specific shifts that user sets.
@@ -111,7 +109,7 @@ class CalendarAdapter(
             // Holiday Mode (Priority): Show full holiday name, no circle
             holder.shiftChar.text = fullHolidayName
             holder.shiftChar.setTextColor(Color.parseColor("#FF5252"))
-            holder.shiftChar.textSize = 10f
+                holder.shiftChar.textSize = 11f
             holder.shiftChar.background = null
         } else if (item.shift != null && item.shift != "비번") {
             // Shift Mode
@@ -120,7 +118,7 @@ class CalendarAdapter(
             if (item.shift == "반월" || item.shift == "반년") {
                  holder.shiftChar.text = if (item.shift == "반월") "월" else "년"
                  holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black)) // Black for contrast on Half Red/Transparent
-                 holder.shiftChar.textSize = 13f
+                 holder.shiftChar.textSize = 15f
                  holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
             } else {
                 // Standard Logic
@@ -137,7 +135,7 @@ class CalendarAdapter(
                     else -> item.shift.take(1)
                 }
                 holder.shiftChar.text = shiftAbbreviation
-                holder.shiftChar.textSize = 15f
+                holder.shiftChar.textSize = 17f
                 holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)
 
                 val shiftColorRes = when (item.shift) {
@@ -205,7 +203,7 @@ class CalendarAdapter(
              // holder.holidayNameSmall.text = HolidayManager.getLunarDateString(item.date)
              
              holder.shiftChar.text = HolidayManager.getLunarDateString(item.date)
-             holder.shiftChar.textSize = 10f
+             holder.shiftChar.textSize = 11f
              holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
              holder.shiftChar.background = null
         }

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

@@ -1,6 +1,7 @@
 package com.example.shiftalarm
 
-import androidx.room.*
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 
 @Entity(tableName = "shift_overrides", primaryKeys = ["factory", "team", "date"])
 data class ShiftOverride(
@@ -28,3 +29,12 @@ data class CustomAlarm(
     val snoozeInterval: Int = 5,
     val snoozeRepeat: Int = 3
 )
+
+@Entity(tableName = "annual_leave")
+data class AnnualLeave(
+    @PrimaryKey
+    val id: Int = 1, // Single row for app-wide annual leave
+    val totalDays: Float, // 총 연차 (1~25)
+    val remainingDays: Float, // 남은 연차
+    val updatedAt: Long = System.currentTimeMillis()
+)

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

@@ -93,6 +93,7 @@ class FragmentSettingsAdditional : Fragment() {
 
         // Tide Switch
         binding.switchTide.isChecked = prefs.getBoolean("show_tide", false)
+        loadAppVersion()
     }
 
     private fun setupListeners() {
@@ -211,6 +212,18 @@ class FragmentSettingsAdditional : Fragment() {
         }
     }
 
+    
+
+    private fun loadAppVersion() {
+        try {
+            val packageInfo = requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
+            val versionName = packageInfo.versionName
+            binding.tvAppVersion.text = "버전 $versionName"
+        } catch (e: Exception) {
+            binding.tvAppVersion.text = "버전 1.4.0"
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -451,13 +451,18 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
         if (android.os.Build.VERSION.SDK_INT >= 23) {
             timePicker.hour = parts[0].toInt(); timePicker.minute = parts[1].toInt()
         } else {
-            timePicker.currentHour = parts[0].toInt(); timePicker.currentMinute = parts[1].toInt()
+            @Suppress("DEPRECATION")
+            timePicker.currentHour = parts[0].toInt()
+            @Suppress("DEPRECATION")
+            timePicker.currentMinute = parts[1].toInt()
         }
 
         btnSelectSound.setOnClickListener {
             val intent = Intent(android.media.RingtoneManager.ACTION_RINGTONE_PICKER).apply {
                 putExtra(android.media.RingtoneManager.EXTRA_RINGTONE_TYPE, android.media.RingtoneManager.TYPE_ALARM)
                 putExtra(android.media.RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, if (currentDialogSoundUri != null) android.net.Uri.parse(currentDialogSoundUri) else null as android.net.Uri?)
+                // 무음 선택 방지: 시스템 알람음만 선택 가능
+                putExtra(android.media.RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, false)
             }
             startActivityForResult(intent, 100)
         }
@@ -485,7 +490,9 @@ class FragmentSettingsAlarm : Fragment(), SharedPreferences.OnSharedPreferenceCh
 
         btnCancel.setOnClickListener { dialog.dismiss() }
         btnSave.setOnClickListener {
+            @Suppress("DEPRECATION")
             val h = if (android.os.Build.VERSION.SDK_INT >= 23) timePicker.hour else timePicker.currentHour
+            @Suppress("DEPRECATION")
             val m = if (android.os.Build.VERSION.SDK_INT >= 23) timePicker.minute else timePicker.currentMinute
             val time = String.format("%02d:%02d", h, m)
             

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

@@ -4,13 +4,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import com.example.shiftalarm.databinding.FragmentSettingsLabBinding
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.delay
 
 class FragmentSettingsLab : Fragment() {
 
     private var _binding: FragmentSettingsLabBinding? = null
     private val binding get() = _binding!!
+    private var isInitialLoad = true
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -20,6 +26,86 @@ class FragmentSettingsLab : Fragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        setupSpinner()
+        loadAnnualLeave()
+    }
+
+    private fun setupSpinner() {
+        // 1~25일 선택 가능한 어댑터 설정
+        val daysList = (1..25).map { "${it}일" }.toList()
+        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, daysList)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        binding.spinnerTotalDays.adapter = adapter
+        
+        // 선택 시 자동 저장
+        binding.spinnerTotalDays.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                if (!isInitialLoad) {
+                    val totalDays = position + 1 // 0-indexed to actual days
+                    saveAnnualLeave(totalDays)
+                }
+            }
+            
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                // Do nothing
+            }
+        }
+    }
+
+    private fun loadAnnualLeave() {
+        lifecycleScope.launch {
+            isInitialLoad = true
+            val repo = ShiftRepository(requireContext())
+            
+            val annualLeave = repo.getAnnualLeave()
+            annualLeave?.let {
+                // 저장된 값이 있으면 해당 위치 선택 (0-indexed)
+                binding.spinnerTotalDays.setSelection(it.totalDays.toInt() - 1)
+                binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
+            } ?: run {
+                // Default: 15 days (index 14)
+                binding.spinnerTotalDays.setSelection(14)
+                binding.tvRemainingDays.text = "15"
+            }
+            
+            // 초기 로드 완료 후 플래그 변경 (약간의 딜레이로 초기 선택 이벤트 방지)
+            delay(300)
+            isInitialLoad = false
+        }
+    }
+
+    private fun saveAnnualLeave(totalDays: Int) {
+        lifecycleScope.launch {
+            val repo = ShiftRepository(requireContext())
+            
+            repo.recalculateAndSaveAnnualLeave(totalDays.toFloat())
+            
+            val updated = repo.getAnnualLeave()
+            updated?.let {
+                binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
+                showCustomToast(requireContext(), "총 연차 ${totalDays}일로 저장되었습니다 (남은 연차: ${formatRemainingDays(it.remainingDays)}일)")
+            }
+        }
+    }
+
+    /**
+     * 남은 연차 표시 형식 개선
+     * - 정수면 정수로 표시 (예: 22)
+     * - 소숫점 있으면 소숫점 표시 (예: 21.5)
+     */
+    private fun formatRemainingDays(days: Float): String {
+        return if (days == days.toInt().toFloat()) {
+            // 정수인 경우
+            days.toInt().toString()
+        } else {
+            // 소숫점이 있는 경우 (0.5 등)
+            String.format("%.1f", days)
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -202,6 +202,17 @@ class MainActivity : AppCompatActivity() {
         lifecycleScope.launch {
             syncAllAlarms(this@MainActivity)
         }
+
+        // 연차 정보 업데이트
+        lifecycleScope.launch {
+            val repo = ShiftRepository(this@MainActivity)
+            val annualLeave = repo.getAnnualLeave()
+            annualLeave?.let {
+                binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
+            } ?: run {
+                binding.tvAnnualLeave.text = "연차: --"
+            }
+        }
     }
 
     private fun showMonthYearPicker() {
@@ -316,8 +327,15 @@ class MainActivity : AppCompatActivity() {
                 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 = "연차: --"
+            }
+        }
         updateOtherTeamsLayout(today, factory, prefs)
     }
 
@@ -377,7 +395,7 @@ class MainActivity : AppCompatActivity() {
  if (currentViewTeam != t) {
  currentViewTeam = t
  updateCalendar()
-                            Toast.makeText(context, "${t}반 근무표를 표시합니다.", Toast.LENGTH_SHORT).show()
+ showCustomToast(context, "${t}반 근무표를 표시합니다.")
  }
  }
                 }
@@ -595,6 +613,7 @@ class MainActivity : AppCompatActivity() {
                 android.widget.Toast.makeText(this, "원래 근무로 복구되었습니다.", android.widget.Toast.LENGTH_SHORT).show()
                 syncAllAlarms(this)
                 updateCalendar()
+                repo.updateRemainingAnnualLeave()
             }
             "직접 입력" -> {
                 showCustomInputDialog(date, repo, team, factory)
@@ -617,6 +636,8 @@ class MainActivity : AppCompatActivity() {
             else -> {
                 // New Types: 월차, 연차, 반월, 반년, 교육 -> Saved as Override with no time
                 repo.setOverride(date, selected, team, factory)
+                // 연차 계산을 먼저 수행하고 달력 업데이트
+                repo.updateRemainingAnnualLeave()
                 updateCalendar()
                 syncAllAlarms(this)
                 android.widget.Toast.makeText(this, "${selected}(으)로 기록되었습니다. 알람이 해제됩니다.", android.widget.Toast.LENGTH_SHORT).show()
@@ -686,6 +707,18 @@ class MainActivity : AppCompatActivity() {
             Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show()
         }
     }
-
-
+    /**
+     * 남은 연차 표시 형식 개선
+     * - 정수면 정수로 표시 (예: 22)
+     * - 소숫점 있으면 소숫점 표시 (예: 21.5)
+     */
+    private fun formatRemainingDays(days: Float): String {
+        return if (days == days.toInt().toFloat()) {
+            // 정수인 경우
+            days.toInt().toString()
+        } else {
+            // 소숫점이 있는 경우 (0.5 등)
+            String.format("%.1f", days)
+        }
+    }
 }

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

@@ -1,6 +1,11 @@
 package com.example.shiftalarm
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
 
 @Dao
 interface ShiftDao {
@@ -57,4 +62,17 @@ interface ShiftDao {
 
     @Query("DELETE FROM custom_alarms")
     suspend fun clearCustomAlarms()
+
+    // Annual Leave Queries
+    @Query("SELECT * FROM annual_leave WHERE id = 1")
+    suspend fun getAnnualLeave(): AnnualLeave?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAnnualLeave(annualLeave: AnnualLeave)
+
+    @Query("UPDATE annual_leave SET remainingDays = :remainingDays, updatedAt = :timestamp WHERE id = 1")
+    suspend fun updateRemainingDays(remainingDays: Float, timestamp: Long = System.currentTimeMillis())
+
+    @Query("DELETE FROM annual_leave")
+    suspend fun clearAnnualLeave()
 }

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

@@ -57,4 +57,62 @@ class ShiftRepository(private val context: Context) {
     suspend fun clearAllCustomAlarms() = withContext(Dispatchers.IO) {
         dao.clearCustomAlarms()
     }
+
+ // Annual Leave
+ suspend fun calculateUsedAnnualLeave(): Float = withContext(Dispatchers.IO) {
+ val currentYear = java.time.Year.now(java.time.ZoneId.of("Asia/Seoul")).toString()
+ val overrides = dao.getAllOverrides()
+
+ var usedDays = 0f
+
+ for (override in overrides) {
+ if (override.date.startsWith(currentYear)) {
+ when (override.shift) {
+ "연차" -> usedDays += 1f
+ "반년" -> usedDays += 0.5f
+ }
+ }
+ }
+
+ usedDays
+ }
+
+    suspend fun getAnnualLeave(): AnnualLeave? = withContext(Dispatchers.IO) {
+        dao.getAnnualLeave()
+    }
+
+    suspend fun recalculateAndSaveAnnualLeave(totalDays: Float) {
+        val usedDays = calculateUsedAnnualLeave()
+        val remainingDays = totalDays - usedDays
+        
+        dao.insertAnnualLeave(AnnualLeave(
+            id = 1,
+            totalDays = totalDays,
+            remainingDays = remainingDays
+        ))
+    }
+
+    suspend fun updateRemainingAnnualLeave() {
+        val annualLeave = dao.getAnnualLeave()
+        val usedDays = calculateUsedAnnualLeave()
+        
+        if (annualLeave != null) {
+            val remainingDays = annualLeave.totalDays - usedDays
+            dao.insertAnnualLeave(annualLeave.copy(remainingDays = remainingDays))
+        } else {
+            // AnnualLeave가 없으면 기본값 15일로 생성
+            dao.insertAnnualLeave(AnnualLeave(
+                id = 1,
+                totalDays = 15f,
+                remainingDays = 15f - usedDays
+            ))
+        }
+    }
+        val annualLeave = dao.getAnnualLeave()
+        annualLeave?.let {
+            val usedDays = calculateUsedAnnualLeave()
+            val remainingDays = it.totalDays - usedDays
+            dao.insertAnnualLeave(it.copy(remainingDays = remainingDays))
+        }
+    }
 }

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 배경색: 다크모드에서도 잘 보이도록 surface 색상 사용 -->
+    <solid android:color="#CC333333" />
+    <corners android:radius="16dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/outline" />
+</shape>

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

@@ -8,7 +8,7 @@
         <shape android:shape="oval">
             <stroke android:width="1.5dp" android:color="@color/shift_red"/>
             <solid android:color="@android:color/transparent"/>
-            <size android:width="44dp" android:height="44dp"/>
+            <size android:width="52dp" android:height="52dp"/>
         </shape>
     </item>
 </layer-list>

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid android:color="@color/primary" />
-    <size android:width="44dp" android:height="44dp" />
+    <size android:width="52dp" android:height="52dp" />
 </shape>

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

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <stroke android:width="1.5dp" android:color="@color/primary" />
-    <size android:width="44dp" android:height="44dp" />
+    <size android:width="52dp" android:height="52dp" />
 </shape>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="44dp"
-    android:height="44dp"
-    android:viewportWidth="44"
-    android:viewportHeight="44">
+    android:width="52dp"
+    android:height="52dp"
+    android:viewportWidth="52"
+    android:viewportHeight="52">
     <!-- Left Half Red -->
     <path
         android:name="left_half"
         android:fillColor="@color/shift_red"
-        android:pathData="M22,0 A22,22 0 0 0 22,44 L22,0 Z" />
+        android:pathData="M26,0 A26,26 0 0 0 26,52 L26,0 Z" />
+    
 </vector>

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

@@ -63,7 +63,7 @@
         android:id="@+id/calendarCard"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginHorizontal="12dp"
+        android:layout_marginHorizontal="3dp"
         android:layout_marginBottom="8dp"
         app:cardCornerRadius="28dp"
         app:cardElevation="0dp"
@@ -160,7 +160,20 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/btnTideLocation"/>
+                    app:layout_constraintEnd_toStartOf="@id/tvAnnualLeave"/>
+
+                <TextView
+                    android:id="@+id/tvAnnualLeave"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="연차: 0.0"
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/primary"
+                    android:layout_marginEnd="8dp"
+                    app:layout_constraintEnd_toStartOf="@id/btnTideLocation"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
                 <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btnTideLocation"
@@ -227,7 +240,7 @@
         android:id="@+id/otherTeamsCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
+        android:layout_marginHorizontal="3dp"
         android:layout_marginBottom="16dp"
         app:cardCornerRadius="20dp"
         app:cardElevation="0dp"
@@ -261,5 +274,4 @@
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@drawable/bg_custom_toast"
+    android:paddingHorizontal="20dp"
+    android:paddingVertical="12dp"
+    android:gravity="center">
+
+    <TextView
+        android:id="@+id/toastText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@android:color/white"
+        android:maxLines="2"
+        android:ellipsize="end" />
+
+</LinearLayout>

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

@@ -29,7 +29,7 @@
             android:text="알람 추가"
             android:textSize="18sp"
             android:textStyle="bold"
-            android:textColor="@color/black"
+        android:textColor="@color/text_primary"
             android:layout_centerInParent="true"/>
 
         <TextView
@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="24dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/white"
+                app:cardBackgroundColor="@color/surface"
                 android:layout_marginBottom="16dp">
 
                 <LinearLayout
@@ -116,7 +116,7 @@
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="24dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/white"
+                app:cardBackgroundColor="@color/surface"
                 android:layout_marginBottom="16dp">
                 <LinearLayout
                     android:id="@+id/btnSelectSound"
@@ -162,7 +162,7 @@
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="24dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/white"
+                app:cardBackgroundColor="@color/surface"
                 android:layout_marginBottom="16dp">
                 <LinearLayout
                     android:layout_width="match_parent"

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

@@ -56,16 +56,32 @@
             <TextView android:id="@+id/btnYaMat" style="@style/ShiftCircleButton" android:text="야맞" android:textSize="13sp" android:textColor="@color/shift_yamat"/>
 
             <!-- Row 2 -->
-            <TextView android:id="@+id/btnOff" style="@style/ShiftCircleButton" android:text="휴" android:textColor="@color/shift_off"/>
-            <TextView android:id="@+id/btnWolcha" style="@style/ShiftCircleButton" android:text="월차" android:textSize="13sp" android:textColor="@color/secondary"/>
-            <TextView android:id="@+id/btnYeoncha" style="@style/ShiftCircleButton" android:text="연차" android:textSize="13sp" android:textColor="@color/secondary"/>
-            <TextView android:id="@+id/btnBanwol" style="@style/ShiftCircleButton" android:text="반월" android:textSize="13sp" android:textColor="@color/shift_red"/>
-            <TextView android:id="@+id/btnBannyeon" style="@style/ShiftCircleButton" android:text="반년" android:textSize="13sp" android:textColor="@color/shift_red"/>
+        <TextView android:id="@+id/btnOff" style="@style/ShiftCircleButton" android:text="휴" android:textColor="@color/shift_off" 
+            app:layout_constraintTop_toTopOf="parent" 
+            app:layout_constraintStart_toStartOf="parent"/>
+        <TextView android:id="@+id/btnWolcha" style="@style/ShiftCircleButton" android:text="월차" android:textSize="13sp" android:textColor="@color/secondary" 
+            app:layout_constraintTop_toTopOf="parent" 
+            app:layout_constraintStart_toStartOf="parent"/>
+            <TextView android:id="@+id/btnYeoncha" style="@style/ShiftCircleButton" android:text="연차" android:textSize="13sp" android:textColor="@color/secondary" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
+            <TextView android:id="@+id/btnBanwol" style="@style/ShiftCircleButton" android:text="반월" android:textSize="13sp" android:textColor="@color/shift_red" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
+            <TextView android:id="@+id/btnBannyeon" style="@style/ShiftCircleButton" android:text="반년" android:textSize="13sp" android:textColor="@color/shift_red" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
 
             <!-- Row 3 -->
-            <TextView android:id="@+id/btnEdu" style="@style/ShiftCircleButton" android:text="교육" android:textSize="13sp" android:textColor="@color/primary"/>
-            <TextView android:id="@+id/btnReset" style="@style/ShiftCircleButton" android:text="초기" android:textSize="13sp" android:textColor="@color/text_secondary"/>
-            <TextView android:id="@+id/btnManual" style="@style/ShiftCircleButton" android:text="직접" android:textSize="14sp" android:textColor="@color/shift_gray"/>
+            <TextView android:id="@+id/btnEdu" style="@style/ShiftCircleButton" android:text="교육" android:textSize="13sp" android:textColor="@color/primary" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
+            <TextView android:id="@+id/btnReset" style="@style/ShiftCircleButton" android:text="초기" android:textSize="13sp" android:textColor="@color/text_secondary" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
+            <TextView android:id="@+id/btnManual" style="@style/ShiftCircleButton" android:text="직접" android:textSize="14sp" android:textColor="@color/shift_gray" 
+                app:layout_constraintTop_toTopOf="parent" 
+                app:layout_constraintStart_toStartOf="parent"/>
 
             <androidx.constraintlayout.helper.widget.Flow
                 android:id="@+id/gridFlow"

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

@@ -20,7 +20,7 @@
             android:text="날짜 이동"
             android:textSize="24sp"
             android:textStyle="bold"
-            android:textColor="@color/black"
+        android:textColor="@color/text_primary"
             android:layout_marginBottom="32dp"
             android:layout_gravity="center_horizontal"/>
 

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

@@ -361,5 +361,17 @@
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 
+        <!-- App Version -->
+        <TextView
+            android:id="@+id/tvAppVersion"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="버전 1.4.0"
+            android:textColor="@color/text_tertiary"
+            android:textSize="12sp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"/>
+
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

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

@@ -4,33 +4,133 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="24dp"
-    android:gravity="center">
-
-    <ImageView
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:src="@drawable/ic_settings"
-        app:tint="@color/text_tertiary"
-        android:layout_marginBottom="16dp"
-        android:alpha="0.5"/>
+    android:padding="16dp"
+    android:gravity="center_horizontal">
 
+    <!-- Header Title -->
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="실험실 기능 준비 중"
+        android:text="나의 연차 설정"
         android:textSize="18sp"
         android:textStyle="bold"
-        android:textColor="@color/text_secondary"
-        android:layout_marginBottom="8dp"/>
+        android:textColor="@color/text_primary"
+        android:layout_marginBottom="24dp"/>
+
+    <!-- Total Annual Leave Setting -->
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="2dp"
+        app:cardBackgroundColor="@color/surface">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="16dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="총 연차"
+                android:textSize="14sp"
+                android:textColor="@color/text_secondary"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <Spinner
+                    android:id="@+id/spinnerTotalDays"
+                    android:layout_width="80dp"
+                    android:layout_height="48dp"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-        android:text="더욱 편리한 기능을 개발하고 있습니다.\n다음 업데이트를 기대해 주세요!"
+                    android:text="일"
                     android:textSize="14sp"
                     android:textColor="@color/text_tertiary"
-        android:gravity="center"
-        android:lineSpacingExtra="4dp"/>
+                    android:layout_marginStart="4dp"/>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+    <!-- Remaining Annual Leave Display -->
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="2dp"
+        app:cardBackgroundColor="@color/surface">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="16dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="남은 연차"
+                android:textSize="14sp"
+                android:textColor="@color/text_secondary"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="bottom">
+
+                <TextView
+                    android:id="@+id/tvRemainingDays"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="15"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/primary"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="일"
+                    android:textSize="14sp"
+                    android:textColor="@color/text_tertiary"
+                    android:layout_marginStart="4dp"/>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+    <!-- Calculation Info -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="※ 연차: -1일 / 반년: -0.5일 차감"
+        android:textSize="12sp"
+        android:textColor="@color/text_tertiary"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"/>
+
+    <!-- 기능추가중 Notice -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="기능추가중"
+        android:textSize="11sp"
+        android:textColor="@color/primary"
+        android:layout_marginBottom="24dp"
+        android:gravity="center"/>
 
 </LinearLayout>

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

@@ -38,7 +38,8 @@
     <!-- Shift Abbreviation Circular Indicator (Center) -->
     <TextView
         android:id="@+id/shiftChar"
-        android:layout_width="40dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_height="40dp"
         android:gravity="center"
         android:text="주"

app/src/main/res/values-en/strings.xml

@@ -1,3 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">shiftring</string>
+    <string name="app_name">Shift Alarm</string>
+    <string name="team_selection">Team selection</string>
+    <string name="current_shift">Current shift: %1$s</string>
+    <string name="next_shift">Next shift: %1$s</string>
+    <string name="alarm_status">Alarm Status</string>
+    <string name="company_selection">Company selection</string>
+    <string name="tab_basic">Basic Settings</string>
+    <string name="tab_alarm">Alarm Settings</string>
+    <string name="tab_additional">Extras</string>
+    <string name="tab_lab">Leave Management</string>
+    <string-array name="factory_array">
+        <item>Jeonju</item>
+        <item>Nonsan</item>
+    </string-array>
+    <string-array name="team_array">
+        <item>A Team</item>
+        <item>B Team</item>
+        <item>C Team</item>
+        <item>D Team</item>
+    </string-array>
+    <string-array name="theme_array">
+        <item>System Settings</item>
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
 </resources>

app/src/main/res/values/strings.xml

@@ -9,7 +9,7 @@
     <string name="tab_basic">기본 설정</string>
     <string name="tab_alarm">알람 설정</string>
     <string name="tab_additional">부가기능</string>
-    <string name="tab_lab">실험실</string>
+    <string name="tab_lab">근무 관리</string>
 
     <string-array name="factory_array">
         <item>전주</item>

version.json

@@ -1,7 +1,7 @@
 {
-  "versionCode": 1120,
-  "versionName": "1.2.0",
-  "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.0/app.apk",
-  "changelog": "v1.2.0: 알람 버그 수정 (전체알람 꺼짐, 무음모드 알람, 다크모드 팝업 등)",
+  "versionCode": 1147,
+  "versionName": "1.4.7",
+  "apkUrl": "https://git.webpluss.net/attachments/eb7f2a8d-3243-4c23-a833-f9864a4686a3",
+  "changelog": "v1.4.7: 버전업 오류 수정, 휴가관리→근무관리 명칭 변경, 기능추가중 표시",
   "forceUpdate": false
 }