Merge pull request #287 from YAPP-Github/develop

release v1.4.0

Author: easyhooon

.claude/CLAUDE.md

@@ -0,0 +1,24 @@
+# Reed 프로젝트 작업 지침
+
+## 빌드 관련
+
+- **빌드는 사용자가 직접 수행합니다**
+- 기능 작업 완료 후 빌드를 자동으로 실행하지 마세요 (시간이 오래 걸림)
+- 빌드가 필요한 경우 사용자에게 알리고 사용자가 직접 실행하도록 합니다
+
+## 커밋 관련
+
+- **커밋 메시지에서 Claude 관련 문구를 제거합니다**
+- 다음 문구들을 커밋 메시지에 포함하지 마세요:
+    - `🤖 Generated with [Claude Code](https://claude.com/claude-code)`
+    - `Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>`
+- 커밋 작업은 사용자가 직접 수행하는 경우가 많으므로, 요청받지 않은 경우 커밋하지 마세요
+
+## MCP 설정 관련
+
+- **Claude Code CLI의 MCP 설정 파일 위치**
+    - Claude Desktop이 아니라 **Claude Code CLI**를 사용 중입니다
+    - MCP 설정은 `~/.claude.json`의 `projects` 섹션에서 프로젝트별로 관리됩니다
+    - Claude Desktop 설정 파일(`~/Library/Application Support/Claude/claude_desktop_config.json`)을 수정하지 마세요
+- **Figma MCP 설정 경로**
+    - `~/.claude.json` → `projects` → `/Users/medi/AndroidStudioProjects/YeoBee-Android` → `mcpServers` → `figma`

.claude/CODING.md

@@ -0,0 +1,25 @@
+# 코딩 가이드
+
+## 코드 작성 원칙
+
+- 한글 주석 사용
+- Kotlin 코딩 컨벤션 준수
+- 기존 코드 스타일 유지
+- 파일 끝에 빈 줄(newline) 추가
+
+## Compose 관련
+
+- **Composable 함수 내 Collection 타입**
+    - `List`, `Set`, `Map` 등의 Collection 대신 `ImmutableList`, `ImmutableSet`, `ImmutableMap` 사용
+    - `kotlinx.collections.immutable` 라이브러리 사용
+    - 예시:
+      ```kotlin
+      // ❌ 사용하지 않음
+      @Composable
+      fun TripList(trips: List<Trip>) { ... }
+
+      // ✅ 사용
+      @Composable
+      fun TripList(trips: ImmutableList<Trip>) { ... }
+      ```
+    - 변환 시 `toImmutableList()`, `persistentListOf()` 등 사용

.github/workflows/android-ci.yml

@@ -6,6 +6,8 @@ env:
 
 on:
     pull_request:
+    push:
+        branches: [ main, develop ]
 
 concurrency:
     group: build-${{ github.ref }}
@@ -15,7 +17,7 @@ jobs:
     ci-build:
         runs-on: ubuntu-latest
 
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
+        if: ${{ github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
 
         steps:
             -   name: Checkout
@@ -30,10 +32,14 @@ jobs:
             -   name: Setup Android SDK
                 uses: android-actions/setup-android@v2
 
+            # 캐시 저장/정리는 job 완료 후 post action 단계에서 수행
             -   name: Setup Gradle
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/actions/setup-gradle@v4
                 with:
-                    gradle-home-cache-cleanup: true
+                    # 빌드 성공 시 미사용 캐시 엔트리 자동 정리 (default: on-success)
+                    # cache-cleanup: on-success
+                    # PR에서는 캐시 읽기만 허용, push(develop/main)에서만 캐시 갱신하여 용량 절약
+                    cache-read-only: ${{ github.event_name == 'pull_request' }}
 
             -   name: Generate local.properties
                 run: echo '${{ secrets.LOCAL_PROPERTIES }}' | base64 -d > ./local.properties
@@ -70,10 +76,14 @@ jobs:
             -   name: Setup Android SDK
                 uses: android-actions/setup-android@v2
 
+            # 캐시 저장/정리는 job 완료 후 post action 단계에서 수행
             -   name: Setup Gradle
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/actions/setup-gradle@v4
                 with:
-                    gradle-home-cache-cleanup: true
+                    # 빌드 성공 시 미사용 캐시 엔트리 자동 정리 (default: on-success)
+                    # cache-cleanup: on-success
+                    # PR에서는 캐시 읽기만 허용, push(develop/main)에서만 캐시 갱신하여 용량 절약
+                    cache-read-only: ${{ github.event_name == 'pull_request' }}
 
             -   name: Generate local.properties
                 run: echo '${{ secrets.LOCAL_PROPERTIES }}' | base64 -d > ./local.properties
@@ -84,5 +94,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

README.md

@@ -1,6 +1,6 @@
 # Reed - 문장과 감정을 함께 담는 독서 기록
 
-[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.0-blue.svg)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.21-blue.svg)](https://kotlinlang.org)
 [![Gradle](https://img.shields.io/badge/gradle-8.11.1-green.svg)](https://gradle.org/)
 [![Android Studio](https://img.shields.io/badge/Android%20Studio-2025.1.2%20%28Narwhal%29-green)](https://developer.android.com/studio)
 [![minSdkVersion](https://img.shields.io/badge/minSdkVersion-28-red)](https://developer.android.com/distribute/best-practices/develop/target-sdk)
@@ -37,15 +37,19 @@
 | <img width="230" alt="기록 카드 공유" src="https://github.com/user-attachments/assets/4c01a5ed-e5a2-4be4-b950-96a457c87ad7" /> |
 
 ## TroubleShooting
-- [[Compose] M3 ModalBottomSheet 드래그(터치 이벤트) 막는 법](https://velog.io/@mraz3068/Compose-M3-ModalBottomSheet-Drag-Disabled)
+- [Metro 적용해보기](https://velog.io/@mraz3068/Metro-Apply)
+- [Compose Stability Analyzer 사용 후기](https://velog.io/@mraz3068/compose-stability-analyzer-review)
+- [[Android] Toast 내부 구현 확인 해보기](https://velog.io/@mraz3068/Android-Toast-Deep-Dive)
+- [Coroutine CancellationException 따로 처리해야하는 케이스](https://velog.io/@mraz3068/Coroutine-CancellationException-UseCase)
+- [Coroutine 에러 처리 패턴: 여러 API 호출을 한 번에 성공/실패 판정하기](https://velog.io/@syoon513/Coroutine-%EC%98%88%EC%99%B8-%EC%B2%98%EB%A6%AC)
+- [[Circuit] ImpressionEffect](https://velog.io/@mraz3068/Circuit-ImpressionEffect)
+- [[Android] 일회성 이벤트를 StateFlow, Compose의 State로 처리할 때 주의해야할 점](https://velog.io/@mraz3068/Handle-One-Time-Event-As-State)
+- [Jetpack Compose에서 CameraX + MLKit으로 OCR을 구현해보자](https://velog.io/@syoon513/Jetpack-Compose%EC%97%90%EC%84%9C-CameraX-MLKit%EC%9C%BC%EB%A1%9C-OCR%EC%9D%84-%EA%B5%AC%ED%98%84%ED%95%B4%EB%B3%B4%EC%9E%90)
 - [Circuit 찍먹해보기(부제: Circuit 희망편)](https://speakerdeck.com/easyhooon/circuit-jjigmeoghaebogi-buje-circuit-hyimangpyeon)
 - [Circuit 찍먹해보기(부제: Circuit 절망편)](https://speakerdeck.com/easyhooon/circuit-jjigmeoghaebogi-buje-circuit-jeolmangpyeon)
-- [Jetpack Compose에서 CameraX + MLKit으로 OCR을 구현해보자](https://velog.io/@syoon513/Jetpack-Compose%EC%97%90%EC%84%9C-CameraX-MLKit%EC%9C%BC%EB%A1%9C-OCR%EC%9D%84-%EA%B5%AC%ED%98%84%ED%95%B4%EB%B3%B4%EC%9E%90)
-- [[Android] 일회성 이벤트를 StateFlow, Compose의 State로 처리할 때 주의해야할 점](https://velog.io/@mraz3068/Handle-One-Time-Event-As-State)
 - [Circuit Navigation 사용 시 feature 모듈간의 참조는 어떻게 해결했을까?](https://velog.io/@syoon513/Circuit-Navigation-%EC%82%AC%EC%9A%A9-%EC%8B%9C-feature-%EB%AA%A8%EB%93%88%EA%B0%84-%EC%88%9C%ED%99%98-%EC%B0%B8%EC%A1%B0%EB%8A%94-%EC%96%B4%EB%96%BB%EA%B2%8C-%ED%95%B4%EA%B2%B0%ED%96%88%EC%9D%84%EA%B9%8C)
-- [Coroutine 에러 처리 패턴: 여러 API 호출을 한 번에 성공/실패 판정하기](https://velog.io/@syoon513/Coroutine-%EC%98%88%EC%99%B8-%EC%B2%98%EB%A6%AC)
-- [[Circuit] ImpressionEffect](https://velog.io/@mraz3068/Circuit-ImpressionEffect)
-- [Coroutine CancellationException 따로 처리해야하는 케이스](https://velog.io/@mraz3068/Coroutine-CancellationException-UseCase)
+- [[Compose] M3 ModalBottomSheet 드래그(터치 이벤트) 막는 법](https://velog.io/@mraz3068/Compose-M3-ModalBottomSheet-Drag-Disabled)
+
 
 ## Development
 
@@ -55,7 +59,7 @@
 - JDK : Java 17을 실행할 수 있는 JDK
     - (권장) Android Studio 설치 시 Embedded 된 JDK (Open JDK)
     - Java 17을 사용하는 JDK (Open JDK, AdoptOpenJDK, GraalVM)
-- Kotlin Language : 2.2.0
+- Kotlin Language : 2.2.21
 
 ### Language
 
@@ -76,8 +80,8 @@
     - Material3
 
 - [Circuit](https://github.com/slackhq/circuit)
-- ~~Google ML Kit~~ Google Cloud Vision
-- Dagger Hilt
+- ~~Google ML Kit~~ -> [Google Cloud Vision](https://cloud.google.com/vision)
+- ~~Dagger Hilt~~ -> [Metro](https://github.com/ZacSweers/metro)
 - Retrofit, OkHttp3
 - Lottie-Compose
 - Firebase(Analytics, Crashlytics, Remote Config)

app/build.gradle.kts

@@ -1,13 +1,14 @@
-@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
 
 plugins {
     alias(libs.plugins.booket.android.application)
     alias(libs.plugins.booket.android.application.compose)
-    alias(libs.plugins.booket.android.hilt)
     alias(libs.plugins.booket.android.firebase)
+    alias(libs.plugins.metro)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -50,8 +51,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 {
@@ -63,8 +65,8 @@ composeStabilityAnalyzer {
     enabled.set(true)
 }
 
-ksp {
-    arg("circuit.codegen.mode", "hilt")
+extensions.configure<KspExtension> {
+    arg("circuit.codegen.mode", "metro")
 }
 
 dependencies {
@@ -75,6 +77,7 @@ dependencies {
         projects.core.datastore.api,
         projects.core.datastore.impl,
         projects.core.designsystem,
+        projects.core.di,
         projects.core.model,
         projects.core.network,
         projects.core.ui,
@@ -105,7 +108,3 @@ dependencies {
     api(libs.circuit.codegen.annotation)
     ksp(libs.circuit.codegen.ksp)
 }
-
-fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
-}

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
 
     <application
         android:name=".BooketApplication"
+        android:appComponentFactory="com.ninecraft.booket.di.MetroAppComponentFactory"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -21,7 +22,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Booket"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        tools:replace="android:appComponentFactory">
 
         <provider
             android:name="androidx.startup.InitializationProvider"
@@ -83,7 +85,8 @@
 
         <service
             android:name=".ReedFirebaseMessagingService"
-            android:exported="false">
+            android:exported="false"
+            tools:ignore="Instantiatable">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

app/src/main/kotlin/com/ninecraft/booket/BooketApplication.kt

@@ -5,10 +5,13 @@ import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache
 import coil.util.DebugLogger
-import dagger.hilt.android.HiltAndroidApp
+import com.ninecraft.booket.di.AppGraph
+import dev.zacsweers.metro.createGraphFactory
 
-@HiltAndroidApp
 class BooketApplication : Application(), ImageLoaderFactory {
+
+    val appGraph by lazy { createGraphFactory<AppGraph.Factory>().create(this) }
+
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this)
             .diskCache {

app/src/main/kotlin/com/ninecraft/booket/ReedFirebaseMessagingService.kt

@@ -3,6 +3,7 @@ package com.ninecraft.booket
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.Service
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
@@ -11,20 +12,24 @@ import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.designsystem.R
+import com.ninecraft.booket.core.di.ServiceKey
 import com.ninecraft.booket.feature.main.MainActivity
-import dagger.hilt.android.AndroidEntryPoint
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@AndroidEntryPoint
-class ReedFirebaseMessagingService : FirebaseMessagingService() {
-
-    @Inject
-    lateinit var userRepository: UserRepository
+@ContributesIntoMap(AppScope::class, binding = binding<Service>())
+@ServiceKey(ReedFirebaseMessagingService::class)
+@Inject
+class ReedFirebaseMessagingService(
+    private val userRepository: UserRepository,
+) : FirebaseMessagingService() {
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 

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

@@ -0,0 +1,31 @@
+package com.ninecraft.booket.di
+
+import android.app.Activity
+import android.app.Service
+import android.content.Context
+import com.ninecraft.booket.core.di.ApplicationContext
+import com.ninecraft.booket.core.di.DataScope
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Multibinds
+import dev.zacsweers.metro.Provider
+import dev.zacsweers.metro.Provides
+import kotlin.reflect.KClass
+
+@DependencyGraph(
+    scope = AppScope::class,
+    additionalScopes = [DataScope::class],
+)
+interface AppGraph {
+
+    @Multibinds(allowEmpty = true)
+    val activityProviders: Map<KClass<out Activity>, Provider<Activity>>
+
+    @Multibinds(allowEmpty = true)
+    val serviceProviders: Map<KClass<out Service>, Provider<Service>>
+
+    @DependencyGraph.Factory
+    fun interface Factory {
+        fun create(@ApplicationContext @Provides context: Context): AppGraph
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.ninecraft.booket.di
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import com.slack.circuit.foundation.Circuit
+import com.slack.circuit.foundation.LocalCircuit
+import com.slack.circuit.runtime.Navigator
+import com.slack.circuit.runtime.presenter.Presenter
+import com.slack.circuit.runtime.ui.Ui
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Multibinds
+import dev.zacsweers.metro.Provides
+
+@ContributesTo(AppScope::class)
+interface CircuitGraph {
+
+    @Multibinds(allowEmpty = true)
+    fun presenterFactories(): Set<Presenter.Factory>
+
+    @Multibinds(allowEmpty = true)
+    fun uiFactories(): Set<Ui.Factory>
+
+    @Provides
+    fun provideCircuit(
+        presenterFactories: Set<Presenter.Factory>,
+        uiFactories: Set<Ui.Factory>,
+    ): Circuit {
+        return Circuit.Builder()
+            .addPresenterFactories(presenterFactories)
+            .addUiFactories(uiFactories)
+            .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
+            .setOnUnavailableContent { screen, modifier ->
+                val circuit = LocalCircuit.current
+                BasicText(
+                    text = """
+                      Route not available: ${screen.javaClass.name}.
+                      Presenter: ${circuit?.presenter(screen, Navigator.NoOp)?.javaClass}
+                      UI: ${circuit?.ui(screen)?.javaClass}
+                      All presenterFactories: ${circuit?.newBuilder()?.presenterFactories}
+                      All uiFactories: ${circuit?.newBuilder()?.uiFactories}
+                      """
+                        .trimIndent(),
+                    modifier = modifier.background(Color.Red),
+                    style = TextStyle(color = Color.Yellow),
+                )
+            }
+            .build()
+    }
+}