feat: v1.3.0 - versionCode 기반 업데이트 체크

- 버전 1.2.5 → 1.3.0 (versionCode 1130) - AppUpdateManager: versionCode로 업데이트 비교 - versionName 비교 로직 제거 - 더 정확한 업데이트 감지 Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-02-28 18:50:55 +09:00
18 changed files with 55 additions and 310 deletions
--- a/app.apk
+++ b/app.apk
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,10 +20,9 @@ android {
        applicationId = "com.example.shiftalarm"
        minSdk = 26
        targetSdk = 35
-        versionCode = 1140
-        versionName = "1.4.0"
+        versionCode = 1130
        versionName = "1.3.0"
-
+        versionName = "1.2.5"


        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
--- a/app/src/main/java/com/example/shiftalarm/AppDatabase.kt
+++ b/app/src/main/java/com/example/shiftalarm/AppDatabase.kt
@@ -3,7 +3,7 @@ package com.example.shiftalarm
 import android.content.Context
 import androidx.room.*

-@Database(entities = [ShiftOverride::class, DailyMemo::class, CustomAlarm::class, AnnualLeave::class], version = 4, exportSchema = false)
+@Database(entities = [ShiftOverride::class, DailyMemo::class, CustomAlarm::class], version = 3, exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
    abstract fun shiftDao(): ShiftDao

--- a/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
+++ b/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
@@ -99,7 +99,7 @@ class CalendarAdapter(
        holder.shiftChar.background = null
        holder.shiftChar.text = ""
        holder.holidayNameSmall.visibility = View.GONE
-        holder.shiftChar.textSize = 15f
+        holder.shiftChar.textSize = 13f

        // "반월", "반년" (Half-Monthly, Half-Yearly) Special Logic
        // These are overrides or specific shifts that user sets.
@@ -111,7 +111,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 = 11f
+            holder.shiftChar.textSize = 10f
            holder.shiftChar.background = null
        } else if (item.shift != null && item.shift != "비번") {
            // Shift Mode
@@ -120,7 +120,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 = 15f
+                 holder.shiftChar.textSize = 13f
                 holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red)
            } else {
                // Standard Logic
@@ -137,7 +137,7 @@ class CalendarAdapter(
                    else -> item.shift.take(1)
                }
                holder.shiftChar.text = shiftAbbreviation
-                holder.shiftChar.textSize = 17f
+                holder.shiftChar.textSize = 15f
                holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD)

                val shiftColorRes = when (item.shift) {
@@ -205,7 +205,7 @@ class CalendarAdapter(
             // holder.holidayNameSmall.text = HolidayManager.getLunarDateString(item.date)
             
             holder.shiftChar.text = HolidayManager.getLunarDateString(item.date)
-             holder.shiftChar.textSize = 11f
+             holder.shiftChar.textSize = 10f
             holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
             holder.shiftChar.background = null
        }
--- a/app/src/main/java/com/example/shiftalarm/Entities.kt
+++ b/app/src/main/java/com/example/shiftalarm/Entities.kt
@@ -1,7 +1,6 @@
 package com.example.shiftalarm

-import androidx.room.Entity
-import androidx.room.PrimaryKey
+import androidx.room.*

@Entity(tableName = "shift_overrides", primaryKeys = ["factory", "team", "date"])
 data class ShiftOverride(
@@ -29,12 +28,3 @@ 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()
-)
--- a/app/src/main/java/com/example/shiftalarm/FragmentSettingsLab.kt
+++ b/app/src/main/java/com/example/shiftalarm/FragmentSettingsLab.kt
@@ -4,11 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
 import com.example.shiftalarm.databinding.FragmentSettingsLabBinding
-import kotlinx.coroutines.launch

 class FragmentSettingsLab : Fragment() {

@@ -23,56 +20,6 @@ class FragmentSettingsLab : Fragment() {
        return binding.root
    }

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        
-        setupNumberPicker()
-        loadAnnualLeave()
-        setupSaveButton()
-    }
-
-    private fun setupNumberPicker() {
-        binding.npTotalDays.apply {
-            minValue = 1
-            maxValue = 25
-            wrapSelectorWheel = false
-        }
-    }
-
-    private fun loadAnnualLeave() {
-        lifecycleScope.launch {
-            val repo = ShiftRepository(requireContext())
-            
-            val annualLeave = repo.getAnnualLeave()
-            annualLeave?.let {
-                binding.npTotalDays.value = it.totalDays.toInt()
-                binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
-            } ?: run {
-                // Default: 15 days
-                binding.npTotalDays.value = 15
-                binding.tvRemainingDays.text = "15.0"
-            }
-        }
-    }
-
-    private fun setupSaveButton() {
-        binding.btnSaveAnnualLeave.setOnClickListener {
-            val totalDays = binding.npTotalDays.value.toFloat()
-            
-            lifecycleScope.launch {
-                val repo = ShiftRepository(requireContext())
-                
-                repo.recalculateAndSaveAnnualLeave(totalDays)
-                
-                val updated = repo.getAnnualLeave()
-                updated?.let {
-                    binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
-                    Toast.makeText(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)", Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-    }
-
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
--- a/app/src/main/java/com/example/shiftalarm/ShiftDao.kt
+++ b/app/src/main/java/com/example/shiftalarm/ShiftDao.kt
@@ -1,11 +1,6 @@
 package com.example.shiftalarm

-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Update
+import androidx.room.*

@Dao
 interface ShiftDao {
@@ -62,17 +57,4 @@ 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()
 }
--- a/app/src/main/java/com/example/shiftalarm/ShiftRepository.kt
+++ b/app/src/main/java/com/example/shiftalarm/ShiftRepository.kt
@@ -57,47 +57,4 @@ 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().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()
-        annualLeave?.let {
-            val usedDays = calculateUsedAnnualLeave()
-            val remainingDays = it.totalDays - usedDays
-            dao.insertAnnualLeave(it.copy(remainingDays = remainingDays))
-        }
-    }
 }
--- a/app/src/main/res/drawable/bg_shift_half_red.xml
+++ b/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="52dp" android:height="52dp"/>
+            <size android:width="44dp" android:height="44dp"/>
        </shape>
    </item>
 </layer-list>
--- a/app/src/main/res/drawable/bg_shift_solid_v4.xml
+++ b/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="52dp" android:height="52dp" />
+    <size android:width="44dp" android:height="44dp" />
 </shape>
--- a/app/src/main/res/drawable/bg_shift_stroke_v4.xml
+++ b/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="52dp" android:height="52dp" />
+    <size android:width="44dp" android:height="44dp" />
 </shape>
--- a/app/src/main/res/drawable/ic_shift_half_red_vector.xml
+++ b/app/src/main/res/drawable/ic_shift_half_red_vector.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="52dp"
-    android:height="52dp"
-    android:viewportWidth="52"
-    android:viewportHeight="52">
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
    <!-- Left Half Red -->
    <path
        android:name="left_half"
        android:fillColor="@color/shift_red"
-        android:pathData="M26,0 A26,26 0 0 0 26,52 L26,0 Z" />
-    
+        android:pathData="M22,0 A22,22 0 0 0 22,44 L22,0 Z" />
 </vector>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/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="12dp"
        android:layout_marginBottom="8dp"
        app:cardCornerRadius="28dp"
        app:cardElevation="0dp"
@@ -160,20 +160,7 @@
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
-                    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"/>
+                    app:layout_constraintEnd_toStartOf="@id/btnTideLocation"/>

                <androidx.appcompat.widget.AppCompatButton
                    android:id="@+id/btnTideLocation"
@@ -240,7 +227,7 @@
        android:id="@+id/otherTeamsCard"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="4dp"
+        android:layout_marginHorizontal="12dp"
        android:layout_marginBottom="16dp"
        app:cardCornerRadius="20dp"
        app:cardElevation="0dp"
@@ -274,4 +261,5 @@
        </LinearLayout>
    </androidx.cardview.widget.CardView>

+
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/fragment_settings_lab.xml
+++ b/app/src/main/res/layout/fragment_settings_lab.xml
@@ -5,124 +5,32 @@
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:padding="24dp"
-    android:gravity="center_horizontal">
+    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"/>

-    <!-- Header Title -->
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="나의 연차 설정"
-        android:textSize="20sp"
+        android:text="실험실 기능 준비 중"
+        android:textSize="18sp"
        android:textStyle="bold"
-        android:textColor="@color/text_primary"
-        android:layout_marginBottom="32dp"/>
+        android:textColor="@color/text_secondary"
+        android:layout_marginBottom="8dp"/>

-    <!-- Total Annual Leave Setting -->
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
-        app:cardBackgroundColor="@color/surface">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp"
-            android:gravity="center">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="총 연차"
-                android:textSize="16sp"
-                android:textColor="@color/text_secondary"
-                android:layout_marginBottom="16dp"/>
-
-            <!-- NumberPicker for Total Days -->
-            <NumberPicker
-                android:id="@+id/npTotalDays"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="일"
-                android:textSize="14sp"
-                android:textColor="@color/text_tertiary"/>
-
-        </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"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
-        app:cardBackgroundColor="@color/surface">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp"
-            android:gravity="center">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="남은 연차"
-                android:textSize="16sp"
-                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:textSize="36sp"
-                android:textStyle="bold"
-                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"/>
-
-        </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="13sp"
+        android:text="더욱 편리한 기능을 개발하고 있습니다.\n다음 업데이트를 기대해 주세요!"
+        android:textSize="14sp"
        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"/>
+        android:gravity="center"
+        android:lineSpacingExtra="4dp"/>

 </LinearLayout>
--- a/app/src/main/res/layout/item_day.xml
+++ b/app/src/main/res/layout/item_day.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/dayRoot"
    android:layout_width="match_parent"
-    android:layout_height="108dp"
+    android:layout_height="92dp"
    android:background="@drawable/bg_grid_cell_v4">

    <!-- Day Number (top-left) -->
@@ -16,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" />
@@ -35,21 +35,21 @@
        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_width="40dp"
+        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
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,28 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <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>
+    <string name="app_name">shiftring</string>
 </resources>
--- 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,13 +1,13 @@
 {
-  "versionCode": 1140,
-  "versionName": "1.4.0",
-  "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.4.0/app.apk",
-  "changelog": "v1.4.0: 휴가 관리 기능 추가 (연차/반년 설정 및 자동 계산), 달력 UI 개선 (넓은 화면, 큰 근무 표시)",
-  "forceUpdate": false
-}
  "versionCode": 1130,
  "versionName": "1.3.0",
  "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.3.0/app.apk",
  "changelog": "v1.3.0: versionCode 기반 업데이트 체크 개선",
  "forceUpdate": false
+}
+  "versionCode": 1125,
+  "versionName": "1.2.5",
+  "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.5/app.apk",
+  "changelog": "v1.2.5: 알람 시스템 단순화 - 삭제된 알람 버그 수정",
+  "forceUpdate": false
 }