상세 스케줄 보러가기 클릭시에 상세스케줄 화면으로 이동

mash-up-kr · Sep 1, 2024 · 1560a9d · 1560a9d
1 parent 9d13272
commit 1560a9d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/java/com/mashup/ui/schedule/ScheduleRoute.kt b/app/src/main/java/com/mashup/ui/schedule/ScheduleRoute.kt
@@ -164,7 +164,6 @@ fun ScheduleRoute(
                                 scheduleState = scheduleState,
                                 dailyListState = dailyListState,
                                 onClickScheduleInformation = { id, type -> context.moveToScheduleInformation(id, type) },
-                                onClickAttendance = { context.moveToAttendance(it) },
                                 onClickMashongButton = {
                                     AnalyticsManager.addEvent(eventName = LOG_EVENT_LIST_WEEK_MASHONG)
                                     context.moveToMashong()

diff --git a/app/src/main/java/com/mashup/ui/schedule/ScheduleScreen.kt b/app/src/main/java/com/mashup/ui/schedule/ScheduleScreen.kt
@@ -18,7 +18,6 @@ fun ScheduleScreen(
     modifier: Modifier = Modifier,
     scheduleType: ScheduleType = ScheduleType.WEEK,
     onClickScheduleInformation: (Int, String) -> Unit = { _, _ -> },
-    onClickAttendance: (Int) -> Unit = {},
     onClickMashongButton: () -> Unit = {},
     makeToast: (String) -> Unit = {},
     refreshState: Boolean = false
@@ -43,7 +42,6 @@ fun ScheduleScreen(
                     )
                     onClickScheduleInformation(scheduleId, type)
                 },
-                onClickAttendance = onClickAttendance,
                 onClickMashongButton = onClickMashongButton,
                 makeToast = makeToast,
                 refreshState = refreshState

diff --git a/app/src/main/java/com/mashup/ui/schedule/component/WeeklySchedule.kt b/app/src/main/java/com/mashup/ui/schedule/component/WeeklySchedule.kt
@@ -15,7 +15,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.mashup.core.ui.theme.MashUpTheme
 import com.mashup.ui.schedule.ScheduleState
 import com.mashup.ui.schedule.item.EmptyScheduleItem
 import com.mashup.ui.schedule.item.ScheduleViewPagerEmptyItem
@@ -30,7 +32,6 @@ fun WeeklySchedule(
     scheduleState: ScheduleState,
     modifier: Modifier = Modifier,
     onClickScheduleInformation: (Int, String) -> Unit = { _, _ -> },
-    onClickAttendance: (Int) -> Unit = {},
     onClickMashongButton: () -> Unit = {},
     makeToast: (String) -> Unit = {},
     refreshState: Boolean = false
@@ -104,7 +105,6 @@ fun WeeklySchedule(
                                     },
                                     data = data,
                                     onClickScheduleInformation = onClickScheduleInformation,
-                                    onClickAttendance = onClickAttendance,
                                     makeToast = makeToast
                                 )
                             }
@@ -122,7 +122,6 @@ fun WeeklySchedule(
                                     },
                                     data = data,
                                     onClickScheduleInformation = onClickScheduleInformation,
-                                    onClickAttendance = onClickAttendance
                                 )
                             }
                         }

diff --git a/app/src/main/java/com/mashup/ui/schedule/item/SchedeuleViewPagerInProgressItem.kt b/app/src/main/java/com/mashup/ui/schedule/item/SchedeuleViewPagerInProgressItem.kt
@@ -53,7 +53,6 @@ fun ScheduleViewPagerInProgressItem(
     data: ScheduleCard.InProgressSchedule,
     modifier: Modifier = Modifier,
     onClickScheduleInformation: (Int, String) -> Unit = { _, _ -> },
-    onClickAttendance: (Int) -> Unit = {}
 ) {
     val textColor by remember { mutableStateOf(data.scheduleResponse.scheduleType.getButtonTextColor()) }
     Column(
@@ -169,7 +168,7 @@ fun ScheduleViewPagerInProgressItem(
                         )
                         setPadding(12, 0, 0, 0)
                         setOnClickListener {
-                            onClickAttendance(data.scheduleResponse.scheduleId)
+                            onClickScheduleInformation(data.scheduleResponse.scheduleId, data.scheduleResponse.scheduleType)
                         }
                     }
                 }

diff --git a/app/src/main/java/com/mashup/ui/schedule/item/ScheduleViewPagerSuccessItem.kt b/app/src/main/java/com/mashup/ui/schedule/item/ScheduleViewPagerSuccessItem.kt
@@ -79,7 +79,6 @@ fun ScheduleViewPagerSuccessItem(
     data: ScheduleCard.EndSchedule,
     modifier: Modifier = Modifier,
     onClickScheduleInformation: (Int, String) -> Unit = { _, _ -> },
-    onClickAttendance: (Int) -> Unit = {},
     makeToast: (String) -> Unit = {}
 ) {
     val context = LocalContext.current
@@ -217,7 +216,10 @@ fun ScheduleViewPagerSuccessItem(
                         )
                         setPadding(12, 0, 0, 0)
                         setOnClickListener {
-                            onClickAttendance(data.scheduleResponse.scheduleId)
+                            onClickScheduleInformation(
+                                data.scheduleResponse.scheduleId,
+                                data.scheduleResponse.scheduleType
+                            )
                         }
                     }
                 }
@@ -310,7 +312,10 @@ fun ScheduleViewPagerSuccessItem(
                             )
                             setPadding(12, 0, 0, 0)
                             setOnClickListener {
-                                onClickAttendance(data.scheduleResponse.scheduleId)
+                                onClickScheduleInformation(
+                                    data.scheduleResponse.scheduleId,
+                                    data.scheduleResponse.scheduleType
+                                )
                             }
                         }
                     }