diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiAlignButton.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiAlignButton.kt deleted file mode 100644 index e8cc8b307..000000000 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiAlignButton.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.suwiki.core.designsystem.component.align - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Icon -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R -import com.suwiki.core.designsystem.shadow.cardShadow -import com.suwiki.core.designsystem.theme.Gray6A -import com.suwiki.core.designsystem.theme.White -import com.suwiki.core.ui.extension.suwikiClickable - -@Composable -fun SuwikiAlignButton( - modifier: Modifier = Modifier, - onClick: () -> Unit = {}, -) { - Icon( - painter = painterResource(id = R.drawable.ic_filter), - contentDescription = "", - modifier = modifier - .cardShadow() - .clip(RoundedCornerShape(10.dp)) - .suwikiClickable(onClick = onClick) - .background(White) - .padding(8.dp), - tint = Gray6A, - ) -} - -@Preview(widthDp = 400, heightDp = 400) -@Composable -fun SuwikiAlignButtonPreview() { - Column( - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - SuwikiAlignButton() - } -} diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiSelectContainer.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiSelectContainer.kt deleted file mode 100644 index 9586d9c9a..000000000 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiSelectContainer.kt +++ /dev/null @@ -1,87 +0,0 @@ -package com.suwiki.core.designsystem.component.align - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.Icon -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R -import com.suwiki.core.designsystem.theme.Gray6A -import com.suwiki.core.designsystem.theme.Primary -import com.suwiki.core.designsystem.theme.SuwikiTheme -import com.suwiki.core.designsystem.theme.White -import com.suwiki.core.ui.extension.suwikiClickable - -@Composable -fun SuwikiSelectContainer( - modifier: Modifier = Modifier, - text: String, - isChecked: Boolean = false, - onClick: () -> Unit = {}, -) { - val textColor = if (isChecked) Primary else Gray6A - Box( - modifier = modifier - .background(White) - .fillMaxWidth() - .wrapContentHeight() - .suwikiClickable( - onClick = onClick, - rippleColor = Gray6A, - ), - ) { - Text( - text = text, - color = textColor, - style = SuwikiTheme.typography.body2, - modifier = Modifier - .align(Alignment.CenterStart) - .padding(top = 13.dp, bottom = 14.dp, start = 24.dp, end = 52.dp), - ) - if (isChecked) { - Icon( - painter = painterResource(id = R.drawable.ic_align_checked), - contentDescription = "", - modifier = Modifier - .align(Alignment.CenterEnd) - .padding(end = 16.dp) - .size(24.dp), - tint = Primary, - ) - } - } -} - -@Preview(widthDp = 300, heightDp = 200) -@Composable -fun SuwikiAlignContainerPreview() { - var isChecked by remember { mutableStateOf(false) } - - SuwikiTheme { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - ) { - SuwikiSelectContainer( - text = "메뉴", - isChecked = isChecked, - onClick = { isChecked = !isChecked }, - ) - } - } -} diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/appbar/SuwikiEvaluationAppBar.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/appbar/SuwikiEvaluationAppBar.kt deleted file mode 100644 index 33c0a9fee..000000000 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/appbar/SuwikiEvaluationAppBar.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.suwiki.core.designsystem.component.appbar - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment.Companion.CenterVertically -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.component.filter.SuwikiFilterButton -import com.suwiki.core.designsystem.theme.GrayFB -import com.suwiki.core.designsystem.theme.SuwikiTheme - -@Composable -fun SuwikiEvaluationAppBar( - modifier: Modifier = Modifier, - title: String, - major: String, - onClickMajor: () -> Unit = {}, -) { - Row( - modifier = modifier - .fillMaxWidth() - .wrapContentHeight() - .background(GrayFB) - .padding(top = 28.dp, bottom = 3.dp, start = 24.dp, end = 24.dp), - ) { - Text( - text = title, - style = SuwikiTheme.typography.header1, - ) - SuwikiFilterButton( - text = major, - onClick = onClickMajor, - modifier = Modifier - .align(CenterVertically), - ) - } -} - -@Preview(showSystemUi = true) -@Composable -fun SuwikiEvaluationAppBarPreview() { - SuwikiTheme { - SuwikiEvaluationAppBar( - title = "강의평가", - major = "학과명", - onClickMajor = { /*TODO*/ }, - ) - } -} diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/badge/Badge.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/badge/SuwikiBadge.kt similarity index 100% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/badge/Badge.kt rename to core/designsystem/src/main/java/com/suwiki/core/designsystem/component/badge/SuwikiBadge.kt diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt index dab4d84f4..13f2fcd93 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt +++ b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt @@ -1,16 +1,28 @@ package com.suwiki.core.designsystem.component.bottomsheet +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.component.align.SuwikiSelectContainer +import com.suwiki.core.designsystem.R +import com.suwiki.core.designsystem.theme.Gray6A import com.suwiki.core.designsystem.theme.Gray95 +import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme +import com.suwiki.core.designsystem.theme.White +import com.suwiki.core.ui.extension.suwikiClickable import kotlinx.collections.immutable.PersistentList @OptIn(ExperimentalMaterial3Api::class) @@ -39,6 +51,46 @@ fun SuwikiSelectBottomSheet( } } +@Composable +private fun SuwikiSelectContainer( + modifier: Modifier = Modifier, + text: String, + isChecked: Boolean = false, + onClick: () -> Unit = {}, +) { + val textColor = if (isChecked) Primary else Gray6A + Box( + modifier = modifier + .background(White) + .fillMaxWidth() + .wrapContentHeight() + .suwikiClickable( + onClick = onClick, + rippleColor = Gray6A, + ), + ) { + Text( + text = text, + color = textColor, + style = SuwikiTheme.typography.body2, + modifier = Modifier + .align(Alignment.CenterStart) + .padding(top = 13.dp, bottom = 14.dp, start = 24.dp, end = 52.dp), + ) + if (isChecked) { + Icon( + painter = painterResource(id = R.drawable.ic_align_checked), + contentDescription = "", + modifier = Modifier + .align(Alignment.CenterEnd) + .padding(end = 16.dp) + .size(24.dp), + tint = Primary, + ) + } + } +} + @Composable fun SuwikiSelectBottomSheetContent( selectedPosition: Int?, diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiReviewGradeCard.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiReviewGradeCard.kt deleted file mode 100644 index 5014c232e..000000000 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiReviewGradeCard.kt +++ /dev/null @@ -1,157 +0,0 @@ -package com.suwiki.core.designsystem.component.card - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.LinearProgressIndicator -import androidx.compose.material3.Text -import androidx.compose.material3.VerticalDivider -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.StrokeCap -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R -import com.suwiki.core.designsystem.component.ratingbar.SuwikiRatingBar -import com.suwiki.core.designsystem.shadow.cardShadow -import com.suwiki.core.designsystem.theme.Black -import com.suwiki.core.designsystem.theme.GrayDA -import com.suwiki.core.designsystem.theme.GrayF6 -import com.suwiki.core.designsystem.theme.Primary -import com.suwiki.core.designsystem.theme.SuwikiTheme -import com.suwiki.core.designsystem.theme.White -import java.util.Locale - -@Composable -fun SuwikiReviewGradeCard( - modifier: Modifier = Modifier, - rating: Float, - honeyRating: Float, - learningRating: Float, - satisfactionRating: Float, -) { - val reviewCountColor = if (rating > 0) Primary else GrayDA - val reviewIndicatorColor = if (rating > 0) Black else GrayDA - Row( - modifier = modifier - .fillMaxWidth() - .cardShadow() - .clip(RoundedCornerShape(10.dp)) - .background(White) - .padding(16.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(20.dp), - ) { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - ) { - Text( - text = "%.1f".format(Locale.US, rating), - style = SuwikiTheme.typography.header1, - color = reviewCountColor, - ) - SuwikiRatingBar( - rating = rating, - ) - } - VerticalDivider( - color = GrayF6, - modifier = Modifier - .height(49.dp) - .width(1.dp), - ) - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - ) { - SuwikiProgressLine( - name = stringResource(id = R.string.honey_quality), - rating = honeyRating, - textColor = reviewIndicatorColor, - ) - SuwikiProgressLine( - name = stringResource(id = R.string.learning_quality), - rating = learningRating, - textColor = reviewIndicatorColor, - ) - SuwikiProgressLine( - name = stringResource(id = R.string.satisfaction_quality), - rating = satisfactionRating, - textColor = reviewIndicatorColor, - ) - } - } -} - -@Composable -fun SuwikiProgressLine( - name: String, - rating: Float, - textColor: Color, -) { - Row( - modifier = Modifier - .fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - text = name, - style = SuwikiTheme.typography.caption5, - color = textColor, - ) - LinearProgressIndicator( - modifier = Modifier - .weight(1f) - .height(6.dp) - .padding(horizontal = 10.dp) - .clip(RoundedCornerShape(4.dp)), - progress = rating / 5.0f, - color = Primary, - strokeCap = StrokeCap.Round, - ) - Text( - text = "%.1f".format(Locale.US, rating), - style = SuwikiTheme.typography.caption1, - color = textColor, - ) - } -} - -@Preview -@Composable -fun SuwikiReviewGradeCardPreview() { - SuwikiTheme { - Column( - modifier = Modifier.background(Primary), - ) { - SuwikiReviewGradeCard( - modifier = Modifier, - rating = 4.3f, - honeyRating = 3.4f, - learningRating = 3.4f, - satisfactionRating = 4.4f, - ) - Spacer(modifier = Modifier.height(20.dp)) - SuwikiReviewGradeCard( - modifier = Modifier, - rating = 0.0f, - honeyRating = 0.0f, - learningRating = 0.0f, - satisfactionRating = 0.0f, - ) - } - } -} diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiNoticeContainer.kt b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiBoardContainer.kt similarity index 96% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiNoticeContainer.kt rename to core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiBoardContainer.kt index 6736fa48c..e3b05de87 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiNoticeContainer.kt +++ b/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiBoardContainer.kt @@ -18,7 +18,7 @@ import com.suwiki.core.designsystem.theme.White import com.suwiki.core.ui.extension.suwikiClickable @Composable -fun SuwikiNoticeContainer( +fun SuwikiBoardContainer( modifier: Modifier = Modifier, titleText: String, dateText: String, @@ -50,7 +50,7 @@ fun SuwikiNoticeContainer( fun SuwikiNoticeContainerPreview() { SuwikiTheme { Column { - SuwikiNoticeContainer( + SuwikiBoardContainer( titleText = "Title", dateText = "date", onClick = {}, diff --git a/core/designsystem/src/main/res/drawable/ic_appbar_add.xml b/core/designsystem/src/main/res/drawable/ic_appbar_add.xml deleted file mode 100644 index f0b248f4f..000000000 --- a/core/designsystem/src/main/res/drawable/ic_appbar_add.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/ic_appbar_list.xml b/core/designsystem/src/main/res/drawable/ic_appbar_list.xml deleted file mode 100644 index 9230bdfa0..000000000 --- a/core/designsystem/src/main/res/drawable/ic_appbar_list.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/ic_appbar_setting.xml b/core/designsystem/src/main/res/drawable/ic_appbar_setting.xml deleted file mode 100644 index 7cd4378f8..000000000 --- a/core/designsystem/src/main/res/drawable/ic_appbar_setting.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/drawable/ic_star.xml b/core/designsystem/src/main/res/drawable/ic_star.xml deleted file mode 100644 index 23e2c012e..000000000 --- a/core/designsystem/src/main/res/drawable/ic_star.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml index 06e6d6b88..8d443a6ae 100644 --- a/core/designsystem/src/main/res/values/strings.xml +++ b/core/designsystem/src/main/res/values/strings.xml @@ -1,19 +1,5 @@ - 꿀강지수 - 배움지수 - 만족지수 - %d개의 리뷰 - MY - 학기 - 수정 - 신고 - 시험유형 - 난이도 - 추가 - 학점 - 과제 - 팀플 서비스 이용을 위해\n약관에 동의해주세요. (필수) SUWIKI 이용약관 (필수) 개인정보처리방침 diff --git a/core/designsystem/src/main/res/drawable/ic_align_checked.xml b/core/ui/src/main/res/drawable/ic_align_checked.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/ic_align_checked.xml rename to core/ui/src/main/res/drawable/ic_align_checked.xml diff --git a/core/designsystem/src/main/res/drawable/ic_arrow_gray_right.xml b/core/ui/src/main/res/drawable/ic_arrow_gray_right.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/ic_arrow_gray_right.xml rename to core/ui/src/main/res/drawable/ic_arrow_gray_right.xml diff --git a/core/ui/src/main/res/drawable/ic_star_empty.xml b/core/ui/src/main/res/drawable/ic_star_empty.xml new file mode 100644 index 000000000..0d1dfbe96 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_star_empty.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_star_filled.xml b/core/ui/src/main/res/drawable/ic_star_filled.xml new file mode 100644 index 000000000..1e1b1763e --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_star_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index 2e6644ef0..470f428ea 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -5,16 +5,6 @@ 만족도 높은 강의 배울게 많은 강의 BEST 강의 - 이메일 - 비밀번호 확인 - 비밀번호 - 아이디 - 아이디 찾기 - 비밀번호 찾기 - 확인 - 회원가입 - 로그인 - 6~20자 영문/숫자 @@ -30,6 +20,25 @@ 웹메일이 휴면 상태인지 확인해주세요\n웹메일 계정은 포털 계정과 다릅니다\n \@suwon.ac.kr 형식이 아닙니다 \@suwon.ac.kr + + 이메일 + 비밀번호 확인 + 비밀번호 + 아이디 + 아이디 찾기 + 비밀번호 찾기 + 확인 + 회원가입 + 로그인 + 강의평가 + 시험정보 + 꿀강지수 + 배움지수 + 만족도 + 학점 + 과제 + 조모임 + 너그러움 보통 까다로움 @@ -59,7 +68,6 @@ 학년 %d학년 전체 - 월 화 수 @@ -72,7 +80,31 @@ 적용 추가 삭제 - 삭제하기 + 삭제하기 수정하기 취소 + 배움지수 + 만족지수 + %d개의 리뷰 + MY + 학기 + 수정 + 신고 + 시험유형 + 수강학기 선택 + 시험종류 선택 + 난이도 + 시험유형 + 내 글 관리 + 과목명 + 정렬 + 강의명 혹은 교수명을 검색하세요 + + 최근 올라온 강의 + 꿀 강의 + 만족도 높은 강의 + 배울 게 많은 강의 + BEST 강의 + + 검색 결과가 없습니다.\n검색어가 정확한지 확인하세요. diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/ExamEvalutionEditorScreen.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/ExamEvalutionEditorScreen.kt index e51d32eca..697d490a7 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/ExamEvalutionEditorScreen.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/ExamEvalutionEditorScreen.kt @@ -195,7 +195,7 @@ fun ExamEvaluationEditorScreen( .fillMaxWidth() .height(50.dp) .imePadding(), - text = stringResource(R.string.text_complete), + text = stringResource(com.suwiki.core.ui.R.string.word_complete), enabled = uiState.buttonEnabled, clickable = uiState.buttonEnabled, onClick = onClickExamEvaluationReviseButton, diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/LectureEvaluationEditorScreen.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/LectureEvaluationEditorScreen.kt index 4ac81a36a..a4650bf4a 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/LectureEvaluationEditorScreen.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/LectureEvaluationEditorScreen.kt @@ -36,7 +36,6 @@ import com.suwiki.core.designsystem.component.chips.SuwikiContainedChip import com.suwiki.core.designsystem.component.container.SuwikiSelectionContainer import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.component.ratingbar.SuwikiRatingBar -import com.suwiki.core.designsystem.component.slider.SuwikiSlider import com.suwiki.core.designsystem.component.textfield.SuwikiReviewInputBox import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme @@ -46,6 +45,7 @@ import com.suwiki.core.model.enums.HomeworkLevel import com.suwiki.core.model.enums.TeamLevel import com.suwiki.core.ui.extension.toText import com.suwiki.feature.lectureevaluation.editor.R +import com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider.SuwikiSlider import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import java.util.Locale @@ -277,7 +277,7 @@ fun LectureEvaluationEditorScreen( .fillMaxWidth() .height(50.dp) .imePadding(), - text = stringResource(R.string.text_complete), + text = stringResource(com.suwiki.core.ui.R.string.word_complete), enabled = uiState.buttonEnabled, clickable = uiState.buttonEnabled, onClick = onClickLectureEvaluationReviseButton, diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSlider.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSlider.kt similarity index 94% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSlider.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSlider.kt index a88de1624..b06859be2 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSlider.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSlider.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider import androidx.annotation.IntRange import androidx.compose.foundation.interaction.MutableInteractionSource @@ -24,9 +24,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.component.slider.material.Slider import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme +import com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider.material.Slider import kotlin.math.round @OptIn(ExperimentalMaterial3Api::class) diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumb.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumb.kt similarity index 92% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumb.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumb.kt index a96a4acc1..127cf25de 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumb.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumb.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumbWithLabel.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumbWithLabel.kt similarity index 93% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumbWithLabel.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumbWithLabel.kt index 83a396548..9a28ac71d 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderThumbWithLabel.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderThumbWithLabel.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderTrack.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderTrack.kt similarity index 95% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderTrack.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderTrack.kt index 3c8daaa50..c2106e96f 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/SuwikiSliderTrack.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/SuwikiSliderTrack.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/Slider.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/Slider.kt similarity index 98% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/Slider.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/Slider.kt index 68f7e7fbe..9b6f3b917 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/Slider.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/Slider.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider.material +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider.material import androidx.annotation.IntRange import androidx.compose.foundation.focusable diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/SliderState.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/SliderState.kt similarity index 98% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/SliderState.kt rename to feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/SliderState.kt index f909cafd7..9eabb5544 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/slider/material/SliderState.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/component/slider/material/SliderState.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.slider.material +package com.suwiki.feature.lectureevaluation.editor.lectureevaluation.component.slider.material import androidx.compose.foundation.MutatePriority import androidx.compose.foundation.MutatorMutex diff --git a/feature/lectureevaluation/editor/src/main/res/values/strings.xml b/feature/lectureevaluation/editor/src/main/res/values/strings.xml index 01c0c2098..89a4b9d89 100644 --- a/feature/lectureevaluation/editor/src/main/res/values/strings.xml +++ b/feature/lectureevaluation/editor/src/main/res/values/strings.xml @@ -1,24 +1,8 @@ - 강의평가 - 시험정보 - 꿀강지수 - 배움지수 - 만족도 - 학점 - 과제 - 조모임 강의평가를 입력해주세요. - 삭제하기 - 완료 - 삭제 - 취소 강의평가가 수정되었습니다. 강의평가가 삭제되었습니다. - 수강학기 선택 - 시험종류 선택 - 난이도 - 시험유형 시험정보를 입력해주세요. 시험정보가 수정되었습니다. 시험정보가 삭제되었습니다. diff --git a/feature/lectureevaluation/my/src/main/res/values/strings.xml b/feature/lectureevaluation/my/src/main/res/values/strings.xml index 608311bdf..058e088c2 100644 --- a/feature/lectureevaluation/my/src/main/res/values/strings.xml +++ b/feature/lectureevaluation/my/src/main/res/values/strings.xml @@ -1,12 +1,7 @@ - 내 글 관리 - 학기 - 과목명 - 강의평가 - 시험정보 30포인트가 차감됩니다. - 강의평가를 정말로 삭제하시겠습니까?\n현재 보유 포인트 : %dp + 작성한 평가를 정말로 삭제하시겠습니까?\n현재 보유 포인트 : %dp 포인트가 부족합니다. 현재 보유 포인트 : %dp 등록된 평가가 없어요 diff --git a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/LectureEvaluationScreen.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/LectureEvaluationScreen.kt index 5903f5c03..f25d615a9 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/LectureEvaluationScreen.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/LectureEvaluationScreen.kt @@ -24,12 +24,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.suwiki.core.designsystem.component.appbar.SuwikiEvaluationAppBar import com.suwiki.core.designsystem.component.bottomsheet.SuwikiAgreementBottomSheet import com.suwiki.core.designsystem.component.bottomsheet.SuwikiSelectBottomSheet -import com.suwiki.core.designsystem.component.card.SuwikiClassReviewCard import com.suwiki.core.designsystem.component.loading.LoadingScreen -import com.suwiki.core.designsystem.component.searchbar.SuwikiSearchBarWithFilter import com.suwiki.core.designsystem.theme.Gray95 import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationAverage @@ -38,6 +35,9 @@ import com.suwiki.core.ui.extension.lectureAlignList import com.suwiki.core.ui.extension.toText import com.suwiki.core.ui.util.PRIVACY_POLICY_SITE import com.suwiki.core.ui.util.TERMS_SITE +import com.suwiki.feature.lectureevaluation.viewerreporter.component.EvaluationAppBar +import com.suwiki.feature.lectureevaluation.viewerreporter.component.EvaluationCard +import com.suwiki.feature.lectureevaluation.viewerreporter.component.EvaluationSearchBar import com.suwiki.feature.lectureevaluation.viewerreporter.component.ONBOARDING_PAGE_COUNT import com.suwiki.feature.lectureevaluation.viewerreporter.component.OnboardingBottomSheet import kotlinx.collections.immutable.PersistentList @@ -171,12 +171,12 @@ fun LectureEvaluationScreen( scrollStrategy = ScrollStrategy.EnterAlways, toolbar = { Column { - SuwikiEvaluationAppBar( + EvaluationAppBar( title = stringResource(R.string.word_lecture_evaluation), major = uiState.selectedOpenMajor, onClickMajor = { onClickSelectedOpenMajor(uiState.selectedOpenMajor) }, ) - SuwikiSearchBarWithFilter( + EvaluationSearchBar( placeHolder = stringResource(R.string.word_search_placeholder), value = uiState.searchValue, onValueChange = onValueChangeSearchBar, @@ -259,7 +259,7 @@ private fun LectureEvaluationLazyColumn( key = { it!!.id }, ) { lectureEvaluation -> with(lectureEvaluation) { - SuwikiClassReviewCard( + EvaluationCard( className = this!!.lectureInfo.lectureName, openMajor = lectureInfo.majorType, professor = lectureInfo.professor, diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/filter/SuwikiFilterButton.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationAppBar.kt similarity index 55% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/filter/SuwikiFilterButton.kt rename to feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationAppBar.kt index 861b955d9..4589e8730 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/filter/SuwikiFilterButton.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationAppBar.kt @@ -1,8 +1,8 @@ -package com.suwiki.core.designsystem.component.filter +package com.suwiki.feature.lectureevaluation.viewerreporter.component -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight @@ -10,17 +10,46 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.Alignment.Companion.CenterVertically import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R +import com.suwiki.core.designsystem.theme.GrayFB import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.ui.extension.suwikiClickable +import com.suwiki.feature.lectureevaluation.viewerreporter.R @Composable -fun SuwikiFilterButton( +fun EvaluationAppBar( + modifier: Modifier = Modifier, + title: String, + major: String, + onClickMajor: () -> Unit = {}, +) { + Row( + modifier = modifier + .fillMaxWidth() + .wrapContentHeight() + .background(GrayFB) + .padding(top = 28.dp, bottom = 3.dp, start = 24.dp, end = 24.dp), + ) { + Text( + text = title, + style = SuwikiTheme.typography.header1, + ) + FilterButton( + text = major, + onClick = onClickMajor, + modifier = Modifier + .align(CenterVertically), + ) + } +} + +@Composable +fun FilterButton( modifier: Modifier = Modifier, text: String, onClick: () -> Unit = {}, @@ -48,15 +77,14 @@ fun SuwikiFilterButton( } } -@Preview(widthDp = 400, heightDp = 50) +@Preview(showSystemUi = true) @Composable -fun SuwikiFilterButtonPreview() { +fun EvaluationAppBarPreview() { SuwikiTheme { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally, - ) { - SuwikiFilterButton(text = "학과필터") - } + EvaluationAppBar( + title = "강의평가", + major = "학과명", + onClickMajor = { /*TODO*/ }, + ) } } diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassReviewCard.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationCard.kt similarity index 95% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassReviewCard.kt rename to feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationCard.kt index b35ba8de5..f1cca2743 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassReviewCard.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationCard.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.card +package com.suwiki.feature.lectureevaluation.viewerreporter.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -28,7 +28,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.component.badge.BadgeColor import com.suwiki.core.designsystem.component.badge.SuwikiBadge import com.suwiki.core.designsystem.shadow.cardShadow @@ -42,7 +41,7 @@ import com.suwiki.core.ui.extension.suwikiClickable import java.util.Locale @Composable -fun SuwikiClassReviewCard( +fun EvaluationCard( modifier: Modifier = Modifier, className: String, openMajor: String, @@ -105,7 +104,7 @@ fun SuwikiClassReviewCard( modifier = Modifier.wrapContentWidth(), ) { Image( - painter = painterResource(id = R.drawable.ic_star), + painter = painterResource(id = com.suwiki.core.ui.R.drawable.ic_star_filled), contentDescription = null, ) Text( @@ -128,7 +127,7 @@ fun SuwikiClassReviewCard( fun CardPreview() { SuwikiTheme { Box(modifier = Modifier.padding(10.dp)) { - SuwikiClassReviewCard( + EvaluationCard( modifier = Modifier, className = "강의명강의명강의명강의명강의명강의명", openMajor = "개설학과", diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/searchbar/SuwikiSearchBarWithFilter.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationSearchBar.kt similarity index 81% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/searchbar/SuwikiSearchBarWithFilter.kt rename to feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationSearchBar.kt index 5b86c14f8..e296e5864 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/searchbar/SuwikiSearchBarWithFilter.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/component/EvaluationSearchBar.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.searchbar +package com.suwiki.feature.lectureevaluation.viewerreporter.component import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -19,23 +20,28 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.SoftwareKeyboardController +import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.component.align.SuwikiAlignButton +import com.suwiki.core.designsystem.component.searchbar.BasicSearchBar import com.suwiki.core.designsystem.shadow.cardShadow +import com.suwiki.core.designsystem.theme.Gray6A import com.suwiki.core.designsystem.theme.GrayCB import com.suwiki.core.designsystem.theme.GrayFB import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White +import com.suwiki.core.ui.extension.suwikiClickable +import com.suwiki.feature.lectureevaluation.viewerreporter.R @Composable -fun SuwikiSearchBarWithFilter( +fun EvaluationSearchBar( modifier: Modifier = Modifier, placeHolder: String = "", value: String = "", @@ -91,6 +97,24 @@ fun SuwikiSearchBarWithFilter( } } +@Composable +fun SuwikiAlignButton( + modifier: Modifier = Modifier, + onClick: () -> Unit = {}, +) { + Icon( + painter = painterResource(id = R.drawable.ic_filter), + contentDescription = "", + modifier = modifier + .cardShadow() + .clip(RoundedCornerShape(10.dp)) + .suwikiClickable(onClick = onClick) + .background(White) + .padding(8.dp), + tint = Gray6A, + ) +} + @Preview(showBackground = true, backgroundColor = 0xFFFFFF) @Composable fun SuwikiSearchBarWithFilterPreview() { @@ -102,7 +126,7 @@ fun SuwikiSearchBarWithFilterPreview() { Column( verticalArrangement = Arrangement.spacedBy(10.dp), ) { - SuwikiSearchBarWithFilter( + EvaluationSearchBar( placeHolder = "Hinted search text", value = normalValue, onValueChange = { normalValue = it }, diff --git a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailScreen.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailScreen.kt index 184b1311f..9acbd83a6 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailScreen.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailScreen.kt @@ -38,8 +38,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.suwiki.core.designsystem.component.appbar.SuwikiAppBarWithTitle import com.suwiki.core.designsystem.component.button.SuwikiOutlinedButton -import com.suwiki.core.designsystem.component.container.SuwikiExamReviewContainer -import com.suwiki.core.designsystem.component.container.SuwikiUserReviewContainer import com.suwiki.core.designsystem.component.dialog.SuwikiDialog import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.component.tabbar.SuwikiTabBar @@ -53,6 +51,8 @@ import com.suwiki.core.ui.extension.OnBottomReached import com.suwiki.core.ui.extension.collectWithLifecycle import com.suwiki.core.ui.extension.suwikiClickable import com.suwiki.feature.lectureevaluation.viewerreporter.R +import com.suwiki.feature.lectureevaluation.viewerreporter.detail.component.ExamEvaluationContainer +import com.suwiki.feature.lectureevaluation.viewerreporter.detail.component.LectureEvaluationContainer import com.suwiki.feature.lectureevaluation.viewerreporter.detail.component.SuwikiReviewStatisticsContainer import me.onebone.toolbar.CollapsingToolbarScaffold import me.onebone.toolbar.ExperimentalToolbarApi @@ -219,7 +219,7 @@ fun LectureEvaluationDetailScreen( items = uiState.lectureEvaluationList, key = { it.id }, ) { - SuwikiUserReviewContainer( + LectureEvaluationContainer( semester = it.selectedSemester, content = it.content, rating = it.totalAvg, @@ -266,7 +266,7 @@ fun LectureEvaluationDetailScreen( it.id }, ) { - SuwikiExamReviewContainer( + ExamEvaluationContainer( difficulty = it.examDifficulty, examType = it.examType, content = it.content, diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiExamReviewContainer.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/ExamEvaluationContainer.kt similarity index 85% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiExamReviewContainer.kt rename to feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/ExamEvaluationContainer.kt index 75dfdff18..c672e5f32 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiExamReviewContainer.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/ExamEvaluationContainer.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.container +package com.suwiki.feature.lectureevaluation.viewerreporter.detail.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -15,7 +15,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.component.badge.BadgeColor import com.suwiki.core.designsystem.component.badge.SuwikiBadge import com.suwiki.core.designsystem.component.button.SuwikiContainedSmallButton @@ -25,7 +24,7 @@ import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White @Composable -fun SuwikiExamReviewContainer( +fun ExamEvaluationContainer( modifier: Modifier = Modifier, difficulty: String, examType: String, @@ -35,7 +34,13 @@ fun SuwikiExamReviewContainer( isAuthor: Boolean = false, onClickButton: () -> Unit, ) { - val buttonText = if (isAuthor) stringResource(id = R.string.word_edit) else stringResource(id = R.string.word_report) + val buttonText = if (isAuthor) { + stringResource(id = com.suwiki.core.ui.R.string.word_edit) + } else { + stringResource( + id = com.suwiki.core.ui.R.string.word_report, + ) + } Column( modifier = Modifier @@ -49,7 +54,7 @@ fun SuwikiExamReviewContainer( if (isAuthor) { SuwikiBadge( color = BadgeColor.Blue, - text = stringResource(id = R.string.word_my), + text = stringResource(id = com.suwiki.core.ui.R.string.word_my), ) Spacer(modifier = Modifier.width(8.dp)) } @@ -71,7 +76,7 @@ fun SuwikiExamReviewContainer( horizontalArrangement = Arrangement.spacedBy(6.dp), ) { Text( - text = stringResource(id = R.string.word_difficulcy), + text = stringResource(id = com.suwiki.core.ui.R.string.word_difficulty), style = SuwikiTheme.typography.caption2, color = Gray95, ) @@ -87,7 +92,7 @@ fun SuwikiExamReviewContainer( horizontalArrangement = Arrangement.spacedBy(6.dp), ) { Text( - text = stringResource(id = R.string.word_type_exam), + text = stringResource(id = com.suwiki.core.ui.R.string.word_type_exam), style = SuwikiTheme.typography.caption2, color = Gray95, ) @@ -108,10 +113,10 @@ fun SuwikiExamReviewContainer( @Preview @Composable -fun SuwikiExamReviewContainerPreview() { +fun ExamEvaluationContainerPreview() { SuwikiTheme { Column { - SuwikiExamReviewContainer( + ExamEvaluationContainer( isAuthor = false, difficulty = "어려움", examInfo = "응용,실습,과제,PPT", @@ -120,7 +125,7 @@ fun SuwikiExamReviewContainerPreview() { examType = "중간고사", semester = "2023-1", ) - SuwikiExamReviewContainer( + ExamEvaluationContainer( isAuthor = true, difficulty = "어려움", examType = "중간고사", diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiUserReviewContainer.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/LectureEvaluationContainer.kt similarity index 92% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiUserReviewContainer.kt rename to feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/LectureEvaluationContainer.kt index 55376d1b0..cb18126c3 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/container/SuwikiUserReviewContainer.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/LectureEvaluationContainer.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.container +package com.suwiki.feature.lectureevaluation.viewerreporter.detail.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.component.badge.BadgeColor import com.suwiki.core.designsystem.component.badge.SuwikiBadge import com.suwiki.core.designsystem.component.button.SuwikiContainedSmallButton @@ -21,9 +20,10 @@ import com.suwiki.core.designsystem.component.ratingbar.SuwikiRatingBar import com.suwiki.core.designsystem.theme.Black import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White +import com.suwiki.core.ui.R @Composable -fun SuwikiUserReviewContainer( +fun LectureEvaluationContainer( modifier: Modifier = Modifier, content: String, semester: String, @@ -70,13 +70,13 @@ fun SuwikiUserReviewContainer( fun ReviewContainerPreview() { SuwikiTheme { Column { - SuwikiUserReviewContainer( + LectureEvaluationContainer( isAuthor = false, semester = "2023-1", rating = 3.0f, content = "거의 한 학기 팀플하시는데... 팀원 잘 만나면 잘 모르겠네요. 굉장히 오픈 마인드시긴해요.", ) - SuwikiUserReviewContainer( + LectureEvaluationContainer( rating = 3.0f, semester = "2023-1", isAuthor = true, diff --git a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/StatisticsContainer.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/StatisticsContainer.kt index 19b65a04a..07dd2359c 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/StatisticsContainer.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/component/StatisticsContainer.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.Text import androidx.compose.material3.VerticalDivider import androidx.compose.runtime.Composable @@ -22,30 +23,36 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.component.badge.BadgeColor import com.suwiki.core.designsystem.component.badge.SuwikiBadge -import com.suwiki.core.designsystem.component.card.SuwikiReviewGradeCard +import com.suwiki.core.designsystem.component.ratingbar.SuwikiRatingBar +import com.suwiki.core.designsystem.shadow.cardShadow import com.suwiki.core.designsystem.theme.Black import com.suwiki.core.designsystem.theme.Blue10 import com.suwiki.core.designsystem.theme.Blue100 import com.suwiki.core.designsystem.theme.Gray6A import com.suwiki.core.designsystem.theme.GrayDA +import com.suwiki.core.designsystem.theme.GrayF6 import com.suwiki.core.designsystem.theme.GrayFB import com.suwiki.core.designsystem.theme.Green10 import com.suwiki.core.designsystem.theme.Green100 import com.suwiki.core.designsystem.theme.Orange10 import com.suwiki.core.designsystem.theme.Orange100 +import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme +import com.suwiki.core.designsystem.theme.White import com.suwiki.core.model.enums.GradeLevel import com.suwiki.core.model.enums.HomeworkLevel import com.suwiki.core.model.enums.TeamLevel import com.suwiki.core.model.lectureevaluation.lecture.LectureEvaluationExtraAverage import com.suwiki.core.model.lectureevaluation.lecture.LectureInfo +import com.suwiki.core.ui.R import com.suwiki.core.ui.extension.toText +import java.util.Locale @Composable fun SuwikiReviewStatisticsContainer( @@ -116,7 +123,7 @@ fun SuwikiReviewStatisticsContainer( } } Spacer(modifier = Modifier.height(23.dp)) - SuwikiReviewGradeCard( + ReviewGradeCard( rating = data.totalAvg, honeyRating = data.honeyAvg, learningRating = data.learningAvg, @@ -125,6 +132,103 @@ fun SuwikiReviewStatisticsContainer( } } +@Composable +fun ReviewGradeCard( + modifier: Modifier = Modifier, + rating: Float, + honeyRating: Float, + learningRating: Float, + satisfactionRating: Float, +) { + val reviewCountColor = if (rating > 0) Primary else GrayDA + val reviewIndicatorColor = if (rating > 0) Black else GrayDA + Row( + modifier = modifier + .fillMaxWidth() + .cardShadow() + .clip(RoundedCornerShape(10.dp)) + .background(White) + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(20.dp), + ) { + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = "%.1f".format(Locale.US, rating), + style = SuwikiTheme.typography.header1, + color = reviewCountColor, + ) + SuwikiRatingBar( + rating = rating, + ) + } + VerticalDivider( + color = GrayF6, + modifier = Modifier + .height(49.dp) + .width(1.dp), + ) + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + ReviewProgressLine( + name = stringResource(id = com.suwiki.core.ui.R.string.word_honey_rating), + rating = honeyRating, + textColor = reviewIndicatorColor, + ) + ReviewProgressLine( + name = stringResource(id = R.string.learning_quality), + rating = learningRating, + textColor = reviewIndicatorColor, + ) + ReviewProgressLine( + name = stringResource(id = R.string.satisfaction_quality), + rating = satisfactionRating, + textColor = reviewIndicatorColor, + ) + } + } +} + +@Composable +fun ReviewProgressLine( + name: String, + rating: Float, + textColor: Color, +) { + Row( + modifier = Modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = name, + style = SuwikiTheme.typography.caption5, + color = textColor, + ) + LinearProgressIndicator( + progress = { rating / 5.0f }, + modifier = Modifier + .weight(1f) + .height(6.dp) + .padding(horizontal = 10.dp) + .clip(RoundedCornerShape(4.dp)), + color = Primary, + strokeCap = StrokeCap.Round, + ) + Text( + text = "%.1f".format(Locale.US, rating), + style = SuwikiTheme.typography.caption1, + color = textColor, + ) + } +} + enum class LabelColor( val backgroundColor: Color, val contentColor: Color, diff --git a/core/designsystem/src/main/res/drawable/ic_filter.xml b/feature/lectureevaluation/viewerreporter/src/main/res/drawable/ic_filter.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/ic_filter.xml rename to feature/lectureevaluation/viewerreporter/src/main/res/drawable/ic_filter.xml diff --git a/core/designsystem/src/main/res/drawable/ic_filter_arrow_down.xml b/feature/lectureevaluation/viewerreporter/src/main/res/drawable/ic_filter_arrow_down.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/ic_filter_arrow_down.xml rename to feature/lectureevaluation/viewerreporter/src/main/res/drawable/ic_filter_arrow_down.xml diff --git a/feature/lectureevaluation/viewerreporter/src/main/res/values/strings.xml b/feature/lectureevaluation/viewerreporter/src/main/res/values/strings.xml index 91bdac771..6c9fb996f 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/res/values/strings.xml +++ b/feature/lectureevaluation/viewerreporter/src/main/res/values/strings.xml @@ -1,26 +1,14 @@ 로고 - 로그인 가입하기 수원대 학생이라면\n수위키로 한 번에 해결! 재학생들의 솔직한 강의평가 확인하기 나만의 시간표로 손쉬운 일정관리 - 정렬 - 강의평가> - 강의명 혹은 교수명을 검색하세요 - - 최근 올라온 강의 - 꿀 강의 - 만족도 높은 강의 - 배울 게 많은 강의 - BEST 강의 - - 검색 결과가 없습니다.\n검색어가 정확한지 확인하세요. - 등록된 평가가 없어요 + 등록된 평가가 없어요 시험 정보 열람 -20p 작성하기 - 이미 작성한 이력이 있어요 + 이미 작성한 이력이 있어요 diff --git a/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/banhistory/BanHistoryScreen.kt b/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/banhistory/BanHistoryScreen.kt index 2ccab408f..f6d3e9934 100644 --- a/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/banhistory/BanHistoryScreen.kt +++ b/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/banhistory/BanHistoryScreen.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.suwiki.core.designsystem.component.appbar.SuwikiAppBarWithTitle -import com.suwiki.core.designsystem.component.container.SuwikiNoticeContainer +import com.suwiki.core.designsystem.component.container.SuwikiBoardContainer import com.suwiki.core.designsystem.theme.Gray95 import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White @@ -79,13 +79,13 @@ fun BanHistoryScreen( LazyColumn { items(items = uiState.banHistory) { banHistory -> - SuwikiNoticeContainer( + SuwikiBoardContainer( titleText = banHistory.reason, dateText = banHistory.createdAt.toString(), ) } items(items = uiState.blackList) { blackList -> - SuwikiNoticeContainer( + SuwikiBoardContainer( titleText = blackList.reason, dateText = blackList.createdAt.toString(), ) diff --git a/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountScreen.kt b/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountScreen.kt index 6b558e2f8..06351d589 100644 --- a/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountScreen.kt +++ b/feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountScreen.kt @@ -90,7 +90,7 @@ fun MyAccountScreen( userInfoValue = uiState.userId, ) UserInfoRowContainer( - userInfo = stringResource(R.string.word__authentication_email), + userInfo = stringResource(R.string.word_authentication_email), userInfoValue = uiState.userEmail, ) Spacer(modifier = Modifier.height(24.dp)) diff --git a/feature/myinfo/src/main/res/values/strings.xml b/feature/myinfo/src/main/res/values/strings.xml index f73898939..824088dce 100644 --- a/feature/myinfo/src/main/res/values/strings.xml +++ b/feature/myinfo/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ 내 글 관리 내 계정 로그인 아이디 - 학교 인증 메일 + 학교 인증 메일 비밀번호 변경 로그아웃 회원 탈퇴 @@ -28,7 +28,6 @@ 변경하기 비밀번호가 변경되었습니다. 새로운 비밀번호로 로그인 하시겠습니까? - 취소 아이디를 입력하세요 비밀번호를 입력하세요 회원 탈퇴 되었어요 diff --git a/feature/navigator/src/main/java/com/suwiki/feature/navigator/MainScreen.kt b/feature/navigator/src/main/java/com/suwiki/feature/navigator/MainScreen.kt index 1495abe69..b3b36d725 100644 --- a/feature/navigator/src/main/java/com/suwiki/feature/navigator/MainScreen.kt +++ b/feature/navigator/src/main/java/com/suwiki/feature/navigator/MainScreen.kt @@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.compose.NavHost import com.suwiki.core.designsystem.component.dialog.SuwikiDialog -import com.suwiki.core.designsystem.component.toast.SuwikiToast import com.suwiki.core.designsystem.shadow.bottomNavigationShadow import com.suwiki.core.designsystem.theme.GrayDA import com.suwiki.core.designsystem.theme.Primary @@ -43,6 +42,7 @@ import com.suwiki.feature.lectureevaluation.my.navigation.myEvaluationNavGraph import com.suwiki.feature.lectureevaluation.viewerreporter.navigation.lectureEvaluationNavGraph import com.suwiki.feature.login.navigation.loginNavGraph import com.suwiki.feature.myinfo.navigation.myInfoNavGraph +import com.suwiki.feature.navigator.component.SuwikiToast import com.suwiki.feature.notice.navigation.noticeNavGraph import com.suwiki.feature.openmajor.navigation.OpenMajorRoute import com.suwiki.feature.openmajor.navigation.openMajorNavGraph diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/toast/SuwikiToast.kt b/feature/navigator/src/main/java/com/suwiki/feature/navigator/component/SuwikiToast.kt similarity index 97% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/toast/SuwikiToast.kt rename to feature/navigator/src/main/java/com/suwiki/feature/navigator/component/SuwikiToast.kt index dd6d74cec..54f4aae96 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/toast/SuwikiToast.kt +++ b/feature/navigator/src/main/java/com/suwiki/feature/navigator/component/SuwikiToast.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.toast +package com.suwiki.feature.navigator.component import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn diff --git a/feature/notice/src/main/java/com/suwiki/feature/notice/NoticeScreen.kt b/feature/notice/src/main/java/com/suwiki/feature/notice/NoticeScreen.kt index 045678e2c..1e26dfbd0 100644 --- a/feature/notice/src/main/java/com/suwiki/feature/notice/NoticeScreen.kt +++ b/feature/notice/src/main/java/com/suwiki/feature/notice/NoticeScreen.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.suwiki.core.designsystem.component.appbar.SuwikiAppBarWithTitle -import com.suwiki.core.designsystem.component.container.SuwikiNoticeContainer +import com.suwiki.core.designsystem.component.container.SuwikiBoardContainer import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White @@ -80,7 +80,7 @@ fun NoticeScreen( ) LazyColumn { items(items = noticeList, key = { it.id }) { notice -> - SuwikiNoticeContainer( + SuwikiBoardContainer( titleText = notice.title, dateText = notice.date.toString(), onClick = { navigateNoticeDetail(notice.id) }, diff --git a/feature/openmajor/src/main/java/com/suwiki/feature/openmajor/component/OpenMajorContainer.kt b/feature/openmajor/src/main/java/com/suwiki/feature/openmajor/component/OpenMajorContainer.kt index 9324c180d..3e684e16f 100644 --- a/feature/openmajor/src/main/java/com/suwiki/feature/openmajor/component/OpenMajorContainer.kt +++ b/feature/openmajor/src/main/java/com/suwiki/feature/openmajor/component/OpenMajorContainer.kt @@ -20,7 +20,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.theme.Black import com.suwiki.core.designsystem.theme.Blue5 import com.suwiki.core.designsystem.theme.GrayDA @@ -28,6 +27,7 @@ import com.suwiki.core.designsystem.theme.Primary import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White import com.suwiki.core.ui.extension.suwikiClickable +import com.suwiki.feature.openmajor.R @Composable fun OpenMajorContainer( diff --git a/core/designsystem/src/main/res/drawable/ic_filter_stared.xml b/feature/openmajor/src/main/res/drawable/ic_filter_stared.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/ic_filter_stared.xml rename to feature/openmajor/src/main/res/drawable/ic_filter_stared.xml diff --git a/feature/openmajor/src/main/res/values/strings.xml b/feature/openmajor/src/main/res/values/strings.xml index dd85b0492..a2d5d0d26 100644 --- a/feature/openmajor/src/main/res/values/strings.xml +++ b/feature/openmajor/src/main/res/values/strings.xml @@ -1,7 +1,5 @@ - 확인 - 전체 즐겨찾기 즐겨찾기는 로그인 이후에 사용할 수 있어요. 개설학과를 검색하세요 diff --git a/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/OpenLectureScreen.kt b/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/OpenLectureScreen.kt index d7a172fcd..5f8c97e28 100644 --- a/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/OpenLectureScreen.kt +++ b/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/OpenLectureScreen.kt @@ -45,7 +45,6 @@ import com.suwiki.core.designsystem.component.appbar.SuwikiAppBarWithTextButton import com.suwiki.core.designsystem.component.bottomsheet.SuwikiBottomSheet import com.suwiki.core.designsystem.component.bottomsheet.SuwikiSelectBottomSheet import com.suwiki.core.designsystem.component.button.SuwikiContainedLargeButton -import com.suwiki.core.designsystem.component.card.SuwikiClassInformationCard import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.component.searchbar.SuwikiSearchBar import com.suwiki.core.designsystem.theme.Gray6A @@ -61,6 +60,7 @@ import com.suwiki.core.ui.extension.suwikiClickable import com.suwiki.core.ui.util.timetableCellColorHexMap import com.suwiki.feature.timetable.R import com.suwiki.feature.timetable.navigation.argument.CellEditorArgument +import com.suwiki.feature.timetable.openlecture.component.OpenLectureCard import com.suwiki.feature.timetable.openlecture.model.SchoolLevel import kotlinx.collections.immutable.toPersistentList import kotlinx.coroutines.android.awaitFrame @@ -238,7 +238,7 @@ fun OpenLectureScreen( key = { it.id }, ) { lectureEvaluation -> with(lectureEvaluation) { - SuwikiClassInformationCard( + OpenLectureCard( className = name, professor = professorName, cellInfo = originalCellList.toText(context), diff --git a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassInformationCard.kt b/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/component/OpenLectureCard.kt similarity index 96% rename from core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassInformationCard.kt rename to feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/component/OpenLectureCard.kt index 7c8fd6074..fb6c490d1 100644 --- a/core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassInformationCard.kt +++ b/feature/timetable/src/main/java/com/suwiki/feature/timetable/openlecture/component/OpenLectureCard.kt @@ -1,4 +1,4 @@ -package com.suwiki.core.designsystem.component.card +package com.suwiki.feature.timetable.openlecture.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,7 +21,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.designsystem.component.button.SuwikiContainedSmallButton import com.suwiki.core.designsystem.theme.Black import com.suwiki.core.designsystem.theme.Gray6A @@ -29,10 +28,11 @@ import com.suwiki.core.designsystem.theme.GrayDA import com.suwiki.core.designsystem.theme.GrayF6 import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White +import com.suwiki.core.ui.R import com.suwiki.core.ui.extension.suwikiClickable @Composable -fun SuwikiClassInformationCard( +fun OpenLectureCard( modifier: Modifier = Modifier, className: String, professor: String, @@ -136,10 +136,10 @@ fun SuwikiClassInformationCard( @Preview @Composable -fun ClassInformationPreview() { +fun OpenLectureCardPreview() { SuwikiTheme { Column { - SuwikiClassInformationCard( + OpenLectureCard( modifier = Modifier, className = "강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명", professor = "교수명 교수명 교수명 교수명 교수명", diff --git a/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetable/component/timetable/Common.kt b/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetable/component/timetable/Common.kt index 9e45a1f27..a4f158324 100644 --- a/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetable/component/timetable/Common.kt +++ b/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetable/component/timetable/Common.kt @@ -3,8 +3,8 @@ package com.suwiki.feature.timetable.timetable.component.timetable import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.model.timetable.TimetableDay +import com.suwiki.core.ui.R internal val timetableHeightPerHour = 48.dp diff --git a/feature/timetable/src/main/java/com/suwiki/feature/timetable/widget/timetable/Common.kt b/feature/timetable/src/main/java/com/suwiki/feature/timetable/widget/timetable/Common.kt index 5609873a3..15c5a14bd 100644 --- a/feature/timetable/src/main/java/com/suwiki/feature/timetable/widget/timetable/Common.kt +++ b/feature/timetable/src/main/java/com/suwiki/feature/timetable/widget/timetable/Common.kt @@ -3,8 +3,8 @@ package com.suwiki.feature.timetable.widget.timetable import android.content.Context import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import com.suwiki.core.designsystem.R import com.suwiki.core.model.timetable.TimetableDay +import com.suwiki.core.ui.R internal val glanceTimetableHeightPerHour = 48.dp diff --git a/feature/timetable/src/main/res/values/strings.xml b/feature/timetable/src/main/res/values/strings.xml index 13760a17d..826e15b9d 100644 --- a/feature/timetable/src/main/res/values/strings.xml +++ b/feature/timetable/src/main/res/values/strings.xml @@ -2,10 +2,10 @@ 시간표를 만들어\n일정을 관리해보세요 시간표 만들기 - %s년 %s학기 + %s년 %s학기 수강학기를 선택해주세요! 시간표 이름 - 시간표를 먼저 생성해주세요 + 시간표를 먼저 생성해주세요 강의 직접추가 강의명 또는 교수명을 검색하세요 1학년 @@ -16,7 +16,7 @@ 시간표에 강의를 추가했어요 강의 수정을 완료했어요 강의 추가 - 강의명 + 강의명 강의명 입력 교수명 교수명 입력 @@ -28,13 +28,13 @@ 강의명을 입력해주세요 장소를 입력해주세요 교수명을 입력해주세요 - %1$s (%2$s %3$s - %4$s교시) + %1$s (%2$s %3$s - %4$s교시) 수업명 수업명, 장소 수업명, 교수명 수업명, 교수명, 장소 보여질 강의정보 - 시간표가 없어요 + 시간표가 없어요 시간표 삭제 정말로 삭제하시겠어요?