14 Commits

Author SHA1 Message Date
sanjeok77 7774c20a45 chore: 버전 업데이트 v1.4.9 (1149)
- versionCode: 1148 → 1149
- versionName: 1.4.8 → 1.4.9

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:54:05 +09:00
sanjeok77 cce9c48345 fix: 애니메이션 개선 및 APK 업데이트
- ViewPropertyAnimator 사용으로 더 부드러운 전환
- alpha 애니메이션 추가로 시각적 효과 개선
- APK URL 업데이트

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:50:38 +09:00
sanjeok77 7462656c15 feat: 달력 월 이동 시 부드러운 화면 전환 애니메이션 추가
- 월 이동 버튼 클릭 시 슬라이드 애니메이션 적용
- 설정 화면 탭 전환처럼 부드러운 전환 효과
- 버전 업데이트 v1.4.8 (1148)

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-03-13 00:48:11 +09:00
sanjeok77 30b150bb81 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>
2026-03-13 00:34:35 +09:00
sanjeok77 f586d74759 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>
2026-03-13 00:27:42 +09:00
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
sanjeok77 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
13 changed files with 273 additions and 197 deletions
+12
View File
@@ -0,0 +1,12 @@
# 로컬 설정 파일
## Personal Access Token (Gitea)
- 토큰: `e3b515eaa0a6683c921ca3bf718e281ed30a6075`
- 용도: git.webpluss.net API 접근 (Release 업로드, version.json 업데이트)
- **Git에 Commit되지 않도록 주의**
## 사용 예시
```bash
curl -u "sanjeok77:e3b515eaa0a6683c921ca3bf718e281ed30a6075" \
"https://git.webpluss.net/api/v1/repos/sanjeok77/NeFLIX/releases"
```
Binary file not shown.
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -20,8 +20,8 @@ android {
applicationId = "com.example.shiftalarm" applicationId = "com.example.shiftalarm"
minSdk = 26 minSdk = 26
targetSdk = 35 targetSdk = 35
versionCode = 1143 versionCode = 1149
versionName = "1.4.3" versionName = "1.4.9"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
@@ -35,27 +35,6 @@ fun showCustomToast(context: Context, message: String, duration: Int = android.w
// Fallback to default toast if custom toast fails // Fallback to default toast if custom toast fails
android.widget.Toast.makeText(context, message, duration).show() android.widget.Toast.makeText(context, message, duration).show()
} }
}
* 다크모드 지원 커스텀 토스트 표시
*/
fun showCustomToast(context: Context, message: String, duration: Int = android.widget.Toast.LENGTH_SHORT) {
try {
// Use application context with theme for proper dark mode support
val themedContext = android.view.ContextThemeWrapper(context.applicationContext, R.style.Theme_ShiftAlarm)
val inflater = android.view.LayoutInflater.from(themedContext)
val layout = inflater.inflate(R.layout.custom_toast, null)
val textView = layout.findViewById<android.widget.TextView>(R.id.toastText)
textView.text = message
val toast = android.widget.Toast(context.applicationContext)
toast.duration = duration
toast.view = layout
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 100)
toast.show()
} catch (e: Exception) {
// Fallback to default toast if custom toast fails
android.widget.Toast.makeText(context, message, duration).show()
}
} }
// ============================================ // ============================================
// 알람 ID 생성 // 알람 ID 생성
@@ -4,16 +4,19 @@ 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.AdapterView
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
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.delay
class FragmentSettingsLab : Fragment() { class FragmentSettingsLab : Fragment() {
private var _binding: FragmentSettingsLabBinding? = null private var _binding: FragmentSettingsLabBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
private var isInitialLoad = true
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
@@ -26,52 +29,82 @@ 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()
} }
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() { private fun loadAnnualLeave() {
lifecycleScope.launch { lifecycleScope.launch {
isInitialLoad = true
val repo = ShiftRepository(requireContext()) val repo = ShiftRepository(requireContext())
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"
}
// 초기 로드 완료 후 플래그 변경 (약간의 딜레이로 초기 선택 이벤트 방지)
delay(300)
isInitialLoad = false
}
}
private fun saveAnnualLeave(totalDays: Int) {
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)}일)")
} }
} }
} }
private fun setupSaveButton() { /**
binding.btnSaveAnnualLeave.setOnClickListener { * 남은 연차 표시 형식 개선
val totalDays = binding.npTotalDays.value.toFloat() * - 정수면 정수로 표시 (예: 22)
* - 소숫점 있으면 소숫점 표시 (예: 21.5)
lifecycleScope.launch { */
val repo = ShiftRepository(requireContext()) private fun formatRemainingDays(days: Float): String {
return if (days == days.toInt().toFloat()) {
repo.recalculateAndSaveAnnualLeave(totalDays) // 정수인 경우
days.toInt().toString()
val updated = repo.getAnnualLeave() } else {
updated?.let { // 소숫점이 있는 경우 (0.5 등)
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays) String.format("%.1f", days)
showCustomToast(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)") }
} }
}
}
}
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
@@ -80,8 +80,7 @@ class MainActivity : AppCompatActivity() {
} }
binding.prevMonth.setOnClickListener { binding.prevMonth.setOnClickListener {
currentViewMonth = currentViewMonth.minusMonths(1) animateMonthTransition(-1)
updateCalendar()
} }
binding.monthTitle.setOnClickListener { binding.monthTitle.setOnClickListener {
@@ -89,8 +88,7 @@ class MainActivity : AppCompatActivity() {
} }
binding.nextMonth.setOnClickListener { binding.nextMonth.setOnClickListener {
currentViewMonth = currentViewMonth.plusMonths(1) animateMonthTransition(1)
updateCalendar()
} }
binding.btnToday.setOnClickListener { binding.btnToday.setOnClickListener {
@@ -187,33 +185,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)
@@ -325,17 +323,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)
} }
@@ -636,10 +634,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()
} }
} }
} }
@@ -706,6 +705,49 @@ class MainActivity : AppCompatActivity() {
Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show() Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show()
} }
} }
private fun animateMonthTransition(direction: Int) {
val card = binding.calendarCard
val width = card.width.toFloat()
if (width == 0f) {
currentViewMonth = if (direction > 0) {
currentViewMonth.plusMonths(1)
} else {
currentViewMonth.minusMonths(1)
}
updateCalendar()
return
}
card.animate()
.translationX(if (direction > 0) -width else width)
.alpha(0.5f)
.setDuration(200)
.withEndAction {
currentViewMonth = if (direction > 0) {
currentViewMonth.plusMonths(1)
} else {
currentViewMonth.minusMonths(1)
}
updateCalendar()
card.translationX = if (direction > 0) width else -width
card.animate()
.translationX(0f)
.alpha(1f)
.setDuration(200)
.start()
}
.start()
}
private fun formatRemainingDays(days: Float): String {
return if (days == days.toInt().toFloat()) {
// 정수인 경우
days.toInt().toString()
} else {
// 소숫점이 있는 경우 (0.5 등)
String.format("%.1f", days)
}
}
} }
@@ -94,10 +94,18 @@ class ShiftRepository(private val context: Context) {
suspend fun updateRemainingAnnualLeave() { suspend fun updateRemainingAnnualLeave() {
val annualLeave = dao.getAnnualLeave() val annualLeave = dao.getAnnualLeave()
annualLeave?.let { val usedDays = calculateUsedAnnualLeave()
val usedDays = calculateUsedAnnualLeave()
val remainingDays = it.totalDays - usedDays if (annualLeave != null) {
dao.insertAnnualLeave(it.copy(remainingDays = remainingDays)) val remainingDays = annualLeave.totalDays - usedDays
dao.insertAnnualLeave(annualLeave.copy(remainingDays = remainingDays))
} else {
// AnnualLeave가 없으면 기본값 15일로 생성
dao.insertAnnualLeave(AnnualLeave(
id = 1,
totalDays = 15f,
remainingDays = 15f - usedDays
))
} }
} }
} }
+2 -2
View File
@@ -63,7 +63,7 @@
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="12dp" 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="12dp" android:layout_marginHorizontal="3dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:cardCornerRadius="20dp" app:cardCornerRadius="20dp"
app:cardElevation="0dp" app:cardElevation="0dp"
@@ -1,135 +1,136 @@
<?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="24dp"/>
<!-- 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="16dp"
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="16dp"
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:layout_width="wrap_content"
android:layout_height="wrap_content"
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="16dp"
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="16dp"
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 --> <!-- 기능추가중 Notice -->
<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="기능추가중"
android:textSize="13sp" android:textSize="11sp"
android:textColor="@color/text_tertiary" android:textColor="@color/primary"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:gravity="center"/> android:gravity="center"/>
<!-- Save Button --> </LinearLayout>
<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>
+3 -2
View File
@@ -38,8 +38,9 @@
<!-- Shift Abbreviation Circular Indicator (Center) --> <!-- Shift Abbreviation Circular Indicator (Center) -->
<TextView <TextView
android:id="@+id/shiftChar" android:id="@+id/shiftChar"
android:layout_width="40dp" android:layout_width="48dp"
android:layout_height="40dp" android:layout_height="48dp"
android:gravity="center" android:gravity="center"
android:text="주" android:text="주"
android:textSize="15sp" android:textSize="15sp"
+1 -1
View File
@@ -9,7 +9,7 @@
<string name="tab_basic">기본 설정</string> <string name="tab_basic">기본 설정</string>
<string name="tab_alarm">알람 설정</string> <string name="tab_alarm">알람 설정</string>
<string name="tab_additional">부가기능</string> <string name="tab_additional">부가기능</string>
<string name="tab_lab">휴가 관리</string> <string name="tab_lab">근무 관리</string>
<string-array name="factory_array"> <string-array name="factory_array">
<item>전주</item> <item>전주</item>
+5 -5
View File
@@ -1,7 +1,7 @@
{ {
"versionCode": 1143, "versionCode": 1149,
"versionName": "1.4.3", "versionName": "1.4.9",
"apkUrl": "https://git.webpluss.net/attachments/40d6f89e-58c9-41a2-a4d1-c72784a95b70", "apkUrl": "https://git.webpluss.net/attachments/b8f51fa6-d26c-404a-b798-ee1c847a2be0",
"changelog": "v1.4.3: 달력 레이아웃 1.3.0 버전처럼 복원 (마진 12dp, 고정 높이)", "changelog": "v1.4.9: 버전 업데이트",
"forceUpdate": false "forceUpdate": false
} }