Merge branch 'develop' into BOOK-151-feature/#57

# Conflicts:
#	core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/BookRepository.kt
#	feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUiState.kt

Author: easyhooon

app/build.gradle.kts

@@ -54,6 +54,7 @@ dependencies {
         projects.feature.screens,
         projects.feature.search,
         projects.feature.settings,
+        projects.feature.webview,
 
         libs.androidx.activity.compose,
         libs.androidx.startup,

app/src/main/kotlin/com/ninecraft/booket/di/CircuitModule.kt

@@ -28,6 +28,7 @@ abstract class CircuitModule {
         ): Circuit = Circuit.Builder()
             .addPresenterFactories(presenterFactories)
             .addUiFactories(uiFactories)
+            // .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
             .build()
     }
 }

app/src/main/kotlin/com/ninecraft/booket/di/CrossFadeNavDecorator.kt

@@ -0,0 +1,29 @@
+package com.ninecraft.booket.di
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.ContentTransform
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import com.slack.circuit.backstack.NavArgument
+import com.slack.circuit.foundation.NavigatorDefaults
+import com.slack.circuit.foundation.animation.AnimatedNavDecorator
+import com.slack.circuit.foundation.animation.AnimatedNavEvent
+import com.slack.circuit.foundation.animation.AnimatedNavState
+
+data class CrossFadeNavDecoratorFactory(val durationMillis: Int = 300) :
+    AnimatedNavDecorator.Factory {
+    override fun <T : NavArgument> create(): AnimatedNavDecorator<T, *> =
+        CrossFadeNavDecorator(durationMillis)
+}
+
+class CrossFadeNavDecorator<T : NavArgument>(private val durationMillis: Int) :
+    AnimatedNavDecorator<T, NavigatorDefaults.DefaultDecorator.DefaultAnimatedState<T>> by NavigatorDefaults.DefaultDecorator<T>() {
+
+    override fun AnimatedContentTransitionScope<AnimatedNavState>.transitionSpec(
+        animatedNavEvent: AnimatedNavEvent,
+    ): ContentTransform {
+        return fadeIn(tween(durationMillis)) togetherWith fadeOut(tween(durationMillis))
+    }
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/constants/WebViewConstants.kt

@@ -0,0 +1,6 @@
+package com.ninecraft.booket.core.common.constants
+
+enum class WebViewConstants(val url: String, val title: String) {
+    PRIVACY_POLICY("https://www.google.com", "개인정보처리방침"),
+    TERMS_OF_SERVICE("https://m.naver.com", "이용약관"),
+}

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

@@ -4,6 +4,7 @@ import com.ninecraft.booket.core.model.BookDetailModel
 import com.ninecraft.booket.core.model.BookSearchModel
 import com.ninecraft.booket.core.model.BookUpsertModel
 import kotlinx.coroutines.flow.Flow
+import com.ninecraft.booket.core.model.LibraryModel
 
 interface BookRepository {
     val recentSearches: Flow<List<String>>
@@ -21,4 +22,6 @@ interface BookRepository {
         bookIsbn: String,
         bookStatus: String,
     ): Result<BookUpsertModel>
+
+    suspend fun getLibrary(): Result<LibraryModel>
 }

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

@@ -5,11 +5,13 @@ 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.LibraryModel
 import com.ninecraft.booket.core.model.UserProfileModel
 import com.ninecraft.booket.core.network.response.BookDetailResponse
 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.LibraryResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 
 internal fun UserProfileResponse.toModel(): UserProfileModel {
@@ -84,3 +86,18 @@ internal fun BookUpsertResponse.toModel(): BookUpsertModel {
         updatedAt = updatedAt,
     )
 }
+
+internal fun LibraryResponse.toModel(): LibraryModel {
+    return LibraryModel(
+        userBookId = userBookId,
+        userId = userId,
+        bookIsbn = bookIsbn,
+        bookTitle = bookTitle,
+        bookAuthor = bookAuthor,
+        status = status,
+        coverImageUrl = coverImageUrl,
+        publisher = publisher,
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+    )
+}

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultBookRepository.kt

@@ -38,4 +38,8 @@ internal class DefaultBookRepository @Inject constructor(
     override suspend fun upsertBook(bookIsbn: String, bookStatus: String) = runSuspendCatching {
         service.upsertBook(BookUpsertRequest(bookIsbn, bookStatus)).toModel()
     }
+
+    override suspend fun getLibrary() = runSuspendCatching {
+        service.getLibrary().toModel()
+    }
 }

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/appbar/ReedTopAppBar.kt

@@ -5,9 +5,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -37,25 +37,23 @@ fun ReedTopAppBar(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .height(56.dp)
-            .background(color = White),
+            .height(60.dp)
+            .background(color = White)
+            .padding(horizontal = ReedTheme.spacing.spacing2),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (startIconRes != null) {
             IconButton(
                 onClick = { startIconOnClick() },
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .width(72.dp),
             ) {
                 Icon(
                     painter = painterResource(id = startIconRes),
                     contentDescription = startIconDescription,
                 )
             }
         } else {
-            Spacer(modifier = Modifier.width(72.dp))
+            Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing12))
         }
 
         Text(
@@ -68,17 +66,14 @@ fun ReedTopAppBar(
         if (endIconRes != null) {
             IconButton(
                 onClick = { endIconOnClick() },
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .width(72.dp),
             ) {
                 Icon(
                     painter = painterResource(id = endIconRes),
                     contentDescription = endIconDescription,
                 )
             }
         } else {
-            Spacer(modifier = Modifier.width(72.dp))
+            Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing12))
         }
     }
 }

core/model/src/main/kotlin/com/ninecraft/booket/core/model/LibraryModel.kt

@@ -0,0 +1,17 @@
+package com.ninecraft.booket.core.model
+
+import androidx.compose.runtime.Stable
+
+@Stable
+data class LibraryModel(
+    val userBookId: String = "",
+    val userId: String = "",
+    val bookIsbn: String = "",
+    val bookTitle: String = "",
+    val bookAuthor: String = "",
+    val status: String = "",
+    val coverImageUrl: String = "",
+    val publisher: String = "",
+    val createdAt: String = "",
+    val updatedAt: String = "",
+)

core/network/src/main/kotlin/com/ninecraft/booket/core/network/response/LibraryResponse.kt

@@ -0,0 +1,28 @@
+package com.ninecraft.booket.core.network.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LibraryResponse(
+    @SerialName("userBookId")
+    val userBookId: String,
+    @SerialName("userId")
+    val userId: String,
+    @SerialName("bookIsbn")
+    val bookIsbn: String,
+    @SerialName("bookTitle")
+    val bookTitle: String,
+    @SerialName("bookAuthor")
+    val bookAuthor: String,
+    @SerialName("status")
+    val status: String,
+    @SerialName("coverImageUrl")
+    val coverImageUrl: String,
+    @SerialName("publisher")
+    val publisher: String,
+    @SerialName("createdAt")
+    val createdAt: String,
+    @SerialName("updatedAt")
+    val updatedAt: String,
+)