diff --git a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt b/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt index ed2fcdd6..4aa2bd4b 100644 --- a/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt +++ b/domain/lectureevaluation/editor/src/main/java/com/suwiki/domain/lectureevaluation/editor/usecase/lecture/UpdateLectureEvaluationUseCase.kt @@ -8,7 +8,7 @@ class UpdateLectureEvaluationUseCase @Inject constructor( private val lectureEditorRepository: LectureEditorRepository, ) { suspend operator fun invoke(param: Param): Result = runCatchingIgnoreCancelled { - with(param){ + with(param) { lectureEditorRepository.updateLectureEvaluation( lectureId = lectureId, selectedSemester = selectedSemester, diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt index bc178735..9171cf06 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt @@ -2,22 +2,15 @@ package com.suwiki.feature.lectureevaluation.editor.examevaluation import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope import com.suwiki.core.model.enums.ExamInfo import com.suwiki.core.model.enums.ExamLevel import com.suwiki.core.model.enums.ExamType import com.suwiki.core.model.lectureevaluation.exam.MyExamEvaluation -import com.suwiki.core.model.user.User import com.suwiki.core.ui.extension.decodeFromUri -import com.suwiki.domain.lectureevaluation.editor.usecase.exam.DeleteExamEvaluationUseCase import com.suwiki.domain.lectureevaluation.editor.usecase.exam.UpdateExamEvaluationUseCase -import com.suwiki.domain.user.usecase.GetUserInfoUseCase import com.suwiki.feature.lectureevaluation.editor.navigation.MyEvaluationEditRoute import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.collections.immutable.toPersistentList -import kotlinx.coroutines.flow.catch -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.onEach import kotlinx.serialization.json.Json import org.orbitmvi.orbit.Container import org.orbitmvi.orbit.ContainerHost diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvalutionEditScreen.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvalutionEditScreen.kt index e83489c2..7811ddb7 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvalutionEditScreen.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvalutionEditScreen.kt @@ -3,7 +3,6 @@ package com.suwiki.feature.lectureevaluation.editor.examevaluation import androidx.compose.foundation.ScrollState 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.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow @@ -18,7 +17,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -34,7 +32,6 @@ import com.suwiki.core.designsystem.component.bottomsheet.SuwikiSelectBottomShee import com.suwiki.core.designsystem.component.button.SuwikiContainedMediumButton import com.suwiki.core.designsystem.component.chips.SuwikiOutlinedChip import com.suwiki.core.designsystem.component.container.SuwikiSelectionContainer -import com.suwiki.core.designsystem.component.dialog.SuwikiDialog import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.component.textfield.SuwikiReviewInputBox import com.suwiki.core.designsystem.theme.SuwikiTheme diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditScreen.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditScreen.kt index 82ae2470..782ea7d1 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditScreen.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditScreen.kt @@ -33,7 +33,6 @@ import com.suwiki.core.designsystem.component.button.SuwikiContainedMediumButton import com.suwiki.core.designsystem.component.chips.ChipColor import com.suwiki.core.designsystem.component.chips.SuwikiContainedChip import com.suwiki.core.designsystem.component.container.SuwikiSelectionContainer -import com.suwiki.core.designsystem.component.dialog.SuwikiDialog import com.suwiki.core.designsystem.component.loading.LoadingScreen import com.suwiki.core.designsystem.component.ratingbar.SuwikiRatingBar import com.suwiki.core.designsystem.component.slider.SuwikiSlider diff --git a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditViewModel.kt b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditViewModel.kt index 7a15cdf9..86097bef 100644 --- a/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditViewModel.kt +++ b/feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditViewModel.kt @@ -8,7 +8,6 @@ import com.suwiki.core.model.enums.TeamLevel import com.suwiki.core.model.lectureevaluation.lecture.MyLectureEvaluation import com.suwiki.core.model.user.User import com.suwiki.core.ui.extension.decodeFromUri -import com.suwiki.domain.lectureevaluation.editor.usecase.lecture.DeleteLectureEvaluationUseCase import com.suwiki.domain.lectureevaluation.editor.usecase.lecture.UpdateLectureEvaluationUseCase import com.suwiki.domain.user.usecase.GetUserInfoUseCase import com.suwiki.feature.lectureevaluation.editor.navigation.MyEvaluationEditRoute 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 4d3492aa..59b6484c 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 @@ -214,7 +214,6 @@ fun MyEvaluationScreen( ) } - if (uiState.isLoading) { LoadingScreen() } diff --git a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationViewModel.kt b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationViewModel.kt index 4c550e50..005469f6 100644 --- a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationViewModel.kt +++ b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/MyEvaluationViewModel.kt @@ -46,7 +46,9 @@ class MyEvaluationViewModel @Inject constructor( lectureEvaluationPage = 1 isLastLectureEvaluation = false persistentListOf() - } else state.myLectureEvaluationList + } else { + state.myLectureEvaluationList + } if (isLastLectureEvaluation) return@intent @@ -68,7 +70,9 @@ class MyEvaluationViewModel @Inject constructor( examEvaluationPage = 1 isLastExamEvaluation = false persistentListOf() - } else state.myExamEvaluationList + } else { + state.myExamEvaluationList + } if (isLastExamEvaluation) return@intent @@ -97,7 +101,6 @@ class MyEvaluationViewModel @Inject constructor( hideLoadingScreen() } - fun deleteExamEvaluation() = intent { deleteExamEvaluationUseCase(toDeleteExamId) .onSuccess { @@ -130,7 +133,6 @@ class MyEvaluationViewModel @Inject constructor( private fun setPoint(user: User) = intent { reduce { state.copy(point = user.point) } } - fun syncPager(currentPage: Int) = intent { reduce { state.copy(currentTabPage = currentPage) } } private fun showLoadingScreen() = intent { reduce { state.copy(isLoading = true) } } diff --git a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/navigation/MyEvaluationNavigation.kt b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/navigation/MyEvaluationNavigation.kt index 1fd2638f..43d8f46a 100644 --- a/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/navigation/MyEvaluationNavigation.kt +++ b/feature/lectureevaluation/my/src/main/java/com/suwiki/feature/lectureevaluation/my/navigation/MyEvaluationNavigation.kt @@ -1,6 +1,5 @@ package com.suwiki.feature.lectureevaluation.my.navigation -import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable diff --git a/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetablelist/TimetableListScreen.kt b/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetablelist/TimetableListScreen.kt index 97fbfb47..9ff0f4b0 100644 --- a/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetablelist/TimetableListScreen.kt +++ b/feature/timetable/src/main/java/com/suwiki/feature/timetable/timetablelist/TimetableListScreen.kt @@ -17,6 +17,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.SuwikiAppBarWithTextButton +import com.suwiki.core.designsystem.component.container.SuwikiEditContainer import com.suwiki.core.designsystem.component.dialog.SuwikiDialog import com.suwiki.core.designsystem.theme.Gray95 import com.suwiki.core.designsystem.theme.SuwikiTheme @@ -24,7 +25,6 @@ import com.suwiki.core.designsystem.theme.White import com.suwiki.core.model.timetable.Timetable import com.suwiki.feature.timetable.R import com.suwiki.feature.timetable.navigation.argument.TimetableEditorArgument -import com.suwiki.core.designsystem.component.container.SuwikiEditContainer import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect diff --git a/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyExamEvaluationResponse.kt b/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyExamEvaluationResponse.kt index 9be15e2a..ea9ac72e 100644 --- a/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyExamEvaluationResponse.kt +++ b/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyExamEvaluationResponse.kt @@ -23,8 +23,8 @@ internal fun MyExamEvaluationResponse.toModel() = MyExamEvaluation( professor = professor, majorType = majorType, selectedSemester = selectedSemester, - semesterList = semesterList.replace(" ","").split(","), - examInfo = examInfo.replace(" ","").split(","), + semesterList = semesterList.replace(" ", "").split(","), + examInfo = examInfo.replace(" ", "").split(","), examType = examType, examDifficulty = examDifficulty, content = content, diff --git a/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyLectureEvaluationResponse.kt b/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyLectureEvaluationResponse.kt index a888d4f1..19c685c7 100644 --- a/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyLectureEvaluationResponse.kt +++ b/remote/lectureevaluation/my/src/main/java/com/suwiki/remote/lectureevaluation/my/response/MyLectureEvaluationResponse.kt @@ -25,7 +25,7 @@ data class MyLectureEvaluationResponse( internal fun MyLectureEvaluationResponse.toModel() = MyLectureEvaluation( id = id, lectureInfo = LectureInfo( - semesterList = semesterList.replace(" ","").split(","), + semesterList = semesterList.replace(" ", "").split(","), professor = professor, majorType = majorType, lectureType = null, diff --git a/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationAverageResponse.kt b/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationAverageResponse.kt index 0972235f..9dcb4745 100644 --- a/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationAverageResponse.kt +++ b/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationAverageResponse.kt @@ -21,7 +21,7 @@ data class LectureEvaluationAverageResponse( internal fun LectureEvaluationAverageResponse.toModel() = LectureEvaluationAverage( id = id, lectureInfo = LectureInfo( - semesterList = semesterList.replace(" ","").split(","), + semesterList = semesterList.replace(" ", "").split(","), professor = professor, majorType = majorType, lectureType = lectureType, diff --git a/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationExtraAverageResponse.kt b/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationExtraAverageResponse.kt index fd6806c1..1c60d1d9 100644 --- a/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationExtraAverageResponse.kt +++ b/remote/lectureevaluation/viewerreporter/src/main/java/com/suwiki/remote/lectureevaluation/viewerreporter/response/lecture/LectureEvaluationExtraAverageResponse.kt @@ -24,7 +24,7 @@ data class LectureEvaluationExtraAverageResponse( internal fun LectureEvaluationExtraAverageResponse.toModel() = LectureEvaluationExtraAverage( id = id, lectureInfo = LectureInfo( - semesterList = semesterList.replace(" ","").split(","), + semesterList = semesterList.replace(" ", "").split(","), professor = professor, majorType = majorType, lectureType = lectureType,