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>
fix: 휴가관리 UI 정리 및 자동 저장 기능 추가
2026-03-13 00:34:35 +09:00 · 2026-03-13 00:27:42 +09:00
5 changed files with 47 additions and 47 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,10 +20,8 @@ android {
 applicationId = "com.example.shiftalarm"
 minSdk = 26
 targetSdk = 35
- versionCode = 1144
- versionName = "1.4.4"
- versionCode = 1145
- versionName = "1.4.5"
+ versionCode = 1147
+ versionName = "1.4.7"

 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 }
--- a/app/src/main/java/com/example/shiftalarm/FragmentSettingsLab.kt
+++ b/app/src/main/java/com/example/shiftalarm/FragmentSettingsLab.kt
@@ -4,16 +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?,
@@ -28,7 +31,6 @@ class FragmentSettingsLab : Fragment() {
        
        setupSpinner()
        loadAnnualLeave()
-        setupSaveButton()
    }

    private fun setupSpinner() {
@@ -37,10 +39,25 @@ class FragmentSettingsLab : Fragment() {
        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()
@@ -53,24 +70,23 @@ class FragmentSettingsLab : Fragment() {
                binding.spinnerTotalDays.setSelection(14)
                binding.tvRemainingDays.text = "15"
            }
+            
+            // 초기 로드 완료 후 플래그 변경 (약간의 딜레이로 초기 선택 이벤트 방지)
+            delay(300)
+            isInitialLoad = false
        }
    }

-    private fun setupSaveButton() {
-        binding.btnSaveAnnualLeave.setOnClickListener {
-            val selectedPosition = binding.spinnerTotalDays.selectedItemPosition
-            val totalDays = selectedPosition + 1 // 0-indexed to actual days
+    private fun saveAnnualLeave(totalDays: Int) {
+        lifecycleScope.launch {
+            val repo = ShiftRepository(requireContext())
            
-            lifecycleScope.launch {
-                val repo = ShiftRepository(requireContext())
+            repo.recalculateAndSaveAnnualLeave(totalDays.toFloat())
            
-                repo.recalculateAndSaveAnnualLeave(totalDays.toFloat())
-                
-                val updated = repo.getAnnualLeave()
-                updated?.let {
-                    binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
-                    showCustomToast(requireContext(), "총 연차 ${totalDays}일로 저장되었습니다 (남은 연차: ${formatRemainingDays(it.remainingDays)}일)")
-                }
+            val updated = repo.getAnnualLeave()
+            updated?.let {
+                binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
+                showCustomToast(requireContext(), "총 연차 ${totalDays}일로 저장되었습니다 (남은 연차: ${formatRemainingDays(it.remainingDays)}일)")
            }
        }
    }
--- a/app/src/main/res/layout/fragment_settings_lab.xml
+++ b/app/src/main/res/layout/fragment_settings_lab.xml
@@ -15,13 +15,13 @@
        android:textSize="18sp"
        android:textStyle="bold"
        android:textColor="@color/text_primary"
-        android:layout_marginBottom="16dp"/>
+        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="12dp"
+        android:layout_marginBottom="16dp"
        app:cardCornerRadius="12dp"
        app:cardElevation="2dp"
        app:cardBackgroundColor="@color/surface">
@@ -30,7 +30,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
-            android:padding="12dp"
+            android:padding="16dp"
            android:gravity="center_vertical">

            <TextView
@@ -51,9 +51,6 @@
                    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"
@@ -70,7 +67,7 @@
    <androidx.cardview.widget.CardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="16dp"
        app:cardCornerRadius="12dp"
        app:cardElevation="2dp"
        app:cardBackgroundColor="@color/surface">
@@ -79,7 +76,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
-            android:padding="12dp"
+            android:padding="16dp"
            android:gravity="center_vertical">

            <TextView
@@ -126,25 +123,14 @@
        android:layout_marginBottom="8dp"
        android:gravity="center"/>

-    <!-- Calculation Info -->
+    <!-- 기능추가중 Notice -->
    <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:text="기능추가중"
+        android:textSize="11sp"
+        android:textColor="@color/primary"
        android:layout_marginBottom="24dp"
        android:gravity="center"/>

-    <!-- Save Button -->
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnSaveAnnualLeave"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:text="저장"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:cornerRadius="12dp"
-        android:backgroundTint="@color/primary"/>
-
 </LinearLayout>
--- a/app/src/main/res/values/strings.xml
+++ b/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>
--- a/version.json
+++ b/version.json
@@ -1,7 +1,7 @@
 {
-  "versionCode": 1145,
-  "versionName": "1.4.5",
-  "apkUrl": "https://git.webpluss.net/attachments/aeb7b079-f81b-4c77-b8ee-b8fde90a530e",
-  "changelog": "v1.4.5: 연차 최초적용 수정, 휴가관리 Spinner 변경, 동그라미 크기 확대",
+  "versionCode": 1147,
+  "versionName": "1.4.7",
+  "apkUrl": "https://git.webpluss.net/attachments/eb7f2a8d-3243-4c23-a833-f9864a4686a3",
+  "changelog": "v1.4.7: 버전업 오류 수정, 휴가관리→근무관리 명칭 변경, 기능추가중 표시",
  "forceUpdate": false
 }