Merge branch 'develop' into BOOK-225-feature/#111

seoyoon513 · seoyoon513 · commit d060ae2aec90 · 2025-08-06T22:15:44.000+09:00
# Conflicts:
#	feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt
diff --git a/.github/workflows/android-cd.yml b/.github/workflows/android-cd.yml
@@ -0,0 +1,107 @@
+name: Android CD
+
+env:
+    GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
+    GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
+
+on:
+    pull_request:
+        branches:
+            - main
+
+jobs:
+    cd-build:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+                with:
+                    # 최근 태그를 확인하기 위해 필요
+                    fetch-depth: 0
+
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v4
+                with:
+                    distribution: 'corretto'
+                    java-version: 17
+
+            -   name: Generate reed.jks
+                run: echo '${{ secrets.REED_JAVA_KEYSTORE }}' | base64 -d > ./reed.jks
+
+            -   name: Generate local.properties
+                run: echo '${{ secrets.LOCAL_PROPERTIES }}' | base64 -d > ./local.properties
+
+            -   name: Generate keystore.properties
+                run: echo '${{ secrets.KEYSTORE_PROPERTIES }}' | base64 -d > ./keystore.properties
+
+            -   name: Generate google-services.json
+                run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json
+
+            -   name: Extract Version Name from ApplicationConstants.kt
+                run: |
+                    set -euo pipefail
+                    VERSION=$(grep "VERSION_NAME" build-logic/src/main/kotlin/com/ninecraft/booket/convention/ApplicationConstants.kt | sed -E 's/.*VERSION_NAME\s*=\s*"([^"]+)".*/\1/')
+                    if [[ -z "$VERSION" ]]; then
+                      echo "Error: ApplicationConstants.kt에서 VERSION_NAME 값을 추출하지 못했습니다." >&2
+                      exit 1
+                    fi
+                    echo "version=v${VERSION}" >> "$GITHUB_OUTPUT"
+                    echo "Version extracted from ApplicationConstants.kt: v${VERSION}"
+                id: extract_version
+
+            -   name: Generate Firebase Release Note
+                id: firebase_release_note
+                env:
+                    PR_TITLE: ${{ github.event.pull_request.title }}
+                run: |
+                    # PR_TITLE은 env에서 안전하게 전달됨
+                    # 가장 최근 태그 찾기 (현재 버전 이전의 태그)
+                    LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+
+                    # 릴리스 노트 내용 생성
+                    NOTES="## 🚀 변경사항: ${PR_TITLE}\n\n"
+
+                    if [ -n "$LATEST_TAG" ]; then
+                        NOTES="${NOTES}### 이전 버전($LATEST_TAG)부터의 변경사항:\n"
+                        # 최근 태그부터 현재까지의 커밋만 가져옴
+                        COMMITS=$(git log --pretty=format:"- %h %s (%an)" ${LATEST_TAG}..HEAD --no-merges)
+                        NOTES="${NOTES}${COMMITS}"
+                    else
+                        NOTES="${NOTES}### 커밋 내역:\n"
+                        # 태그가 없는 경우 최근 10개 커밋만 표시
+                        COMMITS=$(git log --pretty=format:"- %h %s (%an)" --no-merges -n 10)
+                        NOTES="${NOTES}${COMMITS}\n\n(이전 릴리스 태그가 없어 최근 10개 커밋만 표시)"
+                    fi
+
+                    # 환경 변수로 저장
+                    echo "notes<<EOF" >> $GITHUB_OUTPUT
+                    echo -e "$NOTES" >> $GITHUB_OUTPUT
+                    echo "EOF" >> $GITHUB_OUTPUT
+
+            -   name: Build Release AAB
+                run: |
+                    ./gradlew :app:bundleRelease
+
+            -   name: Upload Release Build to Artifacts
+                uses: actions/upload-artifact@v4
+                with:
+                    name: release-artifacts
+                    path: app/build/outputs/bundle/release/
+                    if-no-files-found: error
+
+            -   name: Create Github Release
+                uses: softprops/action-gh-release@v2
+                with:
+                    tag_name: ${{ steps.extract_version.outputs.version }}
+                    release_name: ${{ steps.extract_version.outputs.version }}
+                    generate_release_notes: true
+
+            -   name: Upload artifact to Firebase App Distribution
+                uses: wzieba/Firebase-Distribution-Github-Action@v1
+                with:
+                    appId: ${{secrets.FIREBASE_RELEASE_APP_ID}}
+                    serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+                    groups: testers
+                    file: app/build/outputs/bundle/release/app-release.aab
+                    releaseNotes: ${{ steps.firebase_release_note.outputs.notes }}
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -36,12 +36,10 @@ jobs:
                     gradle-home-cache-cleanup: true
 
             -   name: Generate local.properties
-                run: |
-                    echo '${{ secrets.LOCAL_PROPERTIES }}' >> ./local.properties
+                run: echo '${{ secrets.LOCAL_PROPERTIES }}' | base64 -d > ./local.properties
 
             -   name: Generate keystore.properties
-                run: |
-                    echo '${{ secrets.KEYSTORE_PROPERTIES }}' >> ./keystore.properties
+                run: echo '${{ secrets.KEYSTORE_PROPERTIES }}' | base64 -d > ./keystore.properties
 
             -   name: Generate google-services.json
                 run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json
diff --git a/build-logic/src/main/kotlin/AndroidRetrofitConventionPlugin.kt b/build-logic/src/main/kotlin/AndroidRetrofitConventionPlugin.kt
@@ -17,14 +17,6 @@ internal class AndroidRetrofitConventionPlugin : Plugin<Project> {
                 "booket.kotlin.library.serialization",
             )
 
-            extensions.configure<LibraryExtension> {
-                configureAndroid(this)
-
-                defaultConfig.apply {
-                    targetSdk = ApplicationConstants.TARGET_SDK
-                }
-            }
-
             dependencies {
                 implementation(libs.retrofit)
                 implementation(libs.retrofit.kotlinx.serialization.converter)
diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
@@ -46,8 +47,6 @@ internal fun HomeUi(
     state: HomeUiState,
     modifier: Modifier = Modifier,
 ) {
-    HandleHomeSideEffects(state = state)
-
     // TODO: Android 15에서 statusBar 색상 적용 안되는 문제 있음. 해결 예정.
     val systemUiController = rememberSystemUiController()
 
@@ -64,20 +63,23 @@ internal fun HomeUi(
         }
     }
 
+    HandleHomeSideEffects(state = state)
+
     Column(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .background(HomeBg)
+            .statusBarsPadding(),
     ) {
         HomeHeader(
             onSettingsClick = {
                 state.eventSink(HomeUiEvent.OnSettingsClick)
             },
-            modifier = modifier,
         )
         HomeBanner(
             onBookRegisterClick = {
                 state.eventSink(HomeUiEvent.OnBookRegisterClick)
             },
-            modifier = modifier,
         )
         HomeContent(
             state = state,
diff --git a/feature/library/build.gradle.kts b/feature/library/build.gradle.kts
@@ -17,5 +17,7 @@ ksp {
 dependencies {
     implementations(
         libs.logger,
+
+        libs.compose.system.ui.controller,
     )
 }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt
@@ -8,10 +8,12 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -21,6 +23,7 @@ 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.designsystem.theme.White
 import com.ninecraft.booket.core.model.LibraryBookSummaryModel
 import com.ninecraft.booket.core.ui.component.InfinityLazyColumn
 import com.ninecraft.booket.core.ui.component.LoadStateFooter
@@ -31,21 +34,44 @@ import com.ninecraft.booket.feature.screens.LibraryScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlinx.collections.immutable.persistentListOf
+import tech.thdev.compose.exteions.system.ui.controller.rememberSystemUiController
 
 @CircuitInject(LibraryScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun LibraryUi(
     state: LibraryUiState,
     modifier: Modifier = Modifier,
 ) {
+    // TODO: Android 15에서 statusBar 색상 적용 안되는 문제 있음. 해결 예정.
+    val systemUiController = rememberSystemUiController()
+
+    DisposableEffect(systemUiController) {
+        systemUiController.setStatusBarColor(
+            color = White,
+            darkIcons = true,
+        )
+        onDispose {}
+    }
+
     HandleLibrarySideEffects(
         state = state,
         eventSink = state.eventSink,
     )
 
     Column(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .statusBarsPadding(),
     ) {
+        LibraryHeader(
+            onSearchClick = {
+                state.eventSink(LibraryUiEvent.OnLibrarySearchClick)
+            },
+            onSettingClick = {
+                state.eventSink(LibraryUiEvent.OnSettingsClick)
+            },
+        )
+
         LibraryContent(
             state = state,
             modifier = modifier,
@@ -63,14 +89,6 @@ internal fun LibraryContent(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
-        LibraryHeader(
-            onSearchClick = {
-                state.eventSink(LibraryUiEvent.OnLibrarySearchClick)
-            },
-            onSettingClick = {
-                state.eventSink(LibraryUiEvent.OnSettingsClick)
-            },
-        )
         FilterChipGroup(
             filterList = state.filterChips,
             selectedChipOption = state.currentFilter,
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUi.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUi.kt
@@ -1,9 +1,11 @@
 package com.ninecraft.booket.feature.main.bottomnavigation
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.ui.ReedScaffold
 import com.ninecraft.booket.feature.main.component.MainBottomBar
 import com.ninecraft.booket.feature.main.component.MainTab
@@ -15,7 +17,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 @CircuitInject(BottomNavigationScreen::class, ActivityRetainedComponent::class)
 @Composable
-fun BottomNavigation(
+fun BottomNavigationUi(
     state: BottomNavigationUiState,
     modifier: Modifier = Modifier,
 ) {
@@ -30,6 +32,7 @@ fun BottomNavigation(
                 },
             )
         },
+        contentWindowInsets = WindowInsets(top = 0.dp),
     ) { innerPadding ->
         NavigableCircuitContent(
             navigator = state.navigator,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt
@@ -19,18 +19,22 @@ 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.WindowInsets
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -59,7 +63,6 @@ import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.core.ui.component.ReedCloseTopAppBar
 import com.ninecraft.booket.core.ui.component.ReedDialog
-import com.ninecraft.booket.core.ui.component.ReedFullScreen
 import com.ninecraft.booket.feature.record.R
 import com.ninecraft.booket.feature.record.ocr.component.CameraFrame
 import com.ninecraft.booket.feature.record.ocr.component.SentenceBox
@@ -75,10 +78,16 @@ internal fun Ocr(
     state: OcrUiState,
     modifier: Modifier = Modifier,
 ) {
-    ReedFullScreen {
-        when (state.currentUi) {
-            OcrUi.CAMERA -> CameraPreview(state = state, modifier = modifier)
-            OcrUi.RESULT -> TextScanResult(state = state, modifier = modifier)
+    Scaffold(contentWindowInsets = WindowInsets(0.dp)) { innerPadding ->
+        Box(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(innerPadding),
+        ) {
+            when (state.currentUi) {
+                OcrUi.CAMERA -> CameraPreview(state = state, modifier = modifier)
+                OcrUi.RESULT -> TextScanResult(state = state, modifier = modifier)
+            }
         }
     }
 }
@@ -168,7 +177,8 @@ private fun CameraPreview(
     Box(
         modifier = modifier
             .fillMaxSize()
-            .background(Neutral950),
+            .background(Neutral950)
+            .systemBarsPadding(),
     ) {
         ReedCloseTopAppBar(
             modifier = Modifier
@@ -275,7 +285,8 @@ private fun TextScanResult(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .background(White)
+            .systemBarsPadding(),
     ) {
         ReedCloseTopAppBar(
             title = stringResource(R.string.ocr_sentence_selection),

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ ksp {`
`17`	`17`	`dependencies {`
`18`	`18`	`implementations(`
`19`	`19`	`libs.logger,`
	`20`	`+`
	`21`	`+ libs.compose.system.ui.controller,`
`20`	`22`	`)`
`21`	`23`	`}`