[add] 동일 과목 활성화 구현

core/designsystem/src/main/java/in/koreatech/koin/core/designsystem/ComposeExtensions.kt

@@ -5,7 +5,18 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawOutline
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 
 /**
  * 리플 효과 없는 Clickable
@@ -24,4 +35,44 @@ fun Modifier.noRippleClickable(
         role = role,
         onClick = onClick
     )
+}
+
+/**
+ * 점선(-) 테두리
+ */
+fun Modifier.dashedBorder(
+    color: Color,
+    shape: Shape,
+    strokeWidth: Dp = 1.dp,
+    dashLength: Dp = 3.dp,
+    gapLength: Dp = 3.dp,
+    cap: StrokeCap = StrokeCap.Round
+) = dashedBorder(brush = SolidColor(color), shape, strokeWidth, dashLength, gapLength, cap)
+
+private fun Modifier.dashedBorder(
+    brush: Brush,
+    shape: Shape,
+    strokeWidth: Dp,
+    dashLength: Dp,
+    gapLength: Dp,
+    cap: StrokeCap = StrokeCap.Round
+) = this.drawWithContent {
+
+    val outline = shape.createOutline(size, layoutDirection, density = this)
+
+    val dashedStroke = Stroke(
+        cap = cap,
+        width = strokeWidth.toPx(),
+        pathEffect = PathEffect.dashPathEffect(
+            intervals = floatArrayOf(dashLength.toPx(), gapLength.toPx())
+        )
+    )
+
+    drawContent()
+
+    drawOutline(
+        outline = outline,
+        style = dashedStroke,
+        brush = brush
+    )
 }

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/component/TimetableEventTime.kt

@@ -19,13 +19,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import `in`.koreatech.koin.core.designsystem.dashedBorder
 import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
 import `in`.koreatech.koin.feature.timetable.model.TimetableEvent
 import `in`.koreatech.koin.feature.timetable.model.dummyEvent
 import java.time.DayOfWeek
 
 enum class TimetableEventType {
-    BASIC, SELECTED
+    BASIC, SELECTED, ETC_SELECTED
 }
 
 @Composable
@@ -53,6 +54,12 @@ fun TimetableEventTime(
                 bottom = (0.65).dp
             )
         )
+
+        TimetableEventType.ETC_SELECTED -> TimetableEtcSelectedEventTime(
+            range = range,
+            event = event,
+            modifier = modifier.padding(1.dp)
+        )
     }
 }
 
@@ -92,7 +99,6 @@ private fun TimetableSelectedEventTime(
     event: TimetableEvent,
     modifier: Modifier = Modifier,
 ) {
-
     Box(
         modifier = modifier
             .fillMaxSize()
@@ -103,16 +109,37 @@ private fun TimetableSelectedEventTime(
                 color = KoinTheme.colors.neutral500,
                 width = 1.dp,
                 shape = RoundedCornerShape(
-                    bottomEnd = timetableSelectedEventTimeBottomEndRound(
-                        range,
-                        event
-                    )
+                    bottomEnd = timetableSelectedEventTimeBottomEndRound(range, event)
                 )
             )
     )
 }
 
-fun timetableSelectedEventTimeBottomEndRound(
+@Composable
+private fun TimetableEtcSelectedEventTime(
+    range: Int,
+    event: TimetableEvent,
+    modifier: Modifier = Modifier
+) {
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .background(
+                color = Color.Transparent,
+            )
+            .dashedBorder(
+                color = KoinTheme.colors.neutral500,
+                shape = RoundedCornerShape(
+                    topStart = 0.dp,
+                    topEnd = 0.dp,
+                    bottomStart = 0.dp,
+                    bottomEnd = timetableSelectedEventTimeBottomEndRound(range, event)
+                )
+            )
+    )
+}
+
+private fun timetableSelectedEventTimeBottomEndRound(
     range: Int,
     event: TimetableEvent
 ): Dp {
@@ -124,7 +151,6 @@ fun timetableSelectedEventTimeBottomEndRound(
         }
         if (range == timeRange) {
             return 10.dp
-            true
         }
     }
     return 0.dp
@@ -153,4 +179,17 @@ private fun TimetableEventTimePreview_Selected() {
             .padding(10.dp),
         eventType = TimetableEventType.SELECTED
     )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun TimetableEventTimePreview_Etc_Selected() {
+    TimetableEventTime(
+        range = 9,
+        event = dummyEvent,
+        modifier = Modifier
+            .sizeIn(maxHeight = 64.dp)
+            .padding(10.dp),
+        eventType = TimetableEventType.ETC_SELECTED
+    )
 }

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/section/TimetableContent.kt

@@ -27,6 +27,7 @@ import `in`.koreatech.koin.feature.timetable.component.TimetableEventType
 import `in`.koreatech.koin.feature.timetable.model.TimetableConstants
 import `in`.koreatech.koin.feature.timetable.model.TimetableEvent
 import `in`.koreatech.koin.feature.timetable.model.dummyEvent
+import java.sql.Time
 import java.time.DayOfWeek
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
@@ -46,6 +47,7 @@ fun TimetableContent(
     dayCount: Int = TimetableConstants.days.size,
     height: Dp = (TimetableConstants.eventHeight).dp,
     clickEvent: List<TimetableEvent> = emptyList(),
+    etcClickEvent: List<TimetableEvent> = emptyList(),
     content: @Composable (event: TimetableEvent, eventType: TimetableEventType, onEventTimeClick: (TimetableEvent) -> Unit) -> Unit = { event, eventType, onClick ->
         TimetableEventTime(
             range = range,
@@ -95,10 +97,17 @@ fun TimetableContent(
                     content(event, TimetableEventType.BASIC, onEventClick)
                 }
             }
+            if (etcClickEvent.isNotEmpty()) {
+                etcClickEvent.sortedBy(TimetableEvent::start).forEach { event ->
+                    Box(modifier = Modifier.eventData(event)) {
+                        content(event, TimetableEventType.ETC_SELECTED, {})
+                    }
+                }
+            }
             if (clickEvent.isNotEmpty()) {
                 clickEvent.sortedBy(TimetableEvent::start).forEach { event ->
                     Box(modifier = Modifier.eventData(event)) {
-                        content(event, TimetableEventType.SELECTED, onEventClick)
+                        content(event, TimetableEventType.SELECTED, {})
                     }
                 }
             }
@@ -243,7 +252,7 @@ fun TimetableContent(
                     else -> -1
                 }
                 val eventX = eventOffsetDays * innerWidth + timeWidth.roundToPx()
-                if (index == placeablesWithEvents.size - 1) {
+                if(event in clickEvent) {
                     onEventY(eventY)
                 }
                 placeable.place(eventX, eventY)

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/view/Timetable.kt

@@ -31,6 +31,7 @@ fun Timetable(
     events: List<TimetableEvent>,
     modifier: Modifier = Modifier,
     clickEvent: List<TimetableEvent> = emptyList(),
+    etcClickEvent: List<TimetableEvent> = emptyList(),
     content: @Composable
         (event: TimetableEvent, eventType: TimetableEventType, onEventTimeClick: (TimetableEvent) -> Unit) -> Unit = { event, eventType, onEventTimeClick ->
         TimetableEventTime(
@@ -60,6 +61,7 @@ fun Timetable(
         horizontalPadding = 48.dp,
         events = events,
         clickEvent = clickEvent,
+        etcClickEvent = etcClickEvent,
         content = content,
         onEventClick = onEventClick,
         onEventY = { y ->

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/view/TimetableScreen.kt

@@ -52,6 +52,7 @@ fun TimetableScreen(
     modifier: Modifier = Modifier,
     timetableEvents: List<TimetableEvent> = emptyList(),
     clickedTimetableEvents: List<TimetableEvent> = emptyList(),
+    etcClickedTimetableEvents: List<TimetableEvent> = emptyList(),
     onSearchTextChange: (text: String) -> Unit = {},
     onClickTimetableSchedule: () -> Unit = {},
     onClickDownloadTimetable: () -> Unit = {},
@@ -116,6 +117,7 @@ fun TimetableScreen(
                 modifier = Modifier,
                 events = timetableEvents,
                 clickEvent = clickedTimetableEvents,
+                etcClickEvent = etcClickedTimetableEvents,
                 onEventClick = onClickTimetableEvent
             )
         }
@@ -124,7 +126,6 @@ fun TimetableScreen(
 }
 
 
-
 @OptIn(ExperimentalMaterialApi::class)
 private fun Modifier.dynamicPadding(
     sheetState: BottomSheetState,

feature/timetable/src/main/java/in/koreatech/koin/feature/timetable/viewmodel/TimetableViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import `in`.koreatech.koin.domain.model.timetable.response.Lecture
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableFrame
+import `in`.koreatech.koin.domain.model.timetable.response.TimetableLecture
 import `in`.koreatech.koin.domain.model.timetable.response.TimetableLectures
 import `in`.koreatech.koin.domain.repository.TimetableRepository
 import `in`.koreatech.koin.domain.usecase.timetable.AddTimetableLectureUseCase
@@ -16,6 +17,7 @@ import `in`.koreatech.koin.domain.usecase.timetable.GetTimetableFramesUseCase
 import `in`.koreatech.koin.feature.timetable.model.TimetableEvent
 import `in`.koreatech.koin.feature.timetable.utils.formatTimeRange
 import `in`.koreatech.koin.feature.timetable.utils.getTimetableEvents
+import `in`.koreatech.koin.feature.timetable.utils.toTimetableEvents
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -184,15 +186,44 @@ class TimetableViewModel @Inject constructor(
         if (timetableEvents.isEmpty()) {
             _uiState.value = _uiState.value.copy(
                 clickedTimetableEvents = emptyList(),
+                etcClickedTimetableEvents = emptyList(),
                 range = uiState.value.timetableLectures.formatTimeRange()
             )
         } else {
-            val range = timetableEvents.formatTimeRange()
+            val events =
+                lectures.value.filter { it.name == timetableEvents.firstOrNull()?.name.orEmpty() }
+                    .flatMap { timetableLecture ->
+                        timetableLecture.toTimetableEvents()
+                    }
+
+            val adaptRange = uiState.value.timetableLectures.formatTimeRange()
+            val eventRange = events.formatTimeRange()
+
+            val etcClickedTimetableEvents = events.toMutableList()
+            events.forEach { etcTimetableEvent ->
+                timetableEvents.forEach { timetableEvent ->
+                    if (etcTimetableEvent.start == timetableEvent.start && etcTimetableEvent.end == timetableEvent.end) {
+                        etcClickedTimetableEvents.remove(etcTimetableEvent)
+                    }
+                }
+            }
+
             _uiState.value = _uiState.value.copy(
                 clickedTimetableEvents = timetableEvents,
-                range = if (range < 9) {
-                    9
-                } else range
+                etcClickedTimetableEvents = etcClickedTimetableEvents,
+                range = if (eventRange > 9) {
+                    if (adaptRange > eventRange) {
+                        adaptRange
+                    } else {
+                        eventRange
+                    }
+                } else {
+                    if (adaptRange > 9) {
+                        adaptRange
+                    } else {
+                        9
+                    }
+                }
             )
         }
     }
@@ -308,6 +339,7 @@ class TimetableViewModel @Inject constructor(
                             timetableLectures = timetableLectures,
                             timetableEvents = timetableLectures.getTimetableEvents(),
                             clickedTimetableEvents = emptyList(),
+                            etcClickedTimetableEvents = emptyList(),
                             isLectureDuplicationDialogVisible = false,
                             selectedLecture = null,
                             loading = false
@@ -349,6 +381,9 @@ class TimetableViewModel @Inject constructor(
                                     range = timetableLectures.formatTimeRange(),
                                     frameId = timetableLectures.timetableFrameId,
                                     timetableEvents = timetableLectures.getTimetableEvents(),
+                                    clickedTimetableEvents = emptyList(),
+                                    etcClickedTimetableEvents = emptyList(),
+                                    selectedLecture = null,
                                     timetableLectures = timetableLectures,
                                 )
                             }.onFailure {
@@ -410,6 +445,7 @@ data class TimetableUiState(
     val currentSemester: String = "",
     val timetableEvents: List<TimetableEvent> = emptyList(),
     val clickedTimetableEvents: List<TimetableEvent> = emptyList(),
+    val etcClickedTimetableEvents: List<TimetableEvent> = emptyList(),
     val selectedLecture: Lecture? = null,
     val timetableLectures: TimetableLectures = TimetableLectures(0, emptyList(), 0, 0),
     val loading: Boolean = false,