chore: 버전 업데이트 v1.4.5 (1145)

- versionCode: 1144 → 1145
- versionName: 1.4.4 → 1.4.5

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

app/build.gradle.kts

@@ -20,8 +20,10 @@ android {
  applicationId = "com.example.shiftalarm"
  minSdk = 26
  targetSdk = 35
- versionCode = 1143
+ versionCode = 1144
- versionName = "1.4.3"
+ versionName = "1.4.4"
+ versionCode = 1145
+ versionName = "1.4.5"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  }

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
+import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.example.shiftalarm.databinding.FragmentSettingsLabBinding
@@ -26,17 +26,17 @@ class FragmentSettingsLab : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         
-        setupNumberPicker()
+        setupSpinner()
         loadAnnualLeave()
         setupSaveButton()
     }
 
-    private fun setupNumberPicker() {
+    private fun setupSpinner() {
-        binding.npTotalDays.apply {
+        // 1~25일 선택 가능한 어댑터 설정
-            minValue = 1
+        val daysList = (1..25).map { "${it}일" }.toList()
-            maxValue = 25
+        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, daysList)
-            wrapSelectorWheel = false
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        }
+        binding.spinnerTotalDays.adapter = adapter
     }
 
     private fun loadAnnualLeave() {
@@ -45,34 +45,51 @@ class FragmentSettingsLab : Fragment() {
             
             val annualLeave = repo.getAnnualLeave()
             annualLeave?.let {
-                binding.npTotalDays.value = it.totalDays.toInt()
+                // 저장된 값이 있으면 해당 위치 선택 (0-indexed)
-                binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
+                binding.spinnerTotalDays.setSelection(it.totalDays.toInt() - 1)
+                binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
             } ?: run {
-                // Default: 15 days
+                // Default: 15 days (index 14)
-                binding.npTotalDays.value = 15
+                binding.spinnerTotalDays.setSelection(14)
-                binding.tvRemainingDays.text = "15.0"
+                binding.tvRemainingDays.text = "15"
             }
         }
     }
 
     private fun setupSaveButton() {
         binding.btnSaveAnnualLeave.setOnClickListener {
- val totalDays = binding.npTotalDays.value.toFloat()
+            val selectedPosition = binding.spinnerTotalDays.selectedItemPosition
+            val totalDays = selectedPosition + 1 // 0-indexed to actual days
             
             lifecycleScope.launch {
                 val repo = ShiftRepository(requireContext())
                 
- repo.recalculateAndSaveAnnualLeave(totalDays)
+                repo.recalculateAndSaveAnnualLeave(totalDays.toFloat())
                 
                 val updated = repo.getAnnualLeave()
                 updated?.let {
- binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
+                    binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
- showCustomToast(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", 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

@@ -208,7 +208,7 @@ class MainActivity : AppCompatActivity() {
             val repo = ShiftRepository(this@MainActivity)
             val annualLeave = repo.getAnnualLeave()
             annualLeave?.let {
- binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}"
+                binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
             } ?: run {
                 binding.tvAnnualLeave.text = "연차: --"
             }
@@ -331,7 +331,7 @@ class MainActivity : AppCompatActivity() {
             // Update Annual Leave display
             val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
             annualLeave?.let {
- binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}"
+                binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
             } ?: run {
                 binding.tvAnnualLeave.text = "연차: --"
             }
@@ -636,10 +636,11 @@ 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()
-                repo.updateRemainingAnnualLeave()
             }
         }
     }
@@ -706,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/ShiftRepository.kt

@@ -93,6 +93,21 @@ class ShiftRepository(private val context: Context) {
     }
 
     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()

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"
@@ -240,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"

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

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
     android:orientation="vertical"
-        android:padding="24dp"
+    android:padding="16dp"
     android:gravity="center_horizontal">
 
     <!-- Header Title -->
@@ -17,104 +12,126 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="나의 연차 설정"
-            android:textSize="20sp"
+        android:textSize="18sp"
         android:textStyle="bold"
         android:textColor="@color/text_primary"
-            android:layout_marginBottom="32dp"/>
+        android:layout_marginBottom="16dp"/>
 
     <!-- Total Annual Leave Setting -->
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
+        android:layout_marginBottom="12dp"
-            app:cardCornerRadius="16dp"
+        app:cardCornerRadius="12dp"
-            app:cardElevation="4dp"
+        app:cardElevation="2dp"
         app:cardBackgroundColor="@color/surface">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                android:orientation="vertical"
+            android:orientation="horizontal"
-                android:padding="24dp"
+            android:padding="12dp"
-                android:gravity="center">
+            android:gravity="center_vertical">
 
             <TextView
-                    android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:text="총 연차"
-                    android:textSize="16sp"
+                android:textSize="14sp"
-                    android:textColor="@color/text_secondary"
+                android:textColor="@color/text_secondary"/>
-                    android:layout_marginBottom="16dp"/>
 
-                <!-- NumberPicker for Total Days -->
+            <LinearLayout
-                <NumberPicker
-                    android:id="@+id/npTotalDays"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"/>
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <Spinner
+                    android:id="@+id/spinnerTotalDays"
+                    android:layout_width="80dp"
+                    android:layout_height="48dp"/>
+                    android:id="@+id/npTotalDays"
+                    android:layout_width="60dp"
+                    android:layout_height="100dp"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="일"
                     android:textSize="14sp"
-                    android:textColor="@color/text_tertiary"/>
+                    android:textColor="@color/text_tertiary"
-
+                    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="32dp"
+        android:layout_marginBottom="12dp"
-            app:cardCornerRadius="16dp"
+        app:cardCornerRadius="12dp"
-            app:cardElevation="4dp"
+        app:cardElevation="2dp"
         app:cardBackgroundColor="@color/surface">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                android:orientation="vertical"
+            android:orientation="horizontal"
-                android:padding="24dp"
+            android:padding="12dp"
-                android:gravity="center">
+            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:text="남은 연차"
+                android:orientation="horizontal"
-                    android:textSize="16sp"
+                android:gravity="bottom">
-                    android:textColor="@color/text_secondary"
-                    android:layout_marginBottom="8dp"/>
 
                 <TextView
                     android:id="@+id/tvRemainingDays"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="0.0"
+                    android:text="15"
-                    android:textSize="36sp"
+                    android:textSize="28sp"
                     android:textStyle="bold"
-                    android:textColor="@color/primary"
+                    android:textColor="@color/primary"/>
-                    android:layout_marginBottom="4dp"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="일"
                     android:textSize="14sp"
-                    android:textColor="@color/text_tertiary"/>
+                    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:text="※ 연차: -1일 / 반년: -0.5일 차감"
-            android:textSize="13sp"
+        android:textSize="12sp"
+        android:textColor="@color/text_tertiary"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"/>
+
+    <!-- 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="24dp"
         android:gravity="center"/>
@@ -131,5 +148,3 @@
         android:backgroundTint="@color/primary"/>
 
 </LinearLayout>
-
-</ScrollView>

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="주"

version.json

@@ -1,7 +1,7 @@
 {
- "versionCode": 1143,
+  "versionCode": 1145,
- "versionName": "1.4.3",
+  "versionName": "1.4.5",
- "apkUrl": "https://git.webpluss.net/attachments/40d6f89e-58c9-41a2-a4d1-c72784a95b70",
+  "apkUrl": "https://git.webpluss.net/attachments/aeb7b079-f81b-4c77-b8ee-b8fde90a530e",
- "changelog": "v1.4.3: 달력 레이아웃 1.3.0 버전처럼 복원 (마진 12dp, 고정 높이)",
+  "changelog": "v1.4.5: 연차 최초적용 수정, 휴가관리 Spinner 변경, 동그라미 크기 확대",
   "forceUpdate": false
 }