fix: 휴가관리 UI 정리 및 자동 저장 기능 추가

- 중복된 '연차: -1일 / 반년: -0.5일 차감' 텍스트 제거
- 중복된 Spinner/NumberPicker 뷰 정리
- 저장 버튼 제거하고 Spinner 선택 시 자동 저장되도록 개선
- 버전 업데이트 v1.4.6 (1146)

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 = 1142
+ versionCode = 1144
- versionName = "1.4.2"
+ versionName = "1.4.4"
+ versionCode = 1145
+ versionName = "1.4.5"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  }

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

@@ -22,8 +22,7 @@ data class DayShift(
 class CalendarAdapter(
     var days: List<DayShift>,
     private val listener: OnDayClickListener,
- var showHolidays: Boolean = true,
+    var showHolidays: Boolean = true
- private val rowCount: Int = 6 // Default to 6 rows
 ) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
     interface OnDayClickListener {
         fun onDayClick(date: LocalDate, currentShift: String)
@@ -52,15 +51,6 @@ class CalendarAdapter(
         val item = days[position]
         val context = holder.itemView.context
 
- // Fixed item height - square cells based on screen width
- val displayMetrics = context.resources.displayMetrics
- val screenWidth = displayMetrics.widthPixels
- val itemHeight = screenWidth / 7
-
- val layoutParams = holder.itemView.layoutParams
- layoutParams.height = itemHeight
- holder.itemView.layoutParams = layoutParams
-
         if (item.date == null) {
             holder.itemView.visibility = View.INVISIBLE
             return
@@ -69,7 +59,7 @@ class CalendarAdapter(
         holder.itemView.visibility = View.VISIBLE
 
         // 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

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.Toast
+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?,
@@ -26,51 +29,81 @@ 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
+        
+        // 선택 시 자동 저장
+        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 {
-                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"
             }
+            
+            // 초기 로드 완료 후 플래그 변경 (약간의 딜레이로 초기 선택 이벤트 방지)
+            delay(300)
+            isInitialLoad = false
         }
     }
 
- private fun setupSaveButton() {
+    private fun saveAnnualLeave(totalDays: Int) {
- binding.btnSaveAnnualLeave.setOnClickListener {
- val totalDays = binding.npTotalDays.value.toFloat()
-
         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() {

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 = "연차: --"
             }
@@ -268,7 +268,6 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupCalendar() {
         binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
- binding.calendarGrid.setHasFixedSize(false) // Allow dynamic item sizing
         updateCalendar()
     }
 
@@ -308,34 +307,13 @@ class MainActivity : AppCompatActivity() {
 
             val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos)
 
- // Calculate row count (5 or 6 rows)
- val daysInMonth = currentViewMonth.lengthOfMonth()
- val firstDayOfMonth = currentViewMonth.atDay(1).dayOfWeek.value % 7
- val actualDayCount = firstDayOfMonth + daysInMonth
- val rowCount = if (actualDayCount <= 35) 5 else 6
-
             val adapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
                 override fun onDayClick(date: LocalDate, currentShift: String) {
                     showDaySettingsDialog(date, currentShift)
                 }
- }, binding.cbShowHolidays.isChecked, rowCount)
+            }, binding.cbShowHolidays.isChecked)
             
             binding.calendarGrid.adapter = adapter
-
- // Set RecyclerView height based on row count
- // 5 rows: fixed height to fill space, no scroll
- // 6 rows: max height (5 rows worth), enable scroll
- val displayMetrics = resources.displayMetrics
- val screenWidth = displayMetrics.widthPixels
- val cellHeight = screenWidth / 7 // Square cells
- val recyclerViewHeight = cellHeight * rowCount
- val layoutParams = binding.calendarGrid.layoutParams
- layoutParams.height = recyclerViewHeight
- binding.calendarGrid.layoutParams = layoutParams
-
- // Disable scroll for 5 rows, enable for 6 rows
- binding.calendarGrid.isNestedScrollingEnabled = rowCount > 5
-
             binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
             // Update Header Status Text with Permission Warning if needed
@@ -353,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 = "연차: --"
             }
@@ -658,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()
             }
         }
     }
@@ -728,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

@@ -58,12 +58,12 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!-- Maximized Calendar Card - Reduced margins for wider calendar -->
+    <!-- Maximized Calendar Card -->
     <androidx.cardview.widget.CardView
         android:id="@+id/calendarCard"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginHorizontal="4dp"
+        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="4dp"
+        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,119 +12,115 @@
         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="24dp"/>
 
     <!-- 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="16dp"
-            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="16dp"
-                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"/>
 
                 <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="16dp"
-            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="16dp"
-                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="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>
-
-</ScrollView>

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

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/dayRoot"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="92dp"
-    android:minHeight="72dp"
     android:background="@drawable/bg_grid_cell_v4">
 
     <!-- Day Number (top-left) -->
@@ -17,7 +16,7 @@
         android:layout_marginTop="4dp"
         android:text="12"
         android:textColor="@color/text_primary"
-        android:textSize="15sp"
+        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -36,21 +35,22 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <!-- Shift Abbreviation Circular Indicator (Center) - Larger size -->
+    <!-- Shift Abbreviation Circular Indicator (Center) -->
     <TextView
         android:id="@+id/shiftChar"
         android:layout_width="48dp"
         android:layout_height="48dp"
+        android:layout_height="40dp"
         android:gravity="center"
         android:text="주"
-        android:textSize="17sp"
+        android:textSize="15sp"
         android:textStyle="bold"
         android:textColor="@color/text_primary"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" 
-        app:layout_constraintVertical_bias="0.42"/>
+        app:layout_constraintVertical_bias="0.45"/>
 
     <!-- Memo Content Text (Below Shift) - Replacing icon logic for visibility -->
     <TextView

version.json

@@ -1,7 +1,7 @@
 {
- "versionCode": 1142,
+  "versionCode": 1146,
- "versionName": "1.4.2",
+  "versionName": "1.4.6",
- "apkUrl": "https://git.webpluss.net/attachments/96025498-3f84-4410-9f13-7cdd559ef60e",
+  "apkUrl": "https://git.webpluss.net/attachments/94d91eff-db0f-44af-b043-b03918cba243",
- "changelog": "v1.4.2: 달력 5행/6행 스크롤 수정, 토스트 다크모드 완전 지원, 연차 설정 UI 개선",
+  "changelog": "v1.4.6: 휴가관리 중복 텍스트 제거, 자동 저장 기능 추가",
   "forceUpdate": false
 }