Merge pull request #66 from YAPP-Github/BOOK-156-feature/#62

feat: 독서 기록 플로우 화면 구성(OCR 문장 스캔이전까지)

Author: easyhooon

app/build.gradle.kts

@@ -51,6 +51,7 @@ dependencies {
         projects.feature.library,
         projects.feature.login,
         projects.feature.main,
+        projects.feature.record,
         projects.feature.screens,
         projects.feature.search,
         projects.feature.settings,

app/src/main/AndroidManifest.xml

@@ -11,11 +11,11 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Booket"
-        tools:targetApi="31"
-        android:networkSecurityConfig="@xml/network_security_config">
+        tools:targetApi="31">
 
         <provider
             android:name="androidx.startup.InitializationProvider"

core/designsystem/build.gradle.kts

@@ -13,7 +13,6 @@ dependencies {
     implementations(
         projects.core.common,
 
-        libs.compose.keyboard.state,
         libs.coil.compose,
         libs.logger,
 

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/RecordStep.kt

@@ -0,0 +1,10 @@
+package com.ninecraft.booket.core.designsystem
+
+enum class RecordStep {
+    REGISTER,
+    APPRECIATION,
+    EMOTION,
+    ;
+
+    val value: Int get() = ordinal
+}

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

@@ -0,0 +1,42 @@
+package com.ninecraft.booket.core.designsystem.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import com.ninecraft.booket.core.designsystem.RecordStep
+import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+
+@Composable
+fun RecordProgressBar(
+    currentStep: RecordStep,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing1),
+    ) {
+        repeat(3) { index ->
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .height(6.dp)
+                    .clip(RoundedCornerShape(ReedTheme.radius.full))
+                    .background(
+                        color = if (currentStep.value == index) {
+                            ReedTheme.colors.bgPrimary
+                        } else {
+                            ReedTheme.colors.bgDisabled
+                        },
+                    ),
+            )
+        }
+    }
+}

…nsystem/component/divider/ReedDivider.kt …re/designsystem/component/ReedDivider.ktcore/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/divider/ReedDivider.kt renamed to core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/ReedDivider.kt core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/divider/ReedDivider.kt renamed to core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/ReedDivider.kt

@@ -1,4 +1,4 @@
-package com.ninecraft.booket.core.designsystem.component.divider
+package com.ninecraft.booket.core.designsystem.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonColorStyle.kt

@@ -1,17 +1,20 @@
 package com.ninecraft.booket.core.designsystem.component.button
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.theme.Kakao
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 
 enum class ReedButtonColorStyle {
-    PRIMARY, SECONDARY, TERTIARY, KAKAO;
+    PRIMARY, SECONDARY, TERTIARY, STROKE, KAKAO;
 
     @Composable
     fun containerColor(isPressed: Boolean) = when (this) {
         PRIMARY -> if (isPressed) ReedTheme.colors.bgPrimaryPressed else ReedTheme.colors.bgPrimary
         SECONDARY -> if (isPressed) ReedTheme.colors.bgSecondaryPressed else ReedTheme.colors.bgSecondary
         TERTIARY -> if (isPressed) ReedTheme.colors.bgTertiaryPressed else ReedTheme.colors.bgTertiary
+        STROKE -> if (isPressed) ReedTheme.colors.basePrimary else ReedTheme.colors.basePrimary
         KAKAO -> Kakao
     }
 
@@ -20,6 +23,7 @@ enum class ReedButtonColorStyle {
         PRIMARY -> ReedTheme.colors.contentInverse
         SECONDARY -> ReedTheme.colors.contentPrimary
         TERTIARY -> ReedTheme.colors.contentBrand
+        STROKE -> ReedTheme.colors.contentBrand
         KAKAO -> ReedTheme.colors.contentPrimary
     }
 
@@ -28,4 +32,10 @@ enum class ReedButtonColorStyle {
 
     @Composable
     fun disabledContentColor() = ReedTheme.colors.contentDisabled
+
+    @Composable
+    fun borderStroke() = when (this) {
+        STROKE -> BorderStroke(1.dp, ReedTheme.colors.borderBrand)
+        else -> null
+    }
 }