Merge remote-tracking branch 'origin/develop' into BOOK-475-feature/#233

# Conflicts:
#	core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt
#	core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt
#	core/designsystem/stability/designsystem.stability
#	feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt
#	feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUiState.kt
#	feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/RecordTooltipBox.kt
#	feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt
#	feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/QuoteStep.kt
#	feature/record/stability/record.stability
#	gradle/libs.versions.toml

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

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
 
@@ -53,8 +53,9 @@ 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", "GOOGLE_WEB_CLIENT_ID", getLocalProperty("GOOGLE_WEB_CLIENT_ID"))
+        buildConfigField("String", "KAKAO_NATIVE_APP_KEY", getLocalProperty("KAKAO_NATIVE_APP_KEY"))
+        manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = getLocalProperty("KAKAO_NATIVE_APP_KEY").trim('"')
     }
 
     buildFeatures {
@@ -109,7 +110,3 @@ dependencies {
     api(libs.circuit.codegen.annotation)
     ksp(libs.circuit.codegen.ksp)
 }
-
-fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
-}

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/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/BookStatus.kt

@@ -16,7 +16,7 @@ enum class BookStatus(val value: String) {
         }
     }
 
-    companion object Companion {
+    companion object {
         fun fromValue(value: String): BookStatus? {
             return entries.find { it.value == value }
         }

core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/EmotionAnalyzer.kt

@@ -1,12 +1,15 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.AutoLoginState
-import com.ninecraft.booket.core.model.LoginMethod
+import com.ninecraft.booket.core.model.state.AutoLoginState
+import com.ninecraft.booket.core.model.state.UserState
 import com.ninecraft.booket.core.model.UserState
 import kotlinx.coroutines.flow.Flow
 
 interface AuthRepository {
-    suspend fun login(accessToken: String): Result<Unit>
+    suspend fun login(
+        providerType: String,
+        token: String,
+    ): Result<Unit>
 
     suspend fun logout(): Result<Unit>
 

core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.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/EmotionRepository.kt

@@ -1,18 +1,17 @@
 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.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<ReadingRecordModel>
 
     suspend fun getReadingRecords(
         userBookId: String,
@@ -23,14 +22,15 @@ interface RecordRepository {
 
     suspend fun getRecordDetail(
         readingRecordId: String,
-    ): Result<RecordDetailModel>
+    ): Result<ReadingRecordModel>
 
     suspend fun editRecord(
         readingRecordId: String,
-        pageNumber: Int,
+        pageNumber: Int?,
         quote: String,
-        emotionTags: List<String>,
         review: String,
+        primaryEmotion: String,
+        detailEmotionTagIds: List<String>,
     ): Result<ReadingRecordModel>
 
     suspend fun deleteRecord(

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

@@ -1,6 +1,6 @@
 package com.ninecraft.booket.core.data.api.repository
 
-import com.ninecraft.booket.core.model.OnboardingState
+import com.ninecraft.booket.core.model.state.OnboardingState
 import com.ninecraft.booket.core.model.TermsAgreementModel
 import com.ninecraft.booket.core.model.UserProfileModel
 import kotlinx.coroutines.flow.Flow