Merge remote-tracking branch 'origin/develop' into BOOK-474-feature/#232

# Conflicts:
#	app/build.gradle.kts
#	core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Color.kt
#	feature/login/build.gradle.kts

Author: easyhooon

.github/workflows/android-ci.yml

@@ -84,5 +84,8 @@ jobs:
             -   name: Generate google-services.json
                 run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json
 
+            -   name: Compose Stability Dump
+                run: ./gradlew stabilityDump
+
             -   name: Compose Stability Check
                 run: ./gradlew stabilityCheck

README.md

@@ -1,6 +1,6 @@
 # Reed - 문장과 감정을 함께 담는 독서 기록
 
-[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.0-blue.svg)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.21-blue.svg)](https://kotlinlang.org)
 [![Gradle](https://img.shields.io/badge/gradle-8.11.1-green.svg)](https://gradle.org/)
 [![Android Studio](https://img.shields.io/badge/Android%20Studio-2025.1.2%20%28Narwhal%29-green)](https://developer.android.com/studio)
 [![minSdkVersion](https://img.shields.io/badge/minSdkVersion-28-red)](https://developer.android.com/distribute/best-practices/develop/target-sdk)
@@ -37,15 +37,19 @@
 | <img width="230" alt="기록 카드 공유" src="https://github.com/user-attachments/assets/4c01a5ed-e5a2-4be4-b950-96a457c87ad7" /> |
 
 ## TroubleShooting
-- [[Compose] M3 ModalBottomSheet 드래그(터치 이벤트) 막는 법](https://velog.io/@mraz3068/Compose-M3-ModalBottomSheet-Drag-Disabled)
+- [Metro 적용해보기](https://velog.io/@mraz3068/Metro-Apply)
+- [Compose Stability Analyzer 사용 후기](https://velog.io/@mraz3068/compose-stability-analyzer-review)
+- [[Android] Toast 내부 구현 확인 해보기](https://velog.io/@mraz3068/Android-Toast-Deep-Dive)
+- [Coroutine CancellationException 따로 처리해야하는 케이스](https://velog.io/@mraz3068/Coroutine-CancellationException-UseCase)
+- [Coroutine 에러 처리 패턴: 여러 API 호출을 한 번에 성공/실패 판정하기](https://velog.io/@syoon513/Coroutine-%EC%98%88%EC%99%B8-%EC%B2%98%EB%A6%AC)
+- [[Circuit] ImpressionEffect](https://velog.io/@mraz3068/Circuit-ImpressionEffect)
+- [[Android] 일회성 이벤트를 StateFlow, Compose의 State로 처리할 때 주의해야할 점](https://velog.io/@mraz3068/Handle-One-Time-Event-As-State)
+- [Jetpack Compose에서 CameraX + MLKit으로 OCR을 구현해보자](https://velog.io/@syoon513/Jetpack-Compose%EC%97%90%EC%84%9C-CameraX-MLKit%EC%9C%BC%EB%A1%9C-OCR%EC%9D%84-%EA%B5%AC%ED%98%84%ED%95%B4%EB%B3%B4%EC%9E%90)
 - [Circuit 찍먹해보기(부제: Circuit 희망편)](https://speakerdeck.com/easyhooon/circuit-jjigmeoghaebogi-buje-circuit-hyimangpyeon)
 - [Circuit 찍먹해보기(부제: Circuit 절망편)](https://speakerdeck.com/easyhooon/circuit-jjigmeoghaebogi-buje-circuit-jeolmangpyeon)
-- [Jetpack Compose에서 CameraX + MLKit으로 OCR을 구현해보자](https://velog.io/@syoon513/Jetpack-Compose%EC%97%90%EC%84%9C-CameraX-MLKit%EC%9C%BC%EB%A1%9C-OCR%EC%9D%84-%EA%B5%AC%ED%98%84%ED%95%B4%EB%B3%B4%EC%9E%90)
-- [[Android] 일회성 이벤트를 StateFlow, Compose의 State로 처리할 때 주의해야할 점](https://velog.io/@mraz3068/Handle-One-Time-Event-As-State)
 - [Circuit Navigation 사용 시 feature 모듈간의 참조는 어떻게 해결했을까?](https://velog.io/@syoon513/Circuit-Navigation-%EC%82%AC%EC%9A%A9-%EC%8B%9C-feature-%EB%AA%A8%EB%93%88%EA%B0%84-%EC%88%9C%ED%99%98-%EC%B0%B8%EC%A1%B0%EB%8A%94-%EC%96%B4%EB%96%BB%EA%B2%8C-%ED%95%B4%EA%B2%B0%ED%96%88%EC%9D%84%EA%B9%8C)
-- [Coroutine 에러 처리 패턴: 여러 API 호출을 한 번에 성공/실패 판정하기](https://velog.io/@syoon513/Coroutine-%EC%98%88%EC%99%B8-%EC%B2%98%EB%A6%AC)
-- [[Circuit] ImpressionEffect](https://velog.io/@mraz3068/Circuit-ImpressionEffect)
-- [Coroutine CancellationException 따로 처리해야하는 케이스](https://velog.io/@mraz3068/Coroutine-CancellationException-UseCase)
+- [[Compose] M3 ModalBottomSheet 드래그(터치 이벤트) 막는 법](https://velog.io/@mraz3068/Compose-M3-ModalBottomSheet-Drag-Disabled)
+
 
 ## Development
 
@@ -55,7 +59,7 @@
 - JDK : Java 17을 실행할 수 있는 JDK
     - (권장) Android Studio 설치 시 Embedded 된 JDK (Open JDK)
     - Java 17을 사용하는 JDK (Open JDK, AdoptOpenJDK, GraalVM)
-- Kotlin Language : 2.2.0
+- Kotlin Language : 2.2.21
 
 ### Language
 
@@ -76,8 +80,8 @@
     - Material3
 
 - [Circuit](https://github.com/slackhq/circuit)
-- ~~Google ML Kit~~ Google Cloud Vision
-- ~~Dagger Hilt~~ Metro
+- ~~Google ML Kit~~ -> [Google Cloud Vision](https://cloud.google.com/vision)
+- ~~Dagger Hilt~~ -> [Metro](https://github.com/ZacSweers/metro)
 - Retrofit, OkHttp3
 - Lottie-Compose
 - Firebase(Analytics, Crashlytics, Remote Config)

app/build.gradle.kts

@@ -1,7 +1,7 @@
 @file:Suppress("INLINE_FROM_HIGHER_PLATFORM")
 
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.google.devtools.ksp.gradle.KspExtension
+import com.ninecraft.booket.convention.getLocalProperty
 import org.gradle.kotlin.dsl.configure
 import java.util.Properties
 
@@ -32,7 +32,7 @@ android {
         getByName("debug") {
             isDebuggable = true
             applicationIdSuffix = ".dev"
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getApiKey("DEBUG_GOOGLE_WEB_CLIENT_ID"))
+            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("DEBUG_GOOGLE_WEB_CLIENT_ID"))
             manifestPlaceholders += mapOf(
                 "appName" to "@string/app_name_dev",
             )
@@ -43,7 +43,7 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             signingConfig = signingConfigs.getByName("release")
-            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getApiKey("RELEASE_GOOGLE_WEB_CLIENT_ID"))
+            buildConfigField("String", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("RELEASE_GOOGLE_WEB_CLIENT_ID"))
             manifestPlaceholders += mapOf(
                 "appName" to "@string/app_name",
             )
@@ -55,8 +55,8 @@ android {
     }
 
     defaultConfig {
-        buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getApiKey("KAKAO_NATIVE_APP_KEY"))
-        manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = getApiKey("KAKAO_NATIVE_APP_KEY").trim('"')
+        buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getLocalProperty("KAKAO_NATIVE_APP_KEY"))
+        manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = getLocalProperty("KAKAO_NATIVE_APP_KEY").trim('"')
     }
 
     buildFeatures {
@@ -111,7 +111,3 @@ dependencies {
     api(libs.circuit.codegen.annotation)
     ksp(libs.circuit.codegen.ksp)
 }
-
-fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
-}

app/stability/app.stability

@@ -9,7 +9,7 @@ public fun com.ninecraft.booket.di.CrossFadeNavDecorator.Decoration(targetState:
   skippable: false
   restartable: true
   params:
-    - targetState: RUNTIME (requires runtime check)
+    - targetState: UNSTABLE (has mutable properties or unstable members)
     - innerContent: STABLE (composable function type)
 
 @Composable

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -33,6 +33,7 @@ internal class AndroidFeatureConventionPlugin : Plugin<Project> {
                 implementation(project(path = ":core:ui"))
                 implementation(project(path = ":feature:screens"))
 
+                implementation(libs.kotlinx.collections.immutable)
                 implementation(libs.compose.effects)
 
                 implementation(libs.bundles.circuit)

build-logic/src/main/kotlin/com/ninecraft/booket/convention/Extensions.kt

@@ -1,5 +1,6 @@
 package com.ninecraft.booket.convention
 
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.the
@@ -10,3 +11,7 @@ internal val Project.libs
 internal fun Project.applyPlugins(vararg plugins: String) {
     plugins.forEach(pluginManager::apply)
 }
+
+fun Project.getLocalProperty(propertyKey: String): String {
+    return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
+}

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/EmotionRepository.kt

@@ -0,0 +1,7 @@
+package com.ninecraft.booket.core.data.api.repository
+
+import com.ninecraft.booket.core.model.EmotionGroupsModel
+
+interface EmotionRepository {
+    suspend fun getEmotions(): Result<EmotionGroupsModel>
+}

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/RecordRepository.kt

@@ -1,37 +1,37 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.ReadingRecordModel
-import com.ninecraft.booket.core.model.RecordRegisterModel
+import com.ninecraft.booket.core.model.ReadingRecordModelV2
 import com.ninecraft.booket.core.model.ReadingRecordsModel
-import com.ninecraft.booket.core.model.RecordDetailModel
 
 interface RecordRepository {
     suspend fun postRecord(
         userBookId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
-    ): Result<RecordRegisterModel>
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
+    ): Result<ReadingRecordModelV2>
 
     suspend fun getReadingRecords(
         userBookId: String,
         sort: String,
         page: Int,
         size: Int,
-    ): Result<ReadingRecordsModel>
+    ): Result<ReadingRecordsModel> // TODO: V2로 변경 필요
 
     suspend fun getRecordDetail(
         readingRecordId: String,
-    ): Result<RecordDetailModel>
+    ): Result<ReadingRecordModelV2>
 
     suspend fun editRecord(
         readingRecordId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
-    ): Result<ReadingRecordModel>
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
+    ): Result<ReadingRecordModelV2>
 
     suspend fun deleteRecord(
         readingRecordId: String,

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/di/DataGraph.kt

@@ -2,11 +2,13 @@ package com.ninecraft.booket.core.data.impl.di
 
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.api.repository.BookRepository
+import com.ninecraft.booket.core.data.api.repository.EmotionRepository
 import com.ninecraft.booket.core.data.api.repository.RecordRepository
 import com.ninecraft.booket.core.data.api.repository.RemoteConfigRepository
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultAuthRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultBookRepository
+import com.ninecraft.booket.core.data.impl.repository.DefaultEmotionRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultRecordRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultRemoteConfigRepository
 import com.ninecraft.booket.core.data.impl.repository.DefaultUserRepository
@@ -23,6 +25,9 @@ interface DataGraph {
     @Binds
     val DefaultBookRepository.bind: BookRepository
 
+    @Binds
+    val DefaultEmotionRepository.bind: EmotionRepository
+
     @Binds
     val DefaultRecordRepository.bind: RecordRepository
 

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/mapper/ResponseToModel.kt

@@ -1,22 +1,26 @@
 package com.ninecraft.booket.core.data.impl.mapper
 
 import com.ninecraft.booket.core.common.extensions.decodeHtmlEntities
-import com.ninecraft.booket.core.common.extensions.toFormattedDate
 import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookSummaryModel
 import com.ninecraft.booket.core.model.BookUpsertModel
+import com.ninecraft.booket.core.model.DetailEmotionModel
 import com.ninecraft.booket.core.model.Emotion
+import com.ninecraft.booket.core.model.EmotionCode
+import com.ninecraft.booket.core.model.EmotionGroupModel
+import com.ninecraft.booket.core.model.EmotionGroupsModel
 import com.ninecraft.booket.core.model.EmotionModel
 import com.ninecraft.booket.core.model.HomeModel
 import com.ninecraft.booket.core.model.LibraryBookSummaryModel
 import com.ninecraft.booket.core.model.LibraryBooksModel
 import com.ninecraft.booket.core.model.LibraryModel
 import com.ninecraft.booket.core.model.PageInfoModel
+import com.ninecraft.booket.core.model.PrimaryEmotionModel
 import com.ninecraft.booket.core.model.ReadingRecordModel
+import com.ninecraft.booket.core.model.ReadingRecordModelV2
 import com.ninecraft.booket.core.model.ReadingRecordsModel
 import com.ninecraft.booket.core.model.RecentBookModel
-import com.ninecraft.booket.core.model.RecordDetailModel
 import com.ninecraft.booket.core.model.RecordRegisterModel
 import com.ninecraft.booket.core.model.SeedModel
 import com.ninecraft.booket.core.model.TermsAgreementModel
@@ -26,17 +30,21 @@ import com.ninecraft.booket.core.network.response.BookSearchResponse
 import com.ninecraft.booket.core.network.response.BookSummary
 import com.ninecraft.booket.core.network.response.BookUpsertResponse
 import com.ninecraft.booket.core.network.response.Category
+import com.ninecraft.booket.core.network.response.DetailEmotion
+import com.ninecraft.booket.core.network.response.EmotionGroup
+import com.ninecraft.booket.core.network.response.EmotionGroupsResponse
 import com.ninecraft.booket.core.network.response.GuestBookSearchResponse
 import com.ninecraft.booket.core.network.response.GuestBookSummary
 import com.ninecraft.booket.core.network.response.HomeResponse
 import com.ninecraft.booket.core.network.response.LibraryBookSummary
 import com.ninecraft.booket.core.network.response.LibraryBooks
 import com.ninecraft.booket.core.network.response.LibraryResponse
 import com.ninecraft.booket.core.network.response.PageInfo
+import com.ninecraft.booket.core.network.response.PrimaryEmotion
 import com.ninecraft.booket.core.network.response.ReadingRecord
+import com.ninecraft.booket.core.network.response.ReadingRecordV2
 import com.ninecraft.booket.core.network.response.ReadingRecordsResponse
 import com.ninecraft.booket.core.network.response.RecentBook
-import com.ninecraft.booket.core.network.response.RecordDetailResponse
 import com.ninecraft.booket.core.network.response.RecordRegisterResponse
 import com.ninecraft.booket.core.network.response.SeedResponse
 import com.ninecraft.booket.core.network.response.TermsAgreementResponse
@@ -187,6 +195,28 @@ internal fun PageInfo.toModel(): PageInfoModel {
     )
 }
 
+internal fun EmotionGroupsResponse.toModel(): EmotionGroupsModel {
+    return EmotionGroupsModel(
+        emotions = emotions.map { it.toModel() },
+    )
+}
+
+internal fun EmotionGroup.toModel(): EmotionGroupModel {
+    val code = EmotionCode.fromCode(code) ?: EmotionCode.OTHER
+    return EmotionGroupModel(
+        code = code,
+        displayName = displayName,
+        detailEmotions = detailEmotions.map { it.toModel() },
+    )
+}
+
+internal fun DetailEmotion.toModel(): DetailEmotionModel {
+    return DetailEmotionModel(
+        id = id,
+        name = name,
+    )
+}
+
 internal fun RecordRegisterResponse.toModel(): RecordRegisterModel {
     return RecordRegisterModel(
         id = id,
@@ -220,27 +250,36 @@ internal fun ReadingRecord.toModel(): ReadingRecordModel {
         emotionTags = emotionTags,
         createdAt = createdAt,
         updatedAt = updatedAt,
-        bookTitle = bookTitle,
-        bookPublisher = bookPublisher,
-        bookCoverImageUrl = bookCoverImageUrl,
-        author = author,
+        bookTitle = bookTitle ?: "",
+        bookPublisher = bookPublisher ?: "",
+        bookCoverImageUrl = bookCoverImageUrl ?: "",
+        author = author ?: "",
     )
 }
 
-internal fun RecordDetailResponse.toModel(): RecordDetailModel {
-    return RecordDetailModel(
+internal fun ReadingRecordV2.toModel(): ReadingRecordModelV2 {
+    return ReadingRecordModelV2(
         id = id,
         userBookId = userBookId,
         pageNumber = pageNumber,
         quote = quote,
         review = review ?: "",
-        emotionTags = emotionTags,
-        createdAt = createdAt.toFormattedDate(),
-        updatedAt = updatedAt.toFormattedDate(),
-        bookTitle = bookTitle,
-        bookPublisher = bookPublisher,
-        bookCoverImageUrl = bookCoverImageUrl,
-        author = author,
+        primaryEmotion = primaryEmotion.toModel(),
+        detailEmotions = detailEmotions.map { it.toModel() },
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+        bookTitle = bookTitle ?: "",
+        bookPublisher = bookPublisher ?: "",
+        bookCoverImageUrl = bookCoverImageUrl ?: "",
+        author = author ?: "",
+    )
+}
+
+internal fun PrimaryEmotion.toModel(): PrimaryEmotionModel {
+    val code = EmotionCode.fromCode(code) ?: EmotionCode.OTHER
+    return PrimaryEmotionModel(
+        code = code,
+        displayName = displayName,
     )
 }