[Release/1.1.0] (develop) #85
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/build.gradle.kts # app/src/main/AndroidManifest.xml # app/src/main/kotlin/com/moa/app/main/MainActivity.kt # core/designsystem/build.gradle.kts # core/designsystem/src/main/kotlin/com/moa/app/designsystem/component/core/button/MaButton.kt # core/designsystem/src/main/kotlin/com/moa/app/designsystem/component/core/textfield/MaOtpTextField.kt # core/designsystem/src/main/kotlin/com/moa/app/designsystem/component/product/dialog/MaAlertDialog.kt # core/navigation/src/main/java/com/moa/app/navigation/AppRoute.kt # core/network/src/main/kotlin/com/moa/app/network/adapter/NetworkResultCallAdapter.kt # core/network/src/main/kotlin/com/moa/app/network/adapter/ResponseHandler.kt # core/network/src/main/kotlin/com/moa/app/network/adapter/UnitResponseHandler.kt # core/network/src/test/kotlin/com/moa/app/network/adapter/ResponseHandlerTest.kt # data/src/main/kotlin/com/moa/app/data/quiz/datasource/QuizDataSource.kt # data/src/main/kotlin/com/moa/app/data/quiz/datasourceImpl/QuizDataSourceImpl.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/request/QuizScoreRequest.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/response/AttentionQuizResponse.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/response/LinguisticQuizResponse.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/response/PersistenceQuizResponse.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/response/QuizResponse.kt # data/src/main/kotlin/com/moa/app/data/quiz/model/response/SpaceTimeQuizResponse.kt # data/src/main/kotlin/com/moa/app/data/quiz/repositoryImpl/QuizRepositoryImpl.kt # data/src/main/kotlin/com/moa/app/data/quiz/service/QuizService.kt # data/src/main/kotlin/com/moa/app/data/report/datasource/ReportDataSource.kt # data/src/main/kotlin/com/moa/app/data/report/datasourceImpl/ReportDataSourceImpl.kt # data/src/main/kotlin/com/moa/app/data/report/repositoryImpl/ReportRepositoryImpl.kt # data/src/main/kotlin/com/moa/app/data/report/service/ReportService.kt # data/src/main/kotlin/com/moa/app/data/user/datasource/UserDataSource.kt # data/src/main/kotlin/com/moa/app/data/user/datasourceImpl/UserDataSourceImpl.kt # data/src/main/kotlin/com/moa/app/data/user/model/response/UserProfileResponse.kt # data/src/main/kotlin/com/moa/app/data/user/repositoryImpl/UserRepositoryImpl.kt # data/src/main/kotlin/com/moa/app/data/user/service/UserService.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/AttentionQuiz.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/LinguisticQuiz.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/PersistenceQuiz.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/Quiz.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/QuizCategory.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/QuizScore.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/model/SpaceTimeQuiz.kt # domain/src/main/kotlin/com/moa/app/domain/quiz/repository/QuizRepository.kt # domain/src/main/kotlin/com/moa/app/domain/report/repository/ReportRepository.kt # domain/src/main/kotlin/com/moa/app/domain/report/usecase/FetchDailyReportUseCase.kt # domain/src/main/kotlin/com/moa/app/domain/report/usecase/FetchMonthlyReportUseCase.kt # domain/src/main/kotlin/com/moa/app/domain/report/usecase/FetchWeeklyReportUseCase.kt # domain/src/main/kotlin/com/moa/app/domain/user/repository/UserRepository.kt # feature/guardian/build.gradle.kts # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/connection/UserConnectionScreen.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/connection/UserConnectionViewModel.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/connection/model/UserConnectionUiState.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/role/SelectUserRoleScreen.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/role/SelectUserRoleViewModel.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signin/SignInScreen.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signin/SignInViewModel.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signin/model/SignInUiState.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signup/SignUpPhoneAuthScreen.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signup/SignUpProfileScreen.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signup/SignUpSharedViewModel.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/signup/model/SignUpPhoneAuthUiState.kt # feature/onboarding/src/main/kotlin/com/moa/app/feature/onboarding/splash/SplashViewModel.kt # feature/report/src/main/java/com/moa/app/feature/report/ReportViewModel.kt # feature/senior/build.gradle.kts # feature/senior/src/main/kotlin/com/moa/app/feature/senior/home/SeniorHomeScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/home/SeniorHomeViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/attention/AttentionQuizScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/attention/AttentionQuizViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/attention/model/AttentionQuizUiState.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/category/QuizCategoryScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/category/QuizCategoryViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/category/model/QuizCategoryExtension.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/component/QuizCategoryCard.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/component/QuizDescription.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/component/QuizLoadContent.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/component/QuizSlideAnimation.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/linguistic/LinguisticQuizScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/linguistic/LinguisticQuizViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/linguistic/model/LinguisticQuizUiState.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/persistence/PersistenceQuizScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/persistence/PersistenceQuizViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/spacetime/SpaceTimeQuizScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/spacetime/SpaceTimeQuizViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/spacetime/model/SpaceTimeQuizUiState.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/setting/SeniorSettingScreen.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/setting/SeniorSettingViewModel.kt # feature/senior/src/main/kotlin/com/moa/app/feature/senior/setting/model/SeniorSettingUiState.kt # gradle/libs.versions.toml # settings.gradle.kts
μμ λ΄μ© μμ½μ΄λ² λ³κ²½μ¬νμ μλμ΄ ν΄μ¦ μΉ΄ν
κ³ λ¦¬ UI λͺ¨λΈμ μλ‘μ΄ λ°μ΄ν° ν΄λμ€ λ³κ²½ μ¬ν
μμ μ½λ 리뷰 λμ΄λπ― 1 (Trivial) | β±οΈ ~5 minutes κ΄λ ¨λ μ μλ PR
μΆν μ
π₯ Pre-merge checks | β 3β Passed checks (3 passed)
βοΈ Tip: You can configure your own custom pre-merge checks in the settings. β¨ Finishing touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
π§Ή Nitpick comments (1)
feature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/category/model/QuizCategoryUiState.kt (1)
5-13: Compose μν μμ μ±μ μν΄ImmutableSetμ¬μ©μ κ³ λ €ν΄ λ³΄μΈμ.νλ‘μ νΈμμ μ΄λ―Έ
kotlinx-collections-immutableλΌμ΄λΈλ¬λ¦¬λ₯Ό μ¬μ©νκ³ μμ΅λλ€. Compose UI μνμμSet보λ€ImmutableSetμ μ¬μ©νλ©΄ λΆνμν 리컴ν¬μ§μ μ λ°©μ§ν μ μμ΅λλ€.β»οΈ μ μνλ λ³κ²½
package com.moa.app.feature.senior.quiz.category.model import com.moa.app.domain.quiz.model.QuizCategory +import kotlinx.collections.immutable.ImmutableSet +import kotlinx.collections.immutable.persistentSetOf data class QuizCategoryUiState( - val enabledCategories: Set<QuizCategory> + val enabledCategories: ImmutableSet<QuizCategory> ) { companion object { val INIT = QuizCategoryUiState( - enabledCategories = emptySet() + enabledCategories = persistentSetOf() ) } }
π Review details
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
π Files selected for processing (3)
feature/guardian/src/main/kotlin/com/moa/app/feature/guardian/.gitkeepfeature/senior/src/main/kotlin/com/moa/app/feature/senior/quiz/category/model/QuizCategoryUiState.ktgradle/libs.versions.toml
β° Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: Run Unit Tests
π Additional comments (1)
gradle/libs.versions.toml (1)
8-9: LGTM!1.1.0 릴리μ¦λ₯Ό μν λ²μ μ λ°μ΄νΈκ° μ μ ν©λλ€.
versionCodeκ° μ¬λ°λ₯΄κ² μ¦κ°λμκ³ ,versionNameμ΄ μλ§¨ν± λ²μ λμ λ°λ₯΄κ³ μμ΅λλ€.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related issue π
Work Description βοΈ
Screenshot πΈ
Uncompleted Tasks π
Summary by CodeRabbit
μ£Όμ λ³κ²½μ¬ν
λ²μ μ λ°μ΄νΈ
κ°μ μ¬ν
βοΈ Tip: You can customize this high-level summary in your review settings.