Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7774c20a45 | |||
| cce9c48345 | |||
| 7462656c15 | |||
| 30b150bb81 | |||
| f586d74759 | |||
| 608109e437 | |||
| 48cfbf3473 | |||
| 911ff3003f | |||
| 975c2cc9f6 | |||
| b5a6abee97 | |||
| fe050808b4 | |||
| 08c130f448 | |||
| 7d50263e65 | |||
| 693704686f | |||
| ccbd943c56 | |||
| 761e02fd94 | |||
| eda76a0ef6 | |||
| 8a2dacb104 | |||
| 2f4b2ebe4c | |||
| 89068b4d05 | |||
| 7835d0ab65 |
12
.env.local
Normal file
12
.env.local
Normal 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"
|
||||||
|
```
|
||||||
BIN
.env.local:Zone.Identifier
Normal file
BIN
.env.local:Zone.Identifier
Normal file
Binary file not shown.
@@ -20,8 +20,8 @@ android {
|
|||||||
applicationId = "com.example.shiftalarm"
|
applicationId = "com.example.shiftalarm"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 1141
|
versionCode = 1149
|
||||||
versionName = "1.4.1"
|
versionName = "1.4.9"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ fun showCustomToast(context: Context, message: String, duration: Int = android.w
|
|||||||
val toast = android.widget.Toast(context)
|
val toast = android.widget.Toast(context)
|
||||||
toast.duration = duration
|
toast.duration = duration
|
||||||
toast.view = layout
|
toast.view = layout
|
||||||
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 100)
|
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 150)
|
||||||
toast.show()
|
toast.show()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
// Fallback to default toast if custom toast fails
|
// Fallback to default toast if custom toast fails
|
||||||
|
|||||||
@@ -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,34 +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
|
||||||
|
|
||||||
// Dynamically adjust item height based on row count (5 or 6 rows)
|
if (item.date == null) {
|
||||||
val displayMetrics = context.resources.displayMetrics
|
holder.itemView.visibility = View.INVISIBLE
|
||||||
val screenWidth = displayMetrics.widthPixels
|
return
|
||||||
val itemWidth = screenWidth / 7 // Each cell width
|
}
|
||||||
val itemHeight = if (rowCount == 5) {
|
|
||||||
(itemWidth * 1.2).toInt() // Taller items for 5 rows to fill space
|
|
||||||
} else {
|
|
||||||
itemWidth // Square items for 6 rows
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
holder.itemView.visibility = View.VISIBLE
|
|
||||||
|
|
||||||
// Day Number
|
|
||||||
holder.dayNumber.text = item.date.dayOfMonth.toString()
|
holder.dayNumber.text = item.date.dayOfMonth.toString()
|
||||||
|
|
||||||
// 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
|
||||||
|
|||||||
@@ -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)
|
||||||
@@ -266,11 +264,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,19 +303,13 @@ 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 adapter = CalendarAdapter(days, object : CalendarAdapter.OnDayClickListener {
|
||||||
val daysInMonth = currentViewMonth.lengthOfMonth()
|
override fun onDayClick(date: LocalDate, currentShift: String) {
|
||||||
val firstDayOfMonth = currentViewMonth.atDay(1).dayOfWeek.value % 7
|
showDaySettingsDialog(date, currentShift)
|
||||||
val actualDayCount = firstDayOfMonth + daysInMonth
|
}
|
||||||
val rowCount = if (actualDayCount <= 35) 5 else 6
|
}, binding.cbShowHolidays.isChecked)
|
||||||
|
|
||||||
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
|
binding.calendarGrid.adapter = adapter
|
||||||
binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
|
binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
|
||||||
@@ -332,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)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -643,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()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -713,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
|
||||||
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<solid android:color="@color/surface" />
|
<!-- 배경색: 다크모드에서도 잘 보이도록 surface 색상 사용 -->
|
||||||
<corners android:radius="12dp" />
|
<solid android:color="#CC333333" />
|
||||||
|
<corners android:radius="16dp" />
|
||||||
<stroke
|
<stroke
|
||||||
android:width="1dp"
|
android:width="1dp"
|
||||||
android:color="@color/outline" />
|
android:color="@color/outline" />
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:background="@drawable/bg_custom_toast"
|
android:background="@drawable/bg_custom_toast"
|
||||||
android:paddingHorizontal="16dp"
|
android:paddingHorizontal="20dp"
|
||||||
android:paddingVertical="10dp"
|
android:paddingVertical="12dp"
|
||||||
android:gravity="center">
|
android:gravity="center">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:textColor="@color/text_primary"
|
android:textColor="@android:color/white"
|
||||||
android:maxLines="2"
|
android:maxLines="2"
|
||||||
android:ellipsize="end" />
|
android:ellipsize="end" />
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="24dp"
|
android:padding="16dp"
|
||||||
android:gravity="center_horizontal">
|
android:gravity="center_horizontal">
|
||||||
|
|
||||||
<!-- Header Title -->
|
<!-- Header Title -->
|
||||||
@@ -12,117 +12,125 @@
|
|||||||
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="20sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="@color/text_primary"
|
android:textColor="@color/text_primary"
|
||||||
android:layout_marginBottom="32dp"/>
|
android:layout_marginBottom="24dp"/>
|
||||||
|
|
||||||
<!-- Total Annual Leave Setting -->
|
<!-- Total Annual Leave Setting -->
|
||||||
<androidx.cardview.widget.CardView
|
<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:layout_marginBottom="16dp"
|
||||||
app:cardCornerRadius="16dp"
|
app:cardCornerRadius="12dp"
|
||||||
app:cardElevation="4dp"
|
app:cardElevation="2dp"
|
||||||
app:cardBackgroundColor="@color/surface">
|
app:cardBackgroundColor="@color/surface">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
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
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
android:text="총 연차"
|
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:textSize="14sp"
|
||||||
android:textColor="@color/text_tertiary"/>
|
android:textColor="@color/text_secondary"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
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:layout_marginStart="4dp"/>
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.cardview.widget.CardView>
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
<!-- Remaining Annual Leave Display -->
|
<!-- Remaining Annual Leave Display -->
|
||||||
<androidx.cardview.widget.CardView
|
<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:layout_marginBottom="16dp"
|
||||||
app:cardCornerRadius="16dp"
|
app:cardCornerRadius="12dp"
|
||||||
app:cardElevation="4dp"
|
app:cardElevation="2dp"
|
||||||
app:cardBackgroundColor="@color/surface">
|
app:cardBackgroundColor="@color/surface">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
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
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
android:text="남은 연차"
|
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:textSize="14sp"
|
||||||
android:textColor="@color/text_tertiary"/>
|
android:textColor="@color/text_secondary"/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="bottom">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvRemainingDays"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="15"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="@color/primary"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="일"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="@color/text_tertiary"
|
||||||
|
android:layout_marginStart="4dp"/>
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.cardview.widget.CardView>
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
<!-- 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="8dp"
|
||||||
|
android:gravity="center"/>
|
||||||
|
|
||||||
|
<!-- 기능추가중 Notice -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="기능추가중"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textColor="@color/primary"
|
||||||
android:layout_marginBottom="24dp"
|
android:layout_marginBottom="24dp"
|
||||||
android:gravity="center"/>
|
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>
|
</LinearLayout>
|
||||||
|
|||||||
@@ -4,7 +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="85dp"
|
android:layout_height="92dp"
|
||||||
android:background="@drawable/bg_grid_cell_v4">
|
android:background="@drawable/bg_grid_cell_v4">
|
||||||
|
|
||||||
<!-- Day Number (top-left) -->
|
<!-- Day Number (top-left) -->
|
||||||
@@ -16,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" />
|
||||||
@@ -35,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: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
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
10
version.json
10
version.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"versionCode": 1141,
|
"versionCode": 1149,
|
||||||
"versionName": "1.4.1",
|
"versionName": "1.4.9",
|
||||||
"apkUrl": "https://git.webpluss.net/attachments/23f6818f-a647-4f9e-905f-e99f5c9d93b0",
|
"apkUrl": "https://git.webpluss.net/attachments/b8f51fa6-d26c-404a-b798-ee1c847a2be0",
|
||||||
"changelog": "v1.4.1: 달력 5행일 때 화면 꽉 채우기, 다크모드 토스트 지원, 연차 저장/연동 수정",
|
"changelog": "v1.4.9: 버전 업데이트",
|
||||||
"forceUpdate": false
|
"forceUpdate": false
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user