diff --git a/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt b/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt index 0a5ff2a..984504a 100644 --- a/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt +++ b/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt @@ -99,7 +99,7 @@ class CalendarAdapter( holder.shiftChar.background = null holder.shiftChar.text = "" holder.holidayNameSmall.visibility = View.GONE - holder.shiftChar.textSize = 13f + holder.shiftChar.textSize = 15f // "반월", "반년" (Half-Monthly, Half-Yearly) Special Logic // These are overrides or specific shifts that user sets. @@ -111,7 +111,7 @@ class CalendarAdapter( // Holiday Mode (Priority): Show full holiday name, no circle holder.shiftChar.text = fullHolidayName holder.shiftChar.setTextColor(Color.parseColor("#FF5252")) - holder.shiftChar.textSize = 10f + holder.shiftChar.textSize = 11f holder.shiftChar.background = null } else if (item.shift != null && item.shift != "비번") { // Shift Mode @@ -120,7 +120,7 @@ class CalendarAdapter( if (item.shift == "반월" || item.shift == "반년") { holder.shiftChar.text = if (item.shift == "반월") "월" else "년" holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.black)) // Black for contrast on Half Red/Transparent - holder.shiftChar.textSize = 13f + holder.shiftChar.textSize = 15f holder.shiftChar.background = ContextCompat.getDrawable(context, R.drawable.bg_shift_half_red) } else { // Standard Logic @@ -137,7 +137,7 @@ class CalendarAdapter( else -> item.shift.take(1) } holder.shiftChar.text = shiftAbbreviation - holder.shiftChar.textSize = 15f + holder.shiftChar.textSize = 17f holder.shiftChar.setTypeface(null, android.graphics.Typeface.BOLD) val shiftColorRes = when (item.shift) { @@ -205,7 +205,7 @@ class CalendarAdapter( // holder.holidayNameSmall.text = HolidayManager.getLunarDateString(item.date) holder.shiftChar.text = HolidayManager.getLunarDateString(item.date) - holder.shiftChar.textSize = 10f + holder.shiftChar.textSize = 11f holder.shiftChar.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)) holder.shiftChar.background = null } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4d9d8d7..701deee 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -58,12 +58,12 @@ - + + app:layout_constraintEnd_toStartOf="@id/tvAnnualLeave"/> + + - diff --git a/app/src/main/res/layout/item_day.xml b/app/src/main/res/layout/item_day.xml index 1525d5f..647cb63 100644 --- a/app/src/main/res/layout/item_day.xml +++ b/app/src/main/res/layout/item_day.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/dayRoot" android:layout_width="match_parent" - android:layout_height="92dp" + android:layout_height="108dp" android:background="@drawable/bg_grid_cell_v4"> @@ -16,7 +16,7 @@ android:layout_marginTop="4dp" android:text="12" android:textColor="@color/text_primary" - android:textSize="14sp" + android:textSize="15sp" 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" /> - + + app:layout_constraintVertical_bias="0.42"/>