12 Commits

Author SHA1 Message Date
608109e437 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>
2026-03-13 00:20:18 +09:00
48cfbf3473 fix: 달력 아이템 동그라미 크기 확대
- 양쪽 마진 축소로 인한 공백 제거
- shiftChar 크기: 40dp → 48dp

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:03:34 +09:00
911ff3003f feat: 휴가 관리 NumberPicker → Spinner 변경 + 저장 버튼 복원
- NumberPicker 대신 Spinner(드롭다운) 사용
- 값 변경 시 자동 저장 제거하고 저장 버튼 복원
- 더 직관적인 UI 제공

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:02:38 +09:00
975c2cc9f6 fix: 연차/반년 최초 적용 타이밍 문제 수정
- setOverride 후 updateRemainingAnnualLeave()를 먼저 호출하고 updateCalendar() 호출
- 연차 계산이 완료된 후 화면 갱신되도록 순서 변경

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:02:27 +09:00
b5a6abee97 chore: 버전 업데이트 v1.4.4 (1144)
- versionCode: 1143 → 1144
- versionName: 1.4.3 → 1.4.4

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:52:08 +09:00
fe050808b4 feat: 메인 화면 연차 표시 형식 개선
- 정수일 때 정수로 표시 (22)
- 0.5일 때 소숫점 표시 (21.5)
- formatRemainingDays() 함수 추가

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:45:07 +09:00
08c130f448 feat: 휴가 관리 컴팩트화 + 자동 저장 + 소숫점 표시 개선
- 레이아웃 컴팩트하게 변경 (패딩/마진 축소, 가로 배치)
- 저장 버튼 제거하고 NumberPicker 변경 시 자동 저장
- 소숫점 없을 때 정수로 표시 (22), 0.5일 때 소숫점 표시 (21.5)
- ScrollView 제거 (불필요한 스크롤 최소화)

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:44:57 +09:00
7d50263e65 fix: 연차/반년 최초 적용 안되는 문제 수정
- updateRemainingAnnualLeave()에서 AnnualLeave 없을 때 기본값 15일로 생성
- 총 연차 설정 없이도 달력에서 연차/반년 사용 가능하도록 개선

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:44:45 +09:00
693704686f fix: 달력 양쪽 마진 3dp로 축소
- calendarCard marginHorizontal: 12dp → 3dp
- otherTeamsCard marginHorizontal: 12dp → 3dp

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:44:35 +09:00
ccbd943c56 chore: 버전 업데이트 v1.4.3 (1143)
- versionCode: 1142 → 1143
- versionName: 1.4.2 → 1.4.3

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:32:09 +09:00
761e02fd94 fix: 달력 동적 높이 계산 제거 (1.3.0 스타일로 복원)
- RecyclerView 높이 동적 계산 코드 제거
- CalendarAdapter rowCount 파라미터 제거
- 아이템 높이를 XML에서 고정하도록 변경
- 달력이 자연스럽게 화면에 채워지도록 개선

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:30:28 +09:00
eda76a0ef6 fix: 달력 레이아웃 1.3.0 버전처럼 복원
- 양쪽 마진 4dp → 12dp 복원
- 달력 아이템 높이 92dp 고정으로 복원
- shiftChar 크기 48dp → 40dp 복원
- 달력 화면이 ConstraintLayout에 자연스럽게 채워지도록 수정

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-12 23:30:19 +09:00
9 changed files with 257 additions and 227 deletions

View File

@@ -20,8 +20,10 @@ android {
applicationId = "com.example.shiftalarm" applicationId = "com.example.shiftalarm"
minSdk = 26 minSdk = 26
targetSdk = 35 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" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }

View File

@@ -20,10 +20,9 @@ data class DayShift(
) )
class CalendarAdapter( class CalendarAdapter(
var days: List<DayShift>, var days: List<DayShift>,
private val listener: OnDayClickListener, 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>() { ) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
interface OnDayClickListener { interface OnDayClickListener {
fun onDayClick(date: LocalDate, currentShift: String) fun onDayClick(date: LocalDate, currentShift: String)
@@ -48,28 +47,19 @@ class CalendarAdapter(
return (dp * context.resources.displayMetrics.density).toInt() return (dp * context.resources.displayMetrics.density).toInt()
} }
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val item = days[position] val item = days[position]
val context = holder.itemView.context val context = holder.itemView.context
// Fixed item height - square cells based on screen width if (item.date == null) {
val displayMetrics = context.resources.displayMetrics holder.itemView.visibility = View.INVISIBLE
val screenWidth = displayMetrics.widthPixels return
val itemHeight = screenWidth / 7 }
val layoutParams = holder.itemView.layoutParams holder.itemView.visibility = View.VISIBLE
layoutParams.height = itemHeight
holder.itemView.layoutParams = layoutParams
if (item.date == null) { // Day Number
holder.itemView.visibility = View.INVISIBLE holder.dayNumber.text = item.date.dayOfMonth.toString()
return
}
holder.itemView.visibility = View.VISIBLE
// Day Number
// Holiday / Weekend logic // Holiday / Weekend logic
val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY
val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY

View File

@@ -4,7 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Toast import android.widget.ArrayAdapter
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.example.shiftalarm.databinding.FragmentSettingsLabBinding import com.example.shiftalarm.databinding.FragmentSettingsLabBinding
@@ -26,17 +26,17 @@ class FragmentSettingsLab : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
setupNumberPicker() setupSpinner()
loadAnnualLeave() loadAnnualLeave()
setupSaveButton() 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() { private fun loadAnnualLeave() {
@@ -45,33 +45,50 @@ class FragmentSettingsLab : Fragment() {
val annualLeave = repo.getAnnualLeave() val annualLeave = repo.getAnnualLeave()
annualLeave?.let { 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 { } ?: 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() { private fun setupSaveButton() {
binding.btnSaveAnnualLeave.setOnClickListener { 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.toFloat())
val updated = repo.getAnnualLeave()
updated?.let {
binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
showCustomToast(requireContext(), "총 연차 ${totalDays}일로 저장되었습니다 (남은 연차: ${formatRemainingDays(it.remainingDays)}일)")
}
}
}
}
lifecycleScope.launch { /**
val repo = ShiftRepository(requireContext()) * 남은 연차 표시 형식 개선
* - 정수면 정수로 표시 (예: 22)
repo.recalculateAndSaveAnnualLeave(totalDays) * - 소숫점 있으면 소숫점 표시 (예: 21.5)
*/
val updated = repo.getAnnualLeave() private fun formatRemainingDays(days: Float): String {
updated?.let { return if (days == days.toInt().toFloat()) {
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays) // 정수인 경우
showCustomToast(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)") days.toInt().toString()
} } else {
} // 소숫점이 있는 경우 (0.5 등)
} String.format("%.1f", days)
} }
}
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()

View File

@@ -187,33 +187,33 @@ class MainActivity : AppCompatActivity() {
} }
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A" currentViewTeam = prefs.getString(KEY_TEAM, "A") ?: "A"
updateTideButtonVisibility() updateTideButtonVisibility()
updateCalendar() updateCalendar()
// 일원화된 통합 권한 체크 실행 (신뢰도 100% 보장) // 일원화된 통합 권한 체크 실행 (신뢰도 100% 보장)
AlarmPermissionUtil.checkAndRequestAllPermissions(this) AlarmPermissionUtil.checkAndRequestAllPermissions(this)
// 설정 변경 시 즉시 반영을 위한 강제 동기화 (30일 스케줄링) // 설정 변경 시 즉시 반영을 위한 강제 동기화 (30일 스케줄링)
lifecycleScope.launch { lifecycleScope.launch {
syncAllAlarms(this@MainActivity) syncAllAlarms(this@MainActivity)
} }
// 연차 정보 업데이트 // 연차 정보 업데이트
lifecycleScope.launch { lifecycleScope.launch {
val repo = ShiftRepository(this@MainActivity) val repo = ShiftRepository(this@MainActivity)
val annualLeave = repo.getAnnualLeave() val annualLeave = repo.getAnnualLeave()
annualLeave?.let { annualLeave?.let {
binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}" binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
} ?: run { } ?: run {
binding.tvAnnualLeave.text = "연차: --" binding.tvAnnualLeave.text = "연차: --"
} }
} }
} }
private fun showMonthYearPicker() { private fun showMonthYearPicker() {
val dialogView = layoutInflater.inflate(R.layout.dialog_month_year_picker, null) val dialogView = layoutInflater.inflate(R.layout.dialog_month_year_picker, null)
@@ -266,11 +266,10 @@ class MainActivity : AppCompatActivity() {
return (dp * resources.displayMetrics.density).toInt() return (dp * resources.displayMetrics.density).toInt()
} }
private fun setupCalendar() { private fun setupCalendar() {
binding.calendarGrid.layoutManager = GridLayoutManager(this, 7) binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
binding.calendarGrid.setHasFixedSize(false) // Allow dynamic item sizing updateCalendar()
updateCalendar() }
}
private fun updateCalendar() { private fun updateCalendar() {
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -306,36 +305,15 @@ class MainActivity : AppCompatActivity() {
dao.getMemosForMonth(monthStr).associateBy { memoItem -> memoItem.date } dao.getMemosForMonth(monthStr).associateBy { memoItem -> memoItem.date }
} }
val days = generateDaysForMonthWithData(currentViewMonth, currentViewTeam, factory, overrides, memos) 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.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
val adapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
override fun onDayClick(date: LocalDate, currentShift: String) {
showDaySettingsDialog(date, currentShift)
}
}, binding.cbShowHolidays.isChecked)
binding.calendarGrid.adapter = adapter
binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월")) binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
// Update Header Status Text with Permission Warning if needed // Update Header Status Text with Permission Warning if needed
@@ -347,17 +325,17 @@ class MainActivity : AppCompatActivity() {
binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.warning_red)) binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.warning_red))
} else { } else {
binding.todayStatusText.text = "오늘의 근무: $shiftForViewingTeam$teamSuffix" binding.todayStatusText.text = "오늘의 근무: $shiftForViewingTeam$teamSuffix"
binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary)) binding.todayStatusText.setTextColor(androidx.core.content.ContextCompat.getColor(this@MainActivity, R.color.text_secondary))
} }
// Update Annual Leave display // Update Annual Leave display
val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() } val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
annualLeave?.let { annualLeave?.let {
binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}" binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
} ?: run { } ?: run {
binding.tvAnnualLeave.text = "연차: --" binding.tvAnnualLeave.text = "연차: --"
} }
} }
updateOtherTeamsLayout(today, factory, prefs) updateOtherTeamsLayout(today, factory, prefs)
} }
@@ -658,10 +636,11 @@ class MainActivity : AppCompatActivity() {
else -> { else -> {
// New Types: 월차, 연차, 반월, 반년, 교육 -> Saved as Override with no time // New Types: 월차, 연차, 반월, 반년, 교육 -> Saved as Override with no time
repo.setOverride(date, selected, team, factory) repo.setOverride(date, selected, team, factory)
// 연차 계산을 먼저 수행하고 달력 업데이트
repo.updateRemainingAnnualLeave()
updateCalendar() updateCalendar()
syncAllAlarms(this) syncAllAlarms(this)
android.widget.Toast.makeText(this, "${selected}(으)로 기록되었습니다. 알람이 해제됩니다.", android.widget.Toast.LENGTH_SHORT).show() 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() 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)
}
}
} }

View File

@@ -93,6 +93,21 @@ class ShiftRepository(private val context: Context) {
} }
suspend fun updateRemainingAnnualLeave() { 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() val annualLeave = dao.getAnnualLeave()
annualLeave?.let { annualLeave?.let {
val usedDays = calculateUsedAnnualLeave() val usedDays = calculateUsedAnnualLeave()

View File

@@ -58,12 +58,12 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<!-- Maximized Calendar Card - Reduced margins for wider calendar --> <!-- Maximized Calendar Card -->
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/calendarCard" android:id="@+id/calendarCard"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="3dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardCornerRadius="28dp" app:cardCornerRadius="28dp"
app:cardElevation="0dp" app:cardElevation="0dp"
@@ -240,7 +240,7 @@
android:id="@+id/otherTeamsCard" android:id="@+id/otherTeamsCard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="3dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:cardCornerRadius="20dp" app:cardCornerRadius="20dp"
app:cardElevation="0dp" app:cardElevation="0dp"

View File

@@ -1,135 +1,150 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:orientation="vertical"
android:padding="16dp"
android:gravity="center_horizontal">
<LinearLayout <!-- Header Title -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="나의 연차 설정"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="@color/text_primary"
android:layout_marginBottom="16dp"/>
<!-- Total Annual Leave Setting -->
<androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginBottom="12dp"
android:padding="24dp" app:cardCornerRadius="12dp"
android:gravity="center_horizontal"> app:cardElevation="2dp"
app:cardBackgroundColor="@color/surface">
<!-- Header Title --> <LinearLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="나의 연차 설정"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@color/text_primary"
android:layout_marginBottom="32dp"/>
<!-- Total Annual Leave Setting -->
<androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dp" android:orientation="horizontal"
app:cardCornerRadius="16dp" android:padding="12dp"
app:cardElevation="4dp" android:gravity="center_vertical">
app:cardBackgroundColor="@color/surface">
<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 <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="horizontal"
android:padding="24dp" android:gravity="center_vertical">
android:gravity="center">
<TextView <Spinner
android:layout_width="wrap_content" android:id="@+id/spinnerTotalDays"
android:layout_height="wrap_content" android:layout_width="80dp"
android:text="총 연차" android:layout_height="48dp"/>
android:textSize="16sp"
android:textColor="@color/text_secondary"
android:layout_marginBottom="16dp"/>
<!-- NumberPicker for Total Days -->
<NumberPicker
android:id="@+id/npTotalDays" android:id="@+id/npTotalDays"
android:layout_width="wrap_content" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="100dp"/>
android:layout_marginBottom="8dp"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="일" android:text="일"
android:textSize="14sp" android:textSize="14sp"
android:textColor="@color/text_tertiary"/> android:textColor="@color/text_tertiary"
android:layout_marginStart="4dp"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</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="12dp"
app:cardCornerRadius="12dp"
app:cardElevation="2dp"
app:cardBackgroundColor="@color/surface">
<!-- Remaining Annual Leave Display --> <LinearLayout
<androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:orientation="horizontal"
app:cardCornerRadius="16dp" android:padding="12dp"
app:cardElevation="4dp" android:gravity="center_vertical">
app:cardBackgroundColor="@color/surface">
<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 <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="horizontal"
android:padding="24dp" android:gravity="bottom">
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 <TextView
android:id="@+id/tvRemainingDays" android:id="@+id/tvRemainingDays"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0.0" android:text="15"
android:textSize="36sp" android:textSize="28sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/primary" android:textColor="@color/primary"/>
android:layout_marginBottom="4dp"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="일" android:text="일"
android:textSize="14sp" android:textSize="14sp"
android:textColor="@color/text_tertiary"/> android:textColor="@color/text_tertiary"
android:layout_marginStart="4dp"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</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"/>
<!-- Calculation Info --> <!-- Calculation Info -->
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:textColor="@color/text_tertiary"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:gravity="center"/> android:gravity="center"/>
<!-- Save Button --> <!-- Save Button -->
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnSaveAnnualLeave" android:id="@+id/btnSaveAnnualLeave"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:text="저장" android:text="저장"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:cornerRadius="12dp" app:cornerRadius="12dp"
android:backgroundTint="@color/primary"/> android:backgroundTint="@color/primary"/>
</LinearLayout> </LinearLayout>
</ScrollView>

View File

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

View File

@@ -1,7 +1,7 @@
{ {
"versionCode": 1142, "versionCode": 1145,
"versionName": "1.4.2", "versionName": "1.4.5",
"apkUrl": "https://git.webpluss.net/attachments/96025498-3f84-4410-9f13-7cdd559ef60e", "apkUrl": "https://git.webpluss.net/attachments/aeb7b079-f81b-4c77-b8ee-b8fde90a530e",
"changelog": "v1.4.2: 달력 5행/6행 스크롤 수정, 토스트 다크모드 완전 지원, 연차 설정 UI 개선", "changelog": "v1.4.5: 연차 최초적용 수정, 휴가관리 Spinner 변경, 동그라미 크기 확대",
"forceUpdate": false "forceUpdate": false
} }