🚀 :: v2.1.11

🚀 :: v2.1.11

Author: ashxom

buildSrc/src/main/kotlin/ProjectProperties.kt

@@ -2,6 +2,6 @@ object ProjectProperties {
     const val COMPILE_SDK = 36
     const val MIN_SDK = 28
     const val TARGET_SDK = 36
-    const val VERSION_CODE = 40
-    const val VERSION_NAME = "2.1.10"
+    const val VERSION_CODE = 41
+    const val VERSION_NAME = "2.1.11"
 }

feature/src/main/kotlin/team/aliens/dms/android/feature/latestudy/ui/component/LateStudyCalendarSection.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.YearMonth
+import java.time.temporal.TemporalAdjusters
 import team.aliens.dms.android.core.designsystem.DmsTheme
 import team.aliens.dms.android.core.designsystem.bodyB
 import team.aliens.dms.android.core.designsystem.labelM
@@ -56,7 +57,7 @@ fun LateStudyCalendarSection(
             )
 
             Text(
-                text = "(새벽 자습은 금, 토, 일요일은 불가능합니다)",
+                text = "(이번 주 월~목만 신청할 수 있습니다)",
                 color = DmsTheme.colorScheme.inverseSurface,
                 style = DmsTheme.typography.labelM,
             )
@@ -386,10 +387,20 @@ private fun buildCalendarDates(
 }
 
 private fun isSelectableDate(date: LocalDate): Boolean {
-    return when (date.dayOfWeek) {
-        DayOfWeek.FRIDAY,
-        DayOfWeek.SATURDAY,
-        DayOfWeek.SUNDAY -> false
-        else -> true
+    val today = LocalDate.now()
+
+    val startOfSelectableWeek = if (
+        today.dayOfWeek == DayOfWeek.FRIDAY ||
+        today.dayOfWeek == DayOfWeek.SATURDAY ||
+        today.dayOfWeek == DayOfWeek.SUNDAY
+    ) {
+        today.with(TemporalAdjusters.next(DayOfWeek.MONDAY))
+    } else {
+        today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
     }
+
+    val endOfSelectableWeek = startOfSelectableWeek.plusDays(3)
+
+    return !date.isBefore(startOfSelectableWeek) &&
+            !date.isAfter(endOfSelectableWeek)
 }

feature/src/main/kotlin/team/aliens/dms/android/feature/latestudy/ui/component/LateStudyReasonSection.kt

@@ -7,12 +7,19 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import team.aliens.dms.android.core.designsystem.DmsTheme
 import team.aliens.dms.android.core.designsystem.bodyB
 import team.aliens.dms.android.core.designsystem.bodyM
@@ -26,6 +33,9 @@ fun LateStudyReasonSection(
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val bringIntoViewRequester = remember { BringIntoViewRequester() }
+    val coroutineScope = rememberCoroutineScope()
+
     LateStudySectionCard(modifier = modifier) {
         Row(
             modifier = Modifier
@@ -56,6 +66,7 @@ fun LateStudyReasonSection(
                     shape = RoundedCornerShape(20.dp),
                 )
                 .height(180.dp)
+                .bringIntoViewRequester(bringIntoViewRequester)
                 .padding(horizontal = 16.dp, vertical = 16.dp),
         ) {
             BasicTextField(
@@ -65,7 +76,16 @@ fun LateStudyReasonSection(
                         onValueChange(newValue)
                     }
                 },
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .onFocusChanged { focusState ->
+                        if (focusState.isFocused) {
+                            coroutineScope.launch {
+                                delay(250)
+                                bringIntoViewRequester.bringIntoView()
+                            }
+                        }
+                    },
                 textStyle = DmsTheme.typography.bodyM.copy(
                     color = DmsTheme.colorScheme.onBackground,
                 ),

feature/src/main/kotlin/team/aliens/dms/android/feature/main/application/viewmodel/ApplicationViewModel.kt

@@ -195,20 +195,24 @@ private fun StudyApplicationStatusResponse.buildRangeText(
     return when {
         start != null && end != null -> {
             if (start == end) {
-                "$startDate $suffix"
+                "${start.toMonthDayText()} $suffix"
             } else {
-                "$startDate ~ $endDate $suffix"
+                "${start.toMonthDayText()} ~ ${end.toMonthDayText()} $suffix"
             }
         }
 
-        start != null -> "$startDate $suffix"
+        start != null -> "${start.toMonthDayText()} $suffix"
 
-        end != null -> "$endDate $suffix"
+        end != null -> "${end.toMonthDayText()} $suffix"
 
         else -> null
     }
 }
 
+private fun LocalDate.toMonthDayText(): String {
+    return "${monthValue}.${dayOfMonth}"
+}
+
 private fun StudyApplicationStatusResponse.toUiStatus(): LateStudyStatusUi? {
     val today = LocalDate.now()
     val start = startDate.toLocalDateOrNull()