Merge branch 'develop' into BOOK-212-feature/#98

# Conflicts:
#	feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt
#	feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUiState.kt

Author: easyhooon

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

@@ -8,6 +8,8 @@ interface AuthRepository {
 
     suspend fun logout(): Result<Unit>
 
+    suspend fun withdraw(): Result<Unit>
+
     suspend fun agreeTerms(termsAgreed: Boolean): Result<Unit>
 
     val autoLoginState: Flow<AutoLoginState>

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

@@ -31,6 +31,11 @@ internal class DefaultAuthRepository @Inject constructor(
         clearTokens()
     }
 
+    override suspend fun withdraw() = runSuspendCatching {
+        service.withdraw()
+        clearTokens()
+    }
+
     override suspend fun agreeTerms(termsAgreed: Boolean) = runSuspendCatching {
         service.agreeTerms(TermsAgreementRequest(termsAgreed))
         Unit

core/designsystem/build.gradle.kts

@@ -13,6 +13,8 @@ dependencies {
     implementations(
         projects.core.common,
 
+        libs.androidx.splash,
+
         libs.coil.compose,
         libs.logger,
 

core/designsystem/src/main/res/drawable/ic_dummy_splash.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+
+    <path
+        android:fillColor="@color/green_500"
+        android:pathData="M0,0h192v192h-192z" />
+
+</vector>

core/designsystem/src/main/res/values/colors.xml

@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="green_500">#FF2F9647</color>
 </resources>

core/designsystem/src/main/res/values/splash.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Booket.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">#FF2F9647</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_dummy_splash</item>
+        <item name="postSplashScreenTheme">@style/Theme.Booket</item>
+    </style>
+
+</resources>

core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/ReedService.kt

@@ -19,6 +19,7 @@ import com.ninecraft.booket.core.network.response.SeedResponse
 import com.ninecraft.booket.core.network.response.TermsAgreementResponse
 import com.ninecraft.booket.core.network.response.UserProfileResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.PUT
@@ -37,10 +38,14 @@ interface ReedService {
     @POST("api/v1/auth/signout")
     suspend fun logout()
 
-    @PUT("api/v1/auth/terms-agreement")
+    @DELETE("api/v1/auth/withdraw")
+    suspend fun withdraw()
+
+    // User endpoints (auth required)
+    @PUT("api/v1/users/terms-agreement")
     suspend fun agreeTerms(@Body termsAgreementRequest: TermsAgreementRequest): TermsAgreementResponse
 
-    @GET("api/v1/auth/me")
+    @GET("api/v1/users/me")
     suspend fun getUserProfile(): UserProfileResponse
 
     // Book endpoints (auth required)

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt

@@ -3,6 +3,7 @@ package com.ninecraft.booket.feature.detail.book
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -22,28 +23,23 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.common.constants.BookStatus
 import com.ninecraft.booket.core.designsystem.ComponentPreview
+import com.ninecraft.booket.core.designsystem.component.NetworkImage
 import com.ninecraft.booket.core.designsystem.component.ReedDivider
 import com.ninecraft.booket.core.designsystem.component.button.ReedButton
 import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
 import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
-import com.ninecraft.booket.core.ui.component.InfinityLazyColumn
-import com.ninecraft.booket.core.ui.component.LoadStateFooter
+import com.ninecraft.booket.core.ui.ReedScaffold
 import com.ninecraft.booket.core.ui.component.ReedBackTopAppBar
-import com.ninecraft.booket.core.ui.component.ReedFullScreen
-import com.ninecraft.booket.feature.detail.R
-import com.ninecraft.booket.feature.detail.book.component.BookItem
 import com.ninecraft.booket.feature.detail.book.component.BookUpdateBottomSheet
-import com.ninecraft.booket.feature.detail.book.component.CollectedSeeds
-import com.ninecraft.booket.feature.detail.book.component.ReadingRecordsHeader
-import com.ninecraft.booket.feature.detail.book.component.RecordItem
 import com.ninecraft.booket.feature.detail.book.component.RecordSortBottomSheet
 import com.ninecraft.booket.feature.screens.BookDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
@@ -68,14 +64,13 @@ internal fun BookDetailUi(
         eventSink = state.eventSink,
     )
 
-    ReedFullScreen(modifier = modifier) {
-        ReedBackTopAppBar(
-            title = "",
-            onBackClick = {
-                state.eventSink(BookDetailUiEvent.OnBackClick)
-            },
+    ReedScaffold(
+        modifier = modifier.fillMaxSize(),
+    ) { innerPadding ->
+        BookDetailContent(
+            state = state,
+            innerPadding = innerPadding,
         )
-        BookDetailContent(state = state)
     }
 
     if (state.isBookUpdateBottomSheetVisible) {
@@ -125,16 +120,28 @@ internal fun BookDetailUi(
 @Composable
 internal fun BookDetailContent(
     state: BookDetailUiState,
+    innerPadding: PaddingValues,
     modifier: Modifier = Modifier,
     lazyListState: LazyListState = rememberLazyListState(),
 ) {
     InfinityLazyColumn(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .padding(innerPadding),
         state = lazyListState,
         loadMore = {
             state.eventSink(BookDetailUiEvent.OnLoadMore)
         },
     ) {
+        item {
+            ReedBackTopAppBar(
+                title = "",
+                onBackClick = {
+                    state.eventSink(BookDetailUiEvent.OnBackClick)
+                },
+            )
+        }
+
         item {
             Column {
                 BookItem(bookDetail = state.bookDetail)

feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/RecordDetailUi.kt

@@ -1,8 +1,8 @@
 package com.ninecraft.booket.feature.detail.record
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -28,7 +28,7 @@ import com.ninecraft.booket.core.designsystem.component.ReedDivider
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.core.model.RecordDetailModel
-import com.ninecraft.booket.core.ui.component.ReedFullScreen
+import com.ninecraft.booket.core.ui.ReedScaffold
 import com.ninecraft.booket.core.ui.component.ReedTopAppBar
 import com.ninecraft.booket.feature.detail.R
 import com.ninecraft.booket.feature.detail.record.component.QuoteBox
@@ -48,26 +48,36 @@ internal fun RecordDetailUi(
         state = state,
     )
 
-    ReedFullScreen(modifier = modifier) {
-        ReedTopAppBar(
-            title = stringResource(R.string.review_detail_title),
-            startIconRes = designR.drawable.ic_close,
-            startIconDescription = "Close Icon",
-            startIconOnClick = {
-                state.eventSink(RecordDetailUiEvent.OnCloseClicked)
-            },
+    ReedScaffold(
+        modifier = modifier.fillMaxSize(),
+        containerColor = White,
+    ) { innerPadding ->
+        ReviewDetailContent(
+            state = state,
+            innerPadding = innerPadding,
         )
-        ReviewDetailContent(state = state, modifier = modifier)
     }
 }
 
 @Composable
-private fun ReviewDetailContent(state: RecordDetailUiState, modifier: Modifier = Modifier) {
+private fun ReviewDetailContent(
+    state: RecordDetailUiState,
+    innerPadding: PaddingValues,
+    modifier: Modifier = Modifier,
+) {
     Column(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .padding(innerPadding),
     ) {
+        ReedTopAppBar(
+            title = stringResource(R.string.review_detail_title),
+            startIconRes = designR.drawable.ic_close,
+            startIconDescription = "Close Icon",
+            startIconOnClick = {
+                state.eventSink(RecordDetailUiEvent.OnCloseClicked)
+            },
+        )
         Row(
             modifier = modifier
                 .fillMaxWidth()

feature/home/build.gradle.kts

@@ -17,7 +17,5 @@ ksp {
 dependencies {
     implementations(
         libs.logger,
-
-        libs.compose.system.ui.controller,
     )
 }