feat: 달력 5행 동적 높이 조정 및 연차 메인 화면 연동

- 달력 5행일 때 아이템 높이를 동적으로 계산하여 화면 꽉 채우기
- 메인 화면 tvAnnualLeave에 남은 연차 표시 기능 추가
- onResume에서 연차 정보 자동 업데이트

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
2026-03-12 22:43:44 +09:00
parent a4482f0b7b
commit b8454f76d1
2 changed files with 96 additions and 57 deletions

View File

@@ -13,18 +13,18 @@ import androidx.recyclerview.widget.RecyclerView
import java.time.LocalDate
data class DayShift(
val date: LocalDate?,
val shift: String?,
val hasMemo: Boolean = false,
val memoContent: String? = null
val date: LocalDate?,
val shift: String?,
val hasMemo: Boolean = false,
val memoContent: String? = null
)
class CalendarAdapter(
var days: List<DayShift>,
private val listener: OnDayClickListener,
var showHolidays: Boolean = true
var days: List<DayShift>,
private val listener: OnDayClickListener,
var showHolidays: Boolean = true,
private val rowCount: Int = 6 // Default to 6 rows
) : RecyclerView.Adapter<CalendarAdapter.ViewHolder>() {
interface OnDayClickListener {
fun onDayClick(date: LocalDate, currentShift: String)
}
@@ -48,18 +48,32 @@ 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
if (item.date == null) {
holder.itemView.visibility = View.INVISIBLE
return
}
holder.itemView.visibility = View.VISIBLE
// Day Number
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
}
val layoutParams = holder.itemView.layoutParams
layoutParams.height = itemHeight
holder.itemView.layoutParams = layoutParams
if (item.date == null) {
holder.itemView.visibility = View.INVISIBLE
return
}
holder.itemView.visibility = View.VISIBLE
// Day Number
holder.dayNumber.text = item.date.dayOfMonth.toString()
// Holiday / Weekend logic