From 745f7036826380c56a61ff1e7547bc330eade9de Mon Sep 17 00:00:00 2001 From: BEEEAM-J Date: Wed, 31 Jan 2024 23:54:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor/#125=20:=20LectureEvaluationTab=20?= =?UTF-8?q?=ED=95=98=EB=93=9C=EC=BD=94=EB=94=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/model/enums/LectureEvaluationTab.kt | 15 --------------- .../core/ui/enums/LectureEvaluationTab.kt | 18 ++++++++++++++++++ .../lectureevaluation/my/MyEvaluationScreen.kt | 4 ++-- .../detail/LectureEvaluationDetailScreen.kt | 4 ++-- .../detail/LectureEvaluationDetailViewModel.kt | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 core/model/src/main/java/com/suwiki/core/model/enums/LectureEvaluationTab.kt create mode 100644 core/ui/src/main/java/com/suwiki/core/ui/enums/LectureEvaluationTab.kt diff --git a/core/model/src/main/java/com/suwiki/core/model/enums/LectureEvaluationTab.kt b/core/model/src/main/java/com/suwiki/core/model/enums/LectureEvaluationTab.kt deleted file mode 100644 index 75c87a66..00000000 --- a/core/model/src/main/java/com/suwiki/core/model/enums/LectureEvaluationTab.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.suwiki.core.model.enums - -enum class LectureEvaluationTab( - val position: Int, - val title: String, -) { - LECTURE_EVALUATION( - position = 0, - title = "강의평가", - ), - EXAM_INFO( - position = 1, - title = "시험정보", - ), -} diff --git a/core/ui/src/main/java/com/suwiki/core/ui/enums/LectureEvaluationTab.kt b/core/ui/src/main/java/com/suwiki/core/ui/enums/LectureEvaluationTab.kt new file mode 100644 index 00000000..47ad14ea --- /dev/null +++ b/core/ui/src/main/java/com/suwiki/core/ui/enums/LectureEvaluationTab.kt @@ -0,0 +1,18 @@ +package com.suwiki.core.ui.enums + +import androidx.annotation.StringRes +import com.suwiki.core.ui.R + +enum class LectureEvaluationTab( + val position: Int, + @StringRes val title: Int, +) { + LECTURE_EVALUATION( + position = 0, + title = R.string.word_lecture_evaluation, + ), + EXAM_INFO( + position = 1, + title = R.string.word_exam_info, + ), +} diff --git a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt index b16192fe..c0a25be5 100644 --- a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt +++ b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt @@ -35,7 +35,7 @@ import com.suwiki.core.designsystem.component.tabbar.TabTitle import com.suwiki.core.designsystem.theme.Gray95 import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White -import com.suwiki.core.model.enums.LectureEvaluationTab +import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation import com.suwiki.core.ui.extension.OnBottomReached @@ -151,7 +151,7 @@ fun MyEvaluationScreen( LectureEvaluationTab.entries.forEach { tab -> with(tab) { TabTitle( - title = title, + title = stringResource(title), position = position, selected = pagerState.currentPage == position, onClick = { onClickTab(position) }, 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 9acbd83a..08d550b9 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 @@ -46,7 +46,7 @@ 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.model.enums.LectureEvaluationTab +import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.ui.extension.OnBottomReached import com.suwiki.core.ui.extension.collectWithLifecycle import com.suwiki.core.ui.extension.suwikiClickable @@ -181,7 +181,7 @@ fun LectureEvaluationDetailScreen( LectureEvaluationTab.entries.forEach { tab -> with(tab) { TabTitle( - title = title, + title = stringResource(title), position = position, selected = pagerState.currentPage == position, onClick = { onClickTab(position) }, diff --git a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt index 9ad34550..b5f5899d 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt @@ -2,7 +2,7 @@ package com.suwiki.feature.lectureevaluation.viewerreporter.detail import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import com.suwiki.core.model.enums.LectureEvaluationTab +import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.model.exception.UserPointLackException import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation From e742c614701267f9e342d4817e1bedde2ec40e18 Mon Sep 17 00:00:00 2001 From: BEEEAM-J Date: Thu, 1 Feb 2024 00:46:35 +0900 Subject: [PATCH 2/2] chore/#125 : ktlint --- .../suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt | 2 +- .../viewerreporter/detail/LectureEvaluationDetailViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt index c0a25be5..f51a4e40 100644 --- a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt +++ b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationScreen.kt @@ -35,9 +35,9 @@ import com.suwiki.core.designsystem.component.tabbar.TabTitle import com.suwiki.core.designsystem.theme.Gray95 import com.suwiki.core.designsystem.theme.SuwikiTheme import com.suwiki.core.designsystem.theme.White -import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation +import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.ui.extension.OnBottomReached import com.suwiki.core.ui.extension.collectWithLifecycle import com.suwiki.core.ui.extension.encodeToUri diff --git a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt index b5f5899d..a155b2a8 100644 --- a/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt +++ b/feature/lectureevaluation/viewerreporter/src/main/java/com/suwiki/feature/lectureevaluation/viewerreporter/detail/LectureEvaluationDetailViewModel.kt @@ -2,10 +2,10 @@ package com.suwiki.feature.lectureevaluation.viewerreporter.detail import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.model.exception.UserPointLackException import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation +import com.suwiki.core.ui.enums.LectureEvaluationTab import com.suwiki.core.ui.extension.encodeToUri import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam.BuyExamUseCase import com.suwiki.domain.lectureevaluation.viewerreporter.usecase.exam.GetExamEvaluationListUseCase