Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b5a6abee97 | |||
| fe050808b4 | |||
| 08c130f448 | |||
| 7d50263e65 | |||
| 693704686f | |||
| ccbd943c56 | |||
| 761e02fd94 | |||
| eda76a0ef6 | |||
| 8a2dacb104 | |||
| 2f4b2ebe4c | |||
| 89068b4d05 | |||
| 7835d0ab65 |
@@ -20,8 +20,9 @@ android {
|
||||
applicationId = "com.example.shiftalarm"
|
||||
minSdk = 26
|
||||
targetSdk = 35
|
||||
versionCode = 1141
|
||||
versionName = "1.4.1"
|
||||
versionCode = 1144
|
||||
versionName = "1.4.4"
|
||||
versionName = "1.4.3"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -29,6 +29,27 @@ fun showCustomToast(context: Context, message: String, duration: Int = android.w
|
||||
val toast = android.widget.Toast(context)
|
||||
toast.duration = duration
|
||||
toast.view = layout
|
||||
toast.setGravity(android.view.Gravity.BOTTOM or android.view.Gravity.CENTER_HORIZONTAL, 0, 150)
|
||||
toast.show()
|
||||
} catch (e: Exception) {
|
||||
// Fallback to default toast if custom toast fails
|
||||
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) {
|
||||
|
||||
@@ -20,10 +20,9 @@ data class DayShift(
|
||||
)
|
||||
|
||||
class CalendarAdapter(
|
||||
var days: List<DayShift>,
|
||||
private val listener: OnDayClickListener,
|
||||
var showHolidays: Boolean = true,
|
||||
private val rowCount: Int = 6 // Default to 6 rows
|
||||
var days: List<DayShift>,
|
||||
private val listener: OnDayClickListener,
|
||||
var showHolidays: Boolean = true
|
||||
) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
|
||||
interface OnDayClickListener {
|
||||
fun onDayClick(date: LocalDate, currentShift: String)
|
||||
@@ -48,34 +47,19 @@ class CalendarAdapter(
|
||||
return (dp * context.resources.displayMetrics.density).toInt()
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
|
||||
val item = days[position]
|
||||
val context = holder.itemView.context
|
||||
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
|
||||
val item = days[position]
|
||||
val context = holder.itemView.context
|
||||
|
||||
// Dynamically adjust item height based on row count (5 or 6 rows)
|
||||
val displayMetrics = context.resources.displayMetrics
|
||||
val screenWidth = displayMetrics.widthPixels
|
||||
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
|
||||
}
|
||||
if (item.date == null) {
|
||||
holder.itemView.visibility = View.INVISIBLE
|
||||
return
|
||||
}
|
||||
|
||||
val layoutParams = holder.itemView.layoutParams
|
||||
layoutParams.height = itemHeight
|
||||
holder.itemView.layoutParams = layoutParams
|
||||
holder.itemView.visibility = View.VISIBLE
|
||||
|
||||
if (item.date == null) {
|
||||
holder.itemView.visibility = View.INVISIBLE
|
||||
return
|
||||
}
|
||||
|
||||
holder.itemView.visibility = View.VISIBLE
|
||||
|
||||
// Day Number
|
||||
// Day Number
|
||||
holder.dayNumber.text = item.date.dayOfMonth.toString()
|
||||
|
||||
// Holiday / Weekend logic
|
||||
val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY
|
||||
val isSaturday = item.date.dayOfWeek == java.time.DayOfWeek.SATURDAY
|
||||
|
||||
@@ -4,16 +4,18 @@ import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.Toast
|
||||
import android.widget.NumberPicker
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import com.example.shiftalarm.databinding.FragmentSettingsLabBinding
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
class FragmentSettingsLab : Fragment() {
|
||||
|
||||
private var _binding: FragmentSettingsLabBinding? = null
|
||||
private val binding get() = _binding!!
|
||||
private var isInitialLoad = true
|
||||
|
||||
override fun onCreateView(
|
||||
inflater: LayoutInflater, container: ViewGroup?,
|
||||
@@ -28,7 +30,6 @@ class FragmentSettingsLab : Fragment() {
|
||||
|
||||
setupNumberPicker()
|
||||
loadAnnualLeave()
|
||||
setupSaveButton()
|
||||
}
|
||||
|
||||
private fun setupNumberPicker() {
|
||||
@@ -36,42 +37,65 @@ class FragmentSettingsLab : Fragment() {
|
||||
minValue = 1
|
||||
maxValue = 25
|
||||
wrapSelectorWheel = false
|
||||
|
||||
// 값 변경 시 자동 저장
|
||||
setOnValueChangedListener { _, _, newVal ->
|
||||
if (!isInitialLoad) {
|
||||
saveAnnualLeave(newVal)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun loadAnnualLeave() {
|
||||
lifecycleScope.launch {
|
||||
isInitialLoad = true
|
||||
val repo = ShiftRepository(requireContext())
|
||||
|
||||
val annualLeave = repo.getAnnualLeave()
|
||||
annualLeave?.let {
|
||||
binding.npTotalDays.value = it.totalDays.toInt()
|
||||
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
|
||||
binding.tvRemainingDays.text = formatRemainingDays(it.remainingDays)
|
||||
} ?: run {
|
||||
// Default: 15 days
|
||||
binding.npTotalDays.value = 15
|
||||
binding.tvRemainingDays.text = "15.0"
|
||||
binding.tvRemainingDays.text = "15"
|
||||
}
|
||||
|
||||
// 초기 로드 완료 후 플래그 변경
|
||||
delay(100)
|
||||
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()
|
||||
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(requireContext())
|
||||
|
||||
repo.recalculateAndSaveAnnualLeave(totalDays)
|
||||
|
||||
val updated = repo.getAnnualLeave()
|
||||
updated?.let {
|
||||
binding.tvRemainingDays.text = String.format("%.1f", it.remainingDays)
|
||||
showCustomToast(requireContext(), "연차가 저장되었습니다. (남은 연차: ${String.format("%.1f", it.remainingDays)}일)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 남은 연차 표시 형식 개선
|
||||
* - 정수면 정수로 표시 (예: 22)
|
||||
* - 소숫점 있으면 소숫점 표시 (예: 21.5)
|
||||
*/
|
||||
private fun formatRemainingDays(days: Float): String {
|
||||
return if (days == days.toInt().toFloat()) {
|
||||
// 정수인 경우
|
||||
days.toInt().toString()
|
||||
} else {
|
||||
// 소숫점이 있는 경우 (0.5 등)
|
||||
String.format("%.1f", days)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroyView() {
|
||||
super.onDestroyView()
|
||||
|
||||
@@ -203,7 +203,16 @@ class MainActivity : AppCompatActivity() {
|
||||
syncAllAlarms(this@MainActivity)
|
||||
}
|
||||
|
||||
// 연차 정보 업데이트
|
||||
// 연차 정보 업데이트
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(this@MainActivity)
|
||||
val annualLeave = repo.getAnnualLeave()
|
||||
annualLeave?.let {
|
||||
binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
|
||||
} ?: run {
|
||||
binding.tvAnnualLeave.text = "연차: --"
|
||||
}
|
||||
}
|
||||
lifecycleScope.launch {
|
||||
val repo = ShiftRepository(this@MainActivity)
|
||||
val annualLeave = repo.getAnnualLeave()
|
||||
@@ -266,11 +275,10 @@ class MainActivity : AppCompatActivity() {
|
||||
return (dp * resources.displayMetrics.density).toInt()
|
||||
}
|
||||
|
||||
private fun setupCalendar() {
|
||||
binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
|
||||
binding.calendarGrid.setHasFixedSize(false) // Allow dynamic item sizing
|
||||
updateCalendar()
|
||||
}
|
||||
private fun setupCalendar() {
|
||||
binding.calendarGrid.layoutManager = GridLayoutManager(this, 7)
|
||||
updateCalendar()
|
||||
}
|
||||
|
||||
private fun updateCalendar() {
|
||||
val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
@@ -306,19 +314,13 @@ class MainActivity : AppCompatActivity() {
|
||||
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)
|
||||
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월"))
|
||||
@@ -341,7 +343,13 @@ class MainActivity : AppCompatActivity() {
|
||||
binding.tvAnnualLeave.text = "연차: ${String.format("%.1f", it.remainingDays)}"
|
||||
} ?: run {
|
||||
binding.tvAnnualLeave.text = "연차: --"
|
||||
}
|
||||
// Update Annual Leave display
|
||||
val annualLeave = withContext(Dispatchers.IO) { repo.getAnnualLeave() }
|
||||
annualLeave?.let {
|
||||
binding.tvAnnualLeave.text = "연차: ${formatRemainingDays(it.remainingDays)}"
|
||||
} ?: run {
|
||||
binding.tvAnnualLeave.text = "연차: --"
|
||||
}
|
||||
}
|
||||
updateOtherTeamsLayout(today, factory, prefs)
|
||||
}
|
||||
@@ -713,6 +721,18 @@ class MainActivity : AppCompatActivity() {
|
||||
Toast.makeText(this, "⚠️ 루팅된 기기에서 시각적 오류나 알람 불안정이 발생할 수 있습니다.", Toast.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 남은 연차 표시 형식 개선
|
||||
* - 정수면 정수로 표시 (예: 22)
|
||||
* - 소숫점 있으면 소숫점 표시 (예: 21.5)
|
||||
*/
|
||||
private fun formatRemainingDays(days: Float): String {
|
||||
return if (days == days.toInt().toFloat()) {
|
||||
// 정수인 경우
|
||||
days.toInt().toString()
|
||||
} else {
|
||||
// 소숫점이 있는 경우 (0.5 등)
|
||||
String.format("%.1f", days)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,6 +93,21 @@ class ShiftRepository(private val context: Context) {
|
||||
}
|
||||
|
||||
suspend fun updateRemainingAnnualLeave() {
|
||||
val annualLeave = dao.getAnnualLeave()
|
||||
val usedDays = calculateUsedAnnualLeave()
|
||||
|
||||
if (annualLeave != null) {
|
||||
val remainingDays = annualLeave.totalDays - usedDays
|
||||
dao.insertAnnualLeave(annualLeave.copy(remainingDays = remainingDays))
|
||||
} else {
|
||||
// AnnualLeave가 없으면 기본값 15일로 생성
|
||||
dao.insertAnnualLeave(AnnualLeave(
|
||||
id = 1,
|
||||
totalDays = 15f,
|
||||
remainingDays = 15f - usedDays
|
||||
))
|
||||
}
|
||||
}
|
||||
val annualLeave = dao.getAnnualLeave()
|
||||
annualLeave?.let {
|
||||
val usedDays = calculateUsedAnnualLeave()
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="@color/surface" />
|
||||
<corners android:radius="12dp" />
|
||||
<!-- 배경색: 다크모드에서도 잘 보이도록 surface 색상 사용 -->
|
||||
<solid android:color="#CC333333" />
|
||||
<corners android:radius="16dp" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="@color/outline" />
|
||||
|
||||
@@ -58,12 +58,12 @@
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<!-- Maximized Calendar Card - Reduced margins for wider calendar -->
|
||||
<!-- Maximized Calendar Card -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/calendarCard"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginHorizontal="4dp"
|
||||
android:layout_marginHorizontal="3dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:cardCornerRadius="28dp"
|
||||
app:cardElevation="0dp"
|
||||
@@ -240,7 +240,7 @@
|
||||
android:id="@+id/otherTeamsCard"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="4dp"
|
||||
android:layout_marginHorizontal="3dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:cardCornerRadius="20dp"
|
||||
app:cardElevation="0dp"
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/bg_custom_toast"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:paddingVertical="10dp"
|
||||
android:paddingHorizontal="20dp"
|
||||
android:paddingVertical="12dp"
|
||||
android:gravity="center">
|
||||
|
||||
<TextView
|
||||
@@ -13,7 +13,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_primary"
|
||||
android:textColor="@android:color/white"
|
||||
android:maxLines="2"
|
||||
android:ellipsize="end" />
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:padding="16dp"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<!-- Header Title -->
|
||||
@@ -12,117 +12,115 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="나의 연차 설정"
|
||||
android:textSize="20sp"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/text_primary"
|
||||
android:layout_marginBottom="32dp"/>
|
||||
android:layout_marginBottom="16dp"/>
|
||||
|
||||
<!-- Total Annual Leave Setting -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="24dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
app:cardCornerRadius="12dp"
|
||||
app:cardElevation="2dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
android:orientation="horizontal"
|
||||
android:padding="12dp"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="총 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="16dp"/>
|
||||
|
||||
<!-- NumberPicker for Total Days -->
|
||||
<NumberPicker
|
||||
android:id="@+id/npTotalDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
android:textColor="@color/text_secondary"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/npTotalDays"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="100dp"/>
|
||||
|
||||
<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>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<!-- Remaining Annual Leave Display -->
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="32dp"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="4dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
app:cardCornerRadius="12dp"
|
||||
app:cardElevation="2dp"
|
||||
app:cardBackgroundColor="@color/surface">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp"
|
||||
android:gravity="center">
|
||||
android:orientation="horizontal"
|
||||
android:padding="12dp"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="남은 연차"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/text_secondary"
|
||||
android:layout_marginBottom="8dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvRemainingDays"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="0.0"
|
||||
android:textSize="36sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/primary"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="일"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/text_tertiary"/>
|
||||
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>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<!-- Calculation Info -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="※ 연차: -1일 차감 / 반년: -0.5일 차감"
|
||||
android:textSize="13sp"
|
||||
android:text="※ 연차: -1일 / 반년: -0.5일 차감"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/text_tertiary"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/dayRoot"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="85dp"
|
||||
android:layout_height="92dp"
|
||||
android:background="@drawable/bg_grid_cell_v4">
|
||||
|
||||
<!-- Day Number (top-left) -->
|
||||
@@ -16,7 +16,7 @@
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="12"
|
||||
android:textColor="@color/text_primary"
|
||||
android:textSize="15sp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@@ -35,21 +35,21 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<!-- Shift Abbreviation Circular Indicator (Center) - Larger size -->
|
||||
<!-- Shift Abbreviation Circular Indicator (Center) -->
|
||||
<TextView
|
||||
android:id="@+id/shiftChar"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center"
|
||||
android:text="주"
|
||||
android:textSize="17sp"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/text_primary"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintVertical_bias="0.42"/>
|
||||
app:layout_constraintVertical_bias="0.45"/>
|
||||
|
||||
<!-- Memo Content Text (Below Shift) - Replacing icon logic for visibility -->
|
||||
<TextView
|
||||
|
||||
10
version.json
10
version.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"versionCode": 1141,
|
||||
"versionName": "1.4.1",
|
||||
"apkUrl": "https://git.webpluss.net/attachments/23f6818f-a647-4f9e-905f-e99f5c9d93b0",
|
||||
"changelog": "v1.4.1: 달력 5행일 때 화면 꽉 채우기, 다크모드 토스트 지원, 연차 저장/연동 수정",
|
||||
"forceUpdate": false
|
||||
"versionCode": 1144,
|
||||
"versionName": "1.4.4",
|
||||
"apkUrl": "https://git.webpluss.net/attachments/9658b292-b9fa-4509-b270-706ba6e6fd54",
|
||||
"changelog": "v1.4.4: 마진 3dp 축소, 연차 최초적용 수정, 휴가관리 자동저장, 연차 표시 개선",
|
||||
"forceUpdate": false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user