마이페이지 & 분석리포트 QA 반영

Prezel/app/src/main/java/com/team/prezel/ui/PrezelApp.kt

@@ -11,6 +11,7 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -25,6 +26,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -53,6 +55,7 @@ import com.team.prezel.core.navigation.Navigator
 import com.team.prezel.core.navigation.ProvideSharedTransitionScope
 import com.team.prezel.core.navigation.toEntries
 import com.team.prezel.core.ui.state.LocalAppDimmerState
+import com.team.prezel.core.ui.state.LocalSnackbarCoroutineScope
 import com.team.prezel.core.ui.state.LocalSnackbarHostState
 import com.team.prezel.core.ui.state.rememberAppDimmerState
 import com.team.prezel.core.ui.util.noRippleClickable
@@ -70,11 +73,13 @@ fun PrezelApp(
 ) {
     val navigator = remember(appState.navigationState) { Navigator(appState.navigationState) }
     val snackbarHostState = remember { SnackbarHostState() }
+    val snackbarCoroutineScope = rememberCoroutineScope()
     val appDimmerState = rememberAppDimmerState()
 
     CompositionLocalProvider(
         LocalNavigator provides navigator,
         LocalAppDimmerState provides appDimmerState,
+        LocalSnackbarCoroutineScope provides snackbarCoroutineScope,
         LocalSnackbarHostState provides snackbarHostState,
     ) {
         DoubleBackToExitHandler(navigationState = appState.navigationState)
@@ -124,7 +129,11 @@ private fun PrezelAppContent(
         }
 
         EdgeToEdgeStatusBarBackground(style = statusBarStyle)
-        AppDimmerOverlay(isVisible = appDimmerState.isVisible, onDismiss = appDimmerState::dismiss)
+        AppDimmerOverlay(
+            isVisible = appDimmerState.isVisible,
+            foregroundContent = appDimmerState.foregroundContent,
+            onDismiss = appDimmerState::dismiss,
+        )
     }
 }
 
@@ -159,16 +168,23 @@ private fun AppNavigationContent(
 @Composable
 private fun AppDimmerOverlay(
     isVisible: Boolean,
+    foregroundContent: (@Composable BoxScope.() -> Unit)?,
     onDismiss: () -> Unit,
 ) {
     if (!isVisible) return
 
     Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(PrezelTheme.colors.scrimContainer)
-            .noRippleClickable(onClick = onDismiss),
-    )
+        modifier = Modifier.fillMaxSize(),
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(PrezelTheme.colors.scrimContainer)
+                .noRippleClickable(onClick = onDismiss),
+        )
+
+        foregroundContent?.invoke(this)
+    }
 }
 
 private fun defaultPrezelNavTransition(): ContentTransform =

Prezel/core/data/src/main/java/com/team/prezel/core/data/mapper/PresentationMapper.kt

@@ -3,6 +3,7 @@ package com.team.prezel.core.data.mapper
 import com.team.prezel.core.model.practice.RecordingSpeed
 import com.team.prezel.core.model.presentation.Audience
 import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.Curation
 import com.team.prezel.core.model.presentation.ExpectedQuestion
 import com.team.prezel.core.model.presentation.MainData
 import com.team.prezel.core.model.presentation.PracticeRecords
@@ -18,6 +19,7 @@ import com.team.prezel.core.model.presentation.SentenceAnalysisDetail
 import com.team.prezel.core.model.presentation.Style
 import com.team.prezel.core.model.presentation.WordAnalysisDetail
 import com.team.prezel.core.model.presentation.WordAnalysisStatus
+import com.team.prezel.core.network.model.presentation.GetCurationResponse
 import com.team.prezel.core.network.model.presentation.GetMainDataResponse
 import com.team.prezel.core.network.model.presentation.GetPracticeRecordsResponse
 import com.team.prezel.core.network.model.presentation.GetPresentationsResponse
@@ -151,3 +153,13 @@ private fun GetMainDataResponse.GrowthGraph.toDomain(): PresentationGrowthPoint
         accuracyScore = accuracyScore,
         scriptMatchRate = scriptMatchRate,
     )
+
+internal fun GetCurationResponse.toDomain(): Curation =
+    Curation(
+        guideMessage = guideMessage,
+        materialType = materialType,
+        title = title,
+        sourceChannel = sourceChannel,
+        linkUrl = linkUrl,
+        imageUrl = imageUrl,
+    )

Prezel/core/data/src/main/java/com/team/prezel/core/data/repository/BadgeRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.team.prezel.core.domain.repository.badge.BadgeRepository
 import com.team.prezel.core.model.badge.Badge
 import com.team.prezel.core.model.badge.BadgeDetail
 import com.team.prezel.core.model.badge.BadgeEvent
+import com.team.prezel.core.model.badge.BadgeSortType
 import com.team.prezel.core.network.datasource.BadgeRemoteDataSource
 import com.team.prezel.core.network.model.badge.BadgeEventResponse
 import com.team.prezel.core.network.model.badge.GetBadgeDetailResponse
@@ -16,9 +17,9 @@ import javax.inject.Inject
 internal class BadgeRepositoryImpl @Inject constructor(
     private val badgeRemoteDataSource: BadgeRemoteDataSource,
 ) : BadgeRepository {
-    override suspend fun getBadges(): Result<List<Badge>> =
+    override suspend fun getBadges(sort: BadgeSortType): Result<List<Badge>> =
         runCatching {
-            badgeRemoteDataSource.getBadges()
+            badgeRemoteDataSource.getBadges(sort.value.lowercase())
         }.mapCatching { response ->
             response.map(GetBadgeResponse::toDomain)
         }.mapDomainFailure()

Prezel/core/data/src/main/java/com/team/prezel/core/data/repository/PresentationRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.team.prezel.core.data.mapper.toDomain
 import com.team.prezel.core.domain.repository.presentation.PresentationRepository
 import com.team.prezel.core.model.presentation.Audience
 import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.Curation
 import com.team.prezel.core.model.presentation.MainData
 import com.team.prezel.core.model.presentation.PracticeRecords
 import com.team.prezel.core.model.presentation.PresentationAnalysisSummary
@@ -14,6 +15,7 @@ import com.team.prezel.core.model.presentation.PresentationWordDetail
 import com.team.prezel.core.model.presentation.Purpose
 import com.team.prezel.core.model.presentation.Style
 import com.team.prezel.core.network.datasource.PresentationRemoteDataSource
+import com.team.prezel.core.network.model.presentation.GetCurationResponse
 import com.team.prezel.core.network.model.presentation.GetMainDataResponse
 import com.team.prezel.core.network.model.presentation.GetPresentationsResponse
 import javax.inject.Inject
@@ -136,4 +138,11 @@ internal class PresentationRepositoryImpl @Inject constructor(
                 content = content,
             )
         }.mapDomainFailure()
+
+    override suspend fun getCuration(presentationId: Long): Result<List<Curation>> =
+        runCatching {
+            presentationRemoteDataSource.getCuration(presentationId = presentationId)
+        }.mapCatching { response ->
+            response.map(GetCurationResponse::toDomain)
+        }.mapDomainFailure()
 }

Prezel/core/data/src/main/java/com/team/prezel/core/data/repository/TermsRepositoryImpl.kt

@@ -2,14 +2,23 @@ package com.team.prezel.core.data.repository
 
 import com.team.prezel.core.data.error.mapDomainFailure
 import com.team.prezel.core.domain.repository.terms.TermsRepository
+import com.team.prezel.core.model.terms.Term
 import com.team.prezel.core.model.terms.TermsAgreement
 import com.team.prezel.core.network.datasource.TermsRemoteDataSource
 import com.team.prezel.core.network.model.terms.AgreeTermsRequest
+import com.team.prezel.core.network.model.terms.FetchTermsResponse
 import javax.inject.Inject
 
 internal class TermsRepositoryImpl @Inject constructor(
     private val termsRemoteDataSource: TermsRemoteDataSource,
 ) : TermsRepository {
+    override suspend fun fetchTerms(): Result<List<Term>> =
+        runCatching {
+            termsRemoteDataSource.fetchTerms()
+        }.mapCatching { response ->
+            response.map { term -> term.toDomain() }
+        }.mapDomainFailure()
+
     override suspend fun agreeTerms(terms: List<TermsAgreement>): Result<Unit> =
         runCatching {
             termsRemoteDataSource.agreeTerms(
@@ -18,4 +27,14 @@ internal class TermsRepositoryImpl @Inject constructor(
                 },
             )
         }.mapDomainFailure()
+
+    private fun FetchTermsResponse.toDomain(): Term =
+        Term(
+            termsId = termsId.toLong(),
+            title = title,
+            summary = summary,
+            content = content,
+            isRequired = isRequired,
+            version = version,
+        )
 }

Prezel/core/designsystem/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 dependencies {
     implementation(libs.kotlinx.collections.immutable)
     implementation(libs.coil.kt.compose)
+    implementation(libs.coil.kt.svg)
     implementation(libs.kotlinx.datetime)
     implementation(libs.timber)
 

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelAsyncImage.kt

@@ -1,11 +1,15 @@
 package com.team.prezel.core.designsystem.component
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import coil.ImageLoader
 import coil.compose.AsyncImage
+import coil.decode.SvgDecoder
 import timber.log.Timber
 
 @Composable
@@ -17,8 +21,18 @@ fun PrezelAsyncImage(
     onSuccess: () -> Unit = {},
     onError: (Throwable?) -> Unit = {},
 ) {
+    val context = LocalContext.current
+    val imageLoader = remember(context) {
+        ImageLoader
+            .Builder(context)
+            .components {
+                add(SvgDecoder.Factory())
+            }.build()
+    }
+
     AsyncImage(
         model = url,
+        imageLoader = imageLoader,
         contentDescription = contentDescription,
         modifier = modifier,
         placeholder = ColorPainter(Color.Transparent),

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/textfield/PrezelTextField.kt

@@ -3,12 +3,13 @@ package com.team.prezel.core.designsystem.component.textfield
 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.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.isImeVisible
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.BasicTextField
@@ -29,7 +30,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
@@ -43,6 +44,7 @@ import com.team.prezel.core.designsystem.preview.PreviewColumn
 import com.team.prezel.core.designsystem.preview.PreviewSurface
 import com.team.prezel.core.designsystem.theme.PrezelTheme
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun PrezelTextField(
     value: String,
@@ -57,22 +59,29 @@ fun PrezelTextField(
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
 ) {
+    val focusManager = LocalFocusManager.current
+    val isImeVisible = WindowInsets.isImeVisible
     var focused by remember { mutableStateOf(false) }
+    var wasImeVisible by remember { mutableStateOf(isImeVisible) }
     var textFieldValue by remember { mutableStateOf(TextFieldValue(text = value, selection = TextRange(value.length))) }
-    val density = LocalDensity.current
-    val imeVisible = WindowInsets.ime.getBottom(density) > 0
-    val typing = focused && imeVisible
 
     LaunchedEffect(value) {
         if (value != textFieldValue.text) {
             textFieldValue = TextFieldValue(text = value, selection = TextRange(value.length))
         }
     }
 
+    LaunchedEffect(isImeVisible, focused, enabled) {
+        if (enabled && focused && wasImeVisible && !isImeVisible) {
+            focusManager.clearFocus()
+        }
+        wasImeVisible = isImeVisible
+    }
+
     val state = rememberPrezelTextFieldState(
         value = textFieldValue.text,
         enabled = enabled,
-        focused = typing,
+        focused = focused,
     ).let { state -> PrezelTextFieldStyle(state = state, status = status) }
 
     PrezelTextField(
@@ -86,7 +95,7 @@ fun PrezelTextField(
         },
         placeholder = placeholder,
         style = state,
-        focused = typing,
+        focused = focused,
         onFocusChange = { isFocused -> focused = isFocused },
         modifier = modifier,
         label = label,

Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/theme/PrezelTheme.kt

@@ -58,7 +58,7 @@ fun PrezelTheme(
     isDarkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit,
 ) {
-    val colorScheme = if (isDarkTheme) PrezelColorScheme.Dark else PrezelColorScheme.Light
+    val colorScheme = if (isDarkTheme) PrezelColorScheme.Light else PrezelColorScheme.Light
     val typographyScheme = PrezelTypographyScheme.Default()
 
     CompositionLocalProvider(

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/repository/badge/BadgeRepository.kt

@@ -3,10 +3,11 @@ package com.team.prezel.core.domain.repository.badge
 import com.team.prezel.core.model.badge.Badge
 import com.team.prezel.core.model.badge.BadgeDetail
 import com.team.prezel.core.model.badge.BadgeEvent
+import com.team.prezel.core.model.badge.BadgeSortType
 import kotlinx.coroutines.flow.Flow
 
 interface BadgeRepository {
-    suspend fun getBadges(): Result<List<Badge>>
+    suspend fun getBadges(sort: BadgeSortType): Result<List<Badge>>
 
     suspend fun getBadgeDetail(badgeCode: String): Result<BadgeDetail>
 

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/repository/presentation/PresentationRepository.kt

@@ -2,6 +2,7 @@ package com.team.prezel.core.domain.repository.presentation
 
 import com.team.prezel.core.model.presentation.Audience
 import com.team.prezel.core.model.presentation.Category
+import com.team.prezel.core.model.presentation.Curation
 import com.team.prezel.core.model.presentation.MainData
 import com.team.prezel.core.model.presentation.PracticeRecords
 import com.team.prezel.core.model.presentation.PresentationAnalysisSummary
@@ -53,4 +54,6 @@ interface PresentationRepository {
         presentationId: Long,
         content: String,
     ): Result<Unit>
+
+    suspend fun getCuration(presentationId: Long): Result<List<Curation>>
 }

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/repository/terms/TermsRepository.kt

@@ -1,7 +1,10 @@
 package com.team.prezel.core.domain.repository.terms
 
+import com.team.prezel.core.model.terms.Term
 import com.team.prezel.core.model.terms.TermsAgreement
 
 interface TermsRepository {
+    suspend fun fetchTerms(): Result<List<Term>>
+
     suspend fun agreeTerms(terms: List<TermsAgreement>): Result<Unit>
 }

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/usecase/badge/FetchBadgesUseCase.kt

@@ -2,10 +2,11 @@ package com.team.prezel.core.domain.usecase.badge
 
 import com.team.prezel.core.domain.repository.badge.BadgeRepository
 import com.team.prezel.core.model.badge.Badge
+import com.team.prezel.core.model.badge.BadgeSortType
 import javax.inject.Inject
 
 class FetchBadgesUseCase @Inject constructor(
     private val badgeRepository: BadgeRepository,
 ) {
-    suspend operator fun invoke(): Result<List<Badge>> = badgeRepository.getBadges()
+    suspend operator fun invoke(sort: BadgeSortType = BadgeSortType.DEFAULT): Result<List<Badge>> = badgeRepository.getBadges(sort)
 }

Prezel/core/domain/src/main/kotlin/com/team/prezel/core/domain/usecase/presentation/FetchCurationUseCase.kt

@@ -0,0 +1,11 @@
+package com.team.prezel.core.domain.usecase.presentation
+
+import com.team.prezel.core.domain.repository.presentation.PresentationRepository
+import com.team.prezel.core.model.presentation.Curation
+import javax.inject.Inject
+
+class FetchCurationUseCase @Inject constructor(
+    private val presentationRepository: PresentationRepository,
+) {
+    suspend operator fun invoke(presentationId: Long): Result<List<Curation>> = presentationRepository.getCuration(presentationId = presentationId)
+}