From a2908786d4352768fea401684ffa7a90696db157 Mon Sep 17 00:00:00 2001 From: Yeji Kim <135138918+apffkxhsls@users.noreply.github.com> Date: Thu, 16 Jul 2026 18:13:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[refactor/#213]=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EA=B4=80=EB=A0=A8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/LessonDetailBeforeScreen.kt | 130 +++++++++-------- .../screen/LessonDetailCanceledScreen.kt | 8 +- .../screen/LessonDetailCompletedScreen.kt | 131 +++++++++--------- .../screen/LessonDetailOngoingScreen.kt | 127 +++++++++-------- 4 files changed, 191 insertions(+), 205 deletions(-) diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt index 4b04d1e7..68e5d0a8 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt @@ -90,92 +90,88 @@ internal fun LessonDetailBeforeScreen( .background(Blue50) .statusBarsPadding(), ) - Column( modifier = Modifier + .verticalScroll(rememberScrollState()) .weight(1f) - .background(color = Blue50), ) { + Spacer(modifier = Modifier.height(16.dp)) + + LessonBanner( + lessonBannerState = lessonBannerState, + beforeLessonText = "강습을 준비해주세요", + ) + Column( modifier = Modifier - .verticalScroll(rememberScrollState()) + .fillMaxWidth() + .background(color = Blue50) + .background( + color = SSINGTheme.colors.backgroundNormal, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + ) + ) + .padding(horizontal = 16.dp) .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) - - LessonBanner( - lessonBannerState = lessonBannerState, - beforeLessonText = "강습을 준비해주세요", + SectionTitle(text = "강습 정보") + Spacer(modifier = Modifier.height(8.dp)) + SsingMatchingDetailCardSmall( + tags = before.tags, + teamNicknames = before.nicknames, + totalCount = before.teams.size, + place = before.location, + duration = before.duration, + price = before.price, ) - Column( - modifier = Modifier - .fillMaxWidth() - .background( - color = SSINGTheme.colors.backgroundNormal, - shape = RoundedCornerShape( - topStart = 12.dp, - topEnd = 12.dp, - ) - ) - .padding(horizontal = 16.dp) - ) { - Spacer(modifier = Modifier.height(16.dp)) - SectionTitle(text = "강습 정보") - Spacer(modifier = Modifier.height(8.dp)) - SsingMatchingDetailCardSmall( - tags = before.tags, - teamNicknames = before.nicknames, - totalCount = before.teams.size, - place = before.location, - duration = before.duration, - price = before.price, + Spacer(modifier = Modifier.height(24.dp)) + SectionTitle(text = "강습생 정보") + Spacer(modifier = Modifier.height(8.dp)) + before.teams.forEachIndexed { index, team -> + ConsumerInfoCard( + isReady = team.isReady ?: false, + nickname = team.teamNickname, + participants = team.participants, + price = team.price, ) - - Spacer(modifier = Modifier.height(24.dp)) - SectionTitle(text = "강습생 정보") - Spacer(modifier = Modifier.height(8.dp)) - before.teams.forEachIndexed { index, team -> - ConsumerInfoCard( - isReady = team.isReady ?: false, - nickname = team.teamNickname, - participants = team.participants, - price = team.price, - ) - if (index != before.teams.lastIndex) { - Spacer(modifier = Modifier.height(4.dp)) - } + if (index != before.teams.lastIndex) { + Spacer(modifier = Modifier.height(4.dp)) } + } - Spacer(modifier = Modifier.height(24.dp)) - Text( - text = "강습 관리", - style = SSINGTheme.typography.caption.sb12, - color = SSINGTheme.colors.textAlternative, - modifier = Modifier.padding(bottom = 8.dp), + Spacer(modifier = Modifier.height(24.dp)) + Text( + text = "강습 관리", + style = SSINGTheme.typography.caption.sb12, + color = SSINGTheme.colors.textAlternative, + modifier = Modifier.padding(bottom = 8.dp), + ) + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth(), + ) { + SsingButton( + text = "강습 취소", + onClick = onCancelSheetOpen, + style = SsingButtonStyle.RED, + modifier = Modifier.weight(1f), ) - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.fillMaxWidth(), - ) { - SsingButton( - text = "강습 취소", - onClick = onCancelSheetOpen, - style = SsingButtonStyle.RED, - modifier = Modifier.weight(1f), - ) - SsingButton( - text = "채팅방", - onClick = onChatRoomClick, - style = SsingButtonStyle.GRAY, - modifier = Modifier.weight(1f), - ) - } - Spacer(modifier = Modifier.height(16.dp)) + SsingButton( + text = "채팅방", + onClick = onChatRoomClick, + style = SsingButtonStyle.GRAY, + modifier = Modifier.weight(1f), + ) } + Spacer(modifier = Modifier.height(16.dp)) } } + SsingButton( text = if (before.isInstructorReady) "강습 대기중" else "강습 준비 완료", onClick = onReadyButtonClick, diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt index 5d32ec56..20c7b79c 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt @@ -57,11 +57,6 @@ internal fun LessonDetailCanceledScreen( .background(Blue50) .statusBarsPadding(), ) - Column( - modifier = Modifier - .weight(1f) - .background(color = Blue50), - ) { Column( modifier = Modifier .verticalScroll(rememberScrollState()) @@ -76,6 +71,7 @@ internal fun LessonDetailCanceledScreen( Column( modifier = Modifier .weight(1f) + .background(color = Blue50) .background( color = SSINGTheme.colors.backgroundNormal, shape = RoundedCornerShape( @@ -84,6 +80,7 @@ internal fun LessonDetailCanceledScreen( ) ) .padding(horizontal = 16.dp) + .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) SectionTitle(text = "강습 정보") @@ -142,7 +139,6 @@ internal fun LessonDetailCanceledScreen( Spacer(modifier = Modifier.height(16.dp)) } } - } SsingButton( text = "씽 매칭으로 돌아가기", onClick = onMatchingClick, diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt index c605141c..b02e5039 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt @@ -57,88 +57,85 @@ internal fun LessonDetailCompletedScreen( ) Column( modifier = Modifier + .verticalScroll(rememberScrollState()) .weight(1f) - .background(color = Blue50), ) { + Spacer(modifier = Modifier.height(16.dp)) + + LessonBanner( + lessonBannerState = lessonBannerState + ) + Column( modifier = Modifier - .verticalScroll(rememberScrollState()) + .fillMaxWidth() + .background(color = Blue50) + .background( + color = SSINGTheme.colors.backgroundNormal, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + ) + ) + .padding(horizontal = 16.dp) .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) - - LessonBanner( - lessonBannerState = lessonBannerState + SectionTitle(text = "강습 정보") + Spacer(modifier = Modifier.height(8.dp)) + SsingMatchingDetailCardSmall( + tags = completed.tags, + teamNicknames = completed.teams.map { it.teamNickname }.toPersistentList(), + totalCount = completed.teams.size, + actualTimeRange = completed.lessonTime, + place = completed.location, + duration = completed.duration, + price = completed.price, ) - Column( - modifier = Modifier - .weight(1f) - .background( - color = SSINGTheme.colors.backgroundNormal, - shape = RoundedCornerShape( - topStart = 12.dp, - topEnd = 12.dp, - ) - ) - .padding(horizontal = 16.dp) - ) { - Spacer(modifier = Modifier.height(16.dp)) - SectionTitle(text = "강습 정보") - Spacer(modifier = Modifier.height(8.dp)) - SsingMatchingDetailCardSmall( - tags = completed.tags, - teamNicknames = completed.teams.map { it.teamNickname }.toPersistentList(), - totalCount = completed.teams.size, - actualTimeRange = completed.lessonTime, - place = completed.location, - duration = completed.duration, - price = completed.price, + Spacer(modifier = Modifier.height(24.dp)) + SectionTitle(text = "강습생 정보") + Spacer(modifier = Modifier.height(8.dp)) + completed.teams.forEachIndexed { index, team -> + ConsumerInfoCard( + isReady = false, + nickname = team.teamNickname, + participants = team.participants, + price = team.price, ) - - Spacer(modifier = Modifier.height(24.dp)) - SectionTitle(text = "강습생 정보") - Spacer(modifier = Modifier.height(8.dp)) - completed.teams.forEachIndexed { index, team -> - ConsumerInfoCard( - isReady = false, - nickname = team.teamNickname, - participants = team.participants, - price = team.price, - ) - if (index != completed.teams.lastIndex) { - Spacer(modifier = Modifier.height(4.dp)) - } + if (index != completed.teams.lastIndex) { + Spacer(modifier = Modifier.height(4.dp)) } + } - Spacer(modifier = Modifier.height(24.dp)) - Text( - text = "강습 관리", - style = SSINGTheme.typography.caption.sb12, - color = SSINGTheme.colors.textAlternative, - modifier = Modifier.padding(bottom = 8.dp), + Spacer(modifier = Modifier.height(24.dp)) + Text( + text = "강습 관리", + style = SSINGTheme.typography.caption.sb12, + color = SSINGTheme.colors.textAlternative, + modifier = Modifier.padding(bottom = 8.dp), + ) + Row( + horizontalArrangement = Arrangement.spacedBy(4.dp), + modifier = Modifier.fillMaxWidth(), + ) { + SsingButton( + text = "채팅방", + onClick = onChatRoomClick, + style = SsingButtonStyle.GRAY, + modifier = Modifier.weight(1f), + ) + SsingButton( + text = "강습 후기", + onClick = onEndClick, + style = SsingButtonStyle.GRAY, + modifier = Modifier.weight(1f), ) - Row( - horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = Modifier.fillMaxWidth(), - ) { - SsingButton( - text = "채팅방", - onClick = onChatRoomClick, - style = SsingButtonStyle.GRAY, - modifier = Modifier.weight(1f), - ) - SsingButton( - text = "강습 후기", - onClick = onEndClick, - style = SsingButtonStyle.GRAY, - modifier = Modifier.weight(1f), - ) - } - Spacer(modifier = Modifier.height(16.dp)) } + Spacer(modifier = Modifier.height(16.dp)) } } + SsingButton( text = "정산 보기", onClick = onEndClick, @@ -187,4 +184,4 @@ private fun LessonDetailCompletedScreenPreview() { ), ) } -} \ No newline at end of file +} diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt index eb3c998e..e56fd1f8 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt @@ -57,87 +57,84 @@ internal fun LessonDetailOngoingScreen( ) Column( modifier = Modifier + .verticalScroll(rememberScrollState()) .weight(1f) - .background(color = Blue50), ) { + Spacer(modifier = Modifier.height(16.dp)) + + LessonBanner( + lessonBannerState = lessonBannerState + ) + Column( modifier = Modifier - .verticalScroll(rememberScrollState()) + .fillMaxWidth() + .background(color = Blue50) + .background( + color = SSINGTheme.colors.backgroundNormal, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + ) + ) + .padding(horizontal = 16.dp) .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) - - LessonBanner( - lessonBannerState = lessonBannerState + SectionTitle(text = "강습 정보") + Spacer(modifier = Modifier.height(8.dp)) + SsingMatchingDetailCardSmall( + tags = ongoing.tags, + teamNicknames = ongoing.nicknames, + totalCount = ongoing.teams.size, + place = ongoing.location, + duration = ongoing.duration, + price = ongoing.price, ) - Column( - modifier = Modifier - .weight(1f) - .background( - color = SSINGTheme.colors.backgroundNormal, - shape = RoundedCornerShape( - topStart = 12.dp, - topEnd = 12.dp, - ) - ) - .padding(horizontal = 16.dp) - ) { - Spacer(modifier = Modifier.height(16.dp)) - SectionTitle(text = "강습 정보") - Spacer(modifier = Modifier.height(8.dp)) - SsingMatchingDetailCardSmall( - tags = ongoing.tags, - teamNicknames = ongoing.nicknames, - totalCount = ongoing.teams.size, - place = ongoing.location, - duration = ongoing.duration, - price = ongoing.price, + Spacer(modifier = Modifier.height(24.dp)) + SectionTitle(text = "강습생 정보") + Spacer(modifier = Modifier.height(8.dp)) + ongoing.teams.forEachIndexed { index, team -> + ConsumerInfoCard( + isReady = false, + nickname = team.teamNickname, + participants = team.participants, + price = team.price, ) - - Spacer(modifier = Modifier.height(24.dp)) - SectionTitle(text = "강습생 정보") - Spacer(modifier = Modifier.height(8.dp)) - ongoing.teams.forEachIndexed { index, team -> - ConsumerInfoCard( - isReady = false, - nickname = team.teamNickname, - participants = team.participants, - price = team.price, - ) - if (index != ongoing.teams.lastIndex) { - Spacer(modifier = Modifier.height(4.dp)) - } + if (index != ongoing.teams.lastIndex) { + Spacer(modifier = Modifier.height(4.dp)) } + } - Spacer(modifier = Modifier.height(24.dp)) - Text( - text = "강습 관리", - style = SSINGTheme.typography.caption.sb12, - color = SSINGTheme.colors.textAlternative, - modifier = Modifier.padding(bottom = 8.dp), + Spacer(modifier = Modifier.height(24.dp)) + Text( + text = "강습 관리", + style = SSINGTheme.typography.caption.sb12, + color = SSINGTheme.colors.textAlternative, + modifier = Modifier.padding(bottom = 8.dp), + ) + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth(), + ) { + SsingButton( + text = "문제 신고", + onClick = onCancelClassClick, + style = SsingButtonStyle.RED, + modifier = Modifier.weight(1f), + ) + SsingButton( + text = "채팅방", + onClick = onChatRoomClick, + style = SsingButtonStyle.GRAY, + modifier = Modifier.weight(1f), ) - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.fillMaxWidth(), - ) { - SsingButton( - text = "문제 신고", - onClick = onCancelClassClick, - style = SsingButtonStyle.RED, - modifier = Modifier.weight(1f), - ) - SsingButton( - text = "채팅방", - onClick = onChatRoomClick, - style = SsingButtonStyle.GRAY, - modifier = Modifier.weight(1f), - ) - } - Spacer(modifier = Modifier.height(16.dp)) } + Spacer(modifier = Modifier.height(16.dp)) } } + SsingButton( text = "강습 종료", onClick = onEndClick, From 5f96a9bd5aa69465f074b962ea1f0d98b081abef Mon Sep 17 00:00:00 2001 From: Yeji Kim <135138918+apffkxhsls@users.noreply.github.com> Date: Thu, 16 Jul 2026 18:35:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[del/#213]=20=20=20=20.weight(1f)=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instructorlessondetail/screen/LessonDetailBeforeScreen.kt | 1 - .../instructorlessondetail/screen/LessonDetailCanceledScreen.kt | 1 - .../instructorlessondetail/screen/LessonDetailCompletedScreen.kt | 1 - .../instructorlessondetail/screen/LessonDetailOngoingScreen.kt | 1 - 4 files changed, 4 deletions(-) diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt index 68e5d0a8..ea8697e4 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt @@ -114,7 +114,6 @@ internal fun LessonDetailBeforeScreen( ) ) .padding(horizontal = 16.dp) - .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) SectionTitle(text = "강습 정보") diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt index 20c7b79c..72fc902d 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt @@ -80,7 +80,6 @@ internal fun LessonDetailCanceledScreen( ) ) .padding(horizontal = 16.dp) - .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) SectionTitle(text = "강습 정보") diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt index b02e5039..c3e53854 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt @@ -78,7 +78,6 @@ internal fun LessonDetailCompletedScreen( ) ) .padding(horizontal = 16.dp) - .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) SectionTitle(text = "강습 정보") diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt index e56fd1f8..c63b40fa 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailOngoingScreen.kt @@ -78,7 +78,6 @@ internal fun LessonDetailOngoingScreen( ) ) .padding(horizontal = 16.dp) - .weight(1f) ) { Spacer(modifier = Modifier.height(16.dp)) SectionTitle(text = "강습 정보")