Skip to content

[REFACTOR/#213] 예지 QA #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apffkxhsls merged 3 commits into from
Jul 16, 2026
Merged

[REFACTOR/#213] 예지 QA #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a290878
[refactor/#213] 배경색 관련 오류 수정
apffkxhsls Jul 16, 2026
5f96a9b
[del/#213] .weight(1f) 삭제
apffkxhsls Jul 16, 2026
b9b74e5
[Merge/#213] pulled develop
apffkxhsls Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 63 additions & 68 deletions ...ain/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailBeforeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,92 +90,87 @@ 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())
.weight(1f)
.fillMaxWidth()
.background(color = Blue50)
Comment thread
apffkxhsls marked this conversation as resolved.
.background(
color = SSINGTheme.colors.backgroundNormal,
shape = RoundedCornerShape(
topStart = 12.dp,
topEnd = 12.dp,
)
)
.padding(horizontal = 16.dp)
) {
Comment thread
apffkxhsls marked this conversation as resolved.
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,
Expand Down
7 changes: 1 addition & 6 deletions ...n/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCanceledScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ internal fun LessonDetailCanceledScreen(
.background(Blue50)
.statusBarsPadding(),
)
Column(
modifier = Modifier
.weight(1f)
.background(color = Blue50),
) {
Column(
modifier = Modifier
.verticalScroll(rememberScrollState())
Expand All @@ -76,6 +71,7 @@ internal fun LessonDetailCanceledScreen(
Column(
modifier = Modifier
.weight(1f)
.background(color = Blue50)
.background(
color = SSINGTheme.colors.backgroundNormal,
shape = RoundedCornerShape(
Expand Down Expand Up @@ -142,7 +138,6 @@ internal fun LessonDetailCanceledScreen(
Spacer(modifier = Modifier.height(16.dp))
}
}
}
SsingButton(
text = "씽 매칭으로 돌아가기",
onClick = onMatchingClick,
Expand Down
132 changes: 64 additions & 68 deletions .../java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailCompletedScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,88 +57,84 @@ 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())
.weight(1f)
.fillMaxWidth()
.background(color = Blue50)
.background(
color = SSINGTheme.colors.backgroundNormal,
shape = RoundedCornerShape(
topStart = 12.dp,
topEnd = 12.dp,
)
)
.padding(horizontal = 16.dp)
) {
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,
Expand Down Expand Up @@ -187,4 +183,4 @@ private fun LessonDetailCompletedScreenPreview() {
),
)
}
}
}
Loading
Loading