release v1.1.0

.github/workflows/android-cd.yml

@@ -38,16 +38,16 @@ jobs:
             -   name: Generate google-services.json
                 run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json
 
-            -   name: Extract Version Name from ApplicationConstants.kt
+            -   name: Extract Version Name from libs.versions.toml
                 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/')
+                    VERSION=$(grep "versionName" gradle/libs.versions.toml | sed -E 's/.*versionName\s*=\s*"([^"]+)".*/\1/')
                     if [[ -z "$VERSION" ]]; then
-                      echo "Error: ApplicationConstants.kt에서 VERSION_NAME 값을 추출하지 못했습니다." >&2
+                      echo "Error: toml에서 versionName 값을 추출하지 못했습니다." >&2
                       exit 1
                     fi
                     echo "version=v${VERSION}" >> "$GITHUB_OUTPUT"
-                    echo "Version extracted from ApplicationConstants.kt: v${VERSION}"
+                    echo "Version extracted from toml: v${VERSION}"
                 id: extract_version
 
             -   name: Generate Firebase Release Note

app/build.gradle.kts

@@ -88,6 +88,7 @@ dependencies {
         projects.feature.settings,
         projects.feature.splash,
         projects.feature.webview,
+        projects.feature.edit,
 
         libs.androidx.activity.compose,
         libs.androidx.startup,

app/src/main/AndroidManifest.xml

@@ -60,6 +60,18 @@
 
         </activity>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"
+                tools:replace="android:resource" />
+        </provider>
+
     </application>
 
 </manifest>

app/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <paths>
+        <external-path
+            name="external_files"
+            path="." />
+        <root-path
+            name="root"
+            path="." />
+    </paths>
+</resources>

build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -3,6 +3,7 @@ import com.ninecraft.booket.convention.ApplicationConstants
 import com.ninecraft.booket.convention.Plugins
 import com.ninecraft.booket.convention.applyPlugins
 import com.ninecraft.booket.convention.configureAndroid
+import com.ninecraft.booket.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -19,9 +20,9 @@ internal class AndroidApplicationConventionPlugin : Plugin<Project> {
                 configureAndroid(this)
 
                 defaultConfig {
-                    targetSdk = ApplicationConstants.TARGET_SDK
-                    versionName = ApplicationConstants.VERSION_NAME
-                    versionCode = ApplicationConstants.VERSION_CODE
+                    targetSdk = libs.versions.targetSdk.get().toInt()
+                    versionName = libs.versions.versionName.get()
+                    versionCode = libs.versions.versionCode.get().toInt()
                 }
             }
         }

build-logic/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -2,10 +2,10 @@ import com.android.build.gradle.LibraryExtension
 import com.ninecraft.booket.convention.Plugins
 import com.ninecraft.booket.convention.applyPlugins
 import com.ninecraft.booket.convention.configureAndroid
+import com.ninecraft.booket.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import com.ninecraft.booket.convention.ApplicationConstants
 
 internal class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -19,7 +19,7 @@ internal class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configureAndroid(this)
 
                 defaultConfig.apply {
-                    targetSdk = ApplicationConstants.TARGET_SDK
+                    targetSdk = libs.versions.targetSdk.get().toInt()
                 }
             }
         }

build-logic/src/main/kotlin/com/ninecraft/booket/convention/Android.kt

@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
 internal fun Project.configureAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
     extension.apply {
-        compileSdk = ApplicationConstants.COMPILE_SDK
+        compileSdk = libs.versions.compileSdk.get().toInt()
 
         defaultConfig {
-            minSdk = ApplicationConstants.MIN_SDK
+            minSdk = libs.versions.minSdk.get().toInt()
         }
 
         compileOptions {

build-logic/src/main/kotlin/com/ninecraft/booket/convention/ApplicationConstants.kt

@@ -3,11 +3,6 @@ package com.ninecraft.booket.convention
 import org.gradle.api.JavaVersion
 
 internal object ApplicationConstants {
-    const val MIN_SDK = 28
-    const val TARGET_SDK = 35
-    const val COMPILE_SDK = 35
-    const val VERSION_CODE = 3
-    const val VERSION_NAME = "1.0.0"
     const val JAVA_VERSION_INT = 17
     val javaVersion = JavaVersion.VERSION_17
 }

core/common/build.gradle.kts

@@ -9,6 +9,14 @@ plugins {
 
 android {
     namespace = "com.ninecraft.booket.core.common"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    defaultConfig {
+        buildConfigField("String", "PACKAGE_NAME", "\"${libs.versions.packageName.get()}\"")
+    }
 }
 
 dependencies {
@@ -18,6 +26,8 @@ dependencies {
 
         libs.kotlinx.collections.immutable,
 
+        platform(libs.firebase.bom),
+        libs.firebase.analytics,
         libs.logger,
     )
 }

core/common/src/main/kotlin/com/ninecraft/booket/core/common/analytics/AnalyticsHelper.kt

@@ -0,0 +1,25 @@
+package com.ninecraft.booket.core.common.analytics
+
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.analytics.logEvent
+import com.orhanobut.logger.Logger
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AnalyticsHelper @Inject constructor(
+    private val firebaseAnalytics: FirebaseAnalytics,
+) {
+
+    fun logScreenView(screenName: String) {
+        Logger.d("Analytics - Screen View: $screenName")
+        firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW) {
+            param(FirebaseAnalytics.Param.SCREEN_NAME, screenName)
+        }
+    }
+
+    fun logEvent(eventName: String) {
+        Logger.d("Analytics - Event: $eventName")
+        firebaseAnalytics.logEvent(eventName) {}
+    }
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/analytics/di/AnalyticsModule.kt

@@ -0,0 +1,21 @@
+package com.ninecraft.booket.core.common.analytics.di
+
+import com.google.firebase.Firebase
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.analytics.analytics
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AnalyticsModule {
+
+    @Provides
+    @Singleton
+    fun provideFirebaseAnalytics(): FirebaseAnalytics {
+        return Firebase.analytics
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.ninecraft.booket.core.common.constants
 
+import androidx.annotation.StringRes
+
 data class ErrorDialogSpec(
     val message: String,
-    val buttonLabel: String,
+    @StringRes val buttonLabelResId: Int,
     val action: () -> Unit,
 )

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Context.kt

@@ -0,0 +1,69 @@
+package com.ninecraft.booket.core.common.extensions
+
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.ninecraft.booket.core.common.BuildConfig
+import android.graphics.Bitmap
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
+import androidx.core.app.ShareCompat
+import androidx.core.content.FileProvider
+import com.orhanobut.logger.Logger
+import java.io.File
+
+@Suppress("TooGenericExceptionCaught")
+fun Context.externalShareForBitmap(bitmap: ImageBitmap) {
+    try {
+        val file = File(bitmap.saveToDisk(this))
+        val uri = FileProvider.getUriForFile(this, "$packageName.provider", file)
+
+        ShareCompat.IntentBuilder(this)
+            .setStream(uri)
+            .setType("image/png")
+            .startChooser()
+    } catch (e: Exception) {
+        Logger.e("[externalShareFoBitmap] message: ${e.message}")
+    }
+}
+
+@Suppress("TooGenericExceptionCaught")
+fun Context.saveImageToGallery(bitmap: ImageBitmap) {
+    try {
+        val fileName = "reed_record_${System.currentTimeMillis()}.png"
+        val contentValues = ContentValues().apply {
+            put(MediaStore.Images.Media.DISPLAY_NAME, fileName)
+            put(MediaStore.Images.Media.MIME_TYPE, "image/png")
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES)
+                put(MediaStore.Images.Media.IS_PENDING, 1)
+            }
+        }
+
+        val imageUri =
+            contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+        imageUri?.let { uri ->
+            contentResolver.openOutputStream(uri)?.use { outputStream ->
+                bitmap.asAndroidBitmap().compress(Bitmap.CompressFormat.PNG, 100, outputStream)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                contentValues.clear()
+                contentValues.put(MediaStore.Images.Media.IS_PENDING, 0)
+                contentResolver.update(uri, contentValues, null, null)
+            }
+        }
+    } catch (e: Exception) {
+        Logger.e("Failed to save image to gallery: ${e.message}")
+    }
+}
+
+fun Context.openPlayStore() {
+    val intent =
+        Intent(Intent.ACTION_VIEW, "market://details?id=${BuildConfig.PACKAGE_NAME}".toUri())
+    startActivity(intent)
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/ImageBitmap.kt

@@ -0,0 +1,21 @@
+package com.ninecraft.booket.core.common.extensions
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
+import java.io.File
+import java.io.FileOutputStream
+
+fun ImageBitmap.saveToDisk(context: Context): String {
+    val fileName = "shared_image_${System.currentTimeMillis()}.png"
+    val cachePath = File(context.cacheDir, "images").also { it.mkdirs() }
+    val file = File(cachePath, fileName)
+    val outputStream = FileOutputStream(file)
+
+    asAndroidBitmap().compress(Bitmap.CompressFormat.PNG, 100, outputStream)
+    outputStream.flush()
+    outputStream.close()
+
+    return file.absolutePath
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Modifier.kt

@@ -6,6 +6,9 @@ import androidx.compose.material3.ripple
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.layer.GraphicsLayer
+import androidx.compose.ui.graphics.layer.drawLayer
 import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.semantics.Role
 import com.ninecraft.booket.core.common.utils.MultipleEventsCutter
@@ -45,3 +48,9 @@ fun Modifier.clickableSingle(
         interactionSource = remember { MutableInteractionSource() },
     )
 }
+
+fun Modifier.captureToGraphicsLayer(graphicsLayer: GraphicsLayer) =
+    this.drawWithContent {
+        graphicsLayer.record { this@drawWithContent.drawContent() }
+        drawLayer(graphicsLayer)
+    }

core/common/src/main/kotlin/com/ninecraft/booket/core/common/util/VersionUtils.kt

@@ -0,0 +1,43 @@
+package com.ninecraft.booket.core.common.util
+
+import com.orhanobut.logger.Logger
+
+/**
+ * 두 버전을 비교하는 함수
+ *
+ * @param version1 첫 번째 버전 (예: "1.2.3")
+ * @param version2 두 번째 버전 (예: "1.1.0")
+ * @return 양수면 version1 > version2, 음수면 version1 < version2, 0이면 같음
+ *
+ * 버전 형식: "메이저.마이너.패치" (예: 1.2.3)
+ * 비교 순서: 메이저 → 마이너 → 패치 버전 순으로 비교
+ */
+fun compareVersions(version1: String, version2: String): Int {
+    Logger.d("compareVersions: version1: $version1, version2: $version2")
+
+    if (!Regex("""^\d+\.\d+\.\d+$""").matches(version1)) return 0
+    if (!Regex("""^\d+\.\d+\.\d+$""").matches(version2)) return 0
+
+    val v1 = version1.split('.').map { it.toInt() }
+    val v2 = version2.split('.').map { it.toInt() }
+
+    // 메이저 버전 비교
+    if (v1[0] != v2[0]) return v1[0] - v2[0]
+
+    // 마이너 버전 비교
+    if (v1[1] != v2[1]) return v1[1] - v2[1]
+
+    // 패치 버전 비교
+    return v1[2] - v2[2]
+}
+
+/**
+ * 현재 앱 버전이 최소 요구 버전보다 낮은지 확인하는 함수
+ *
+ * @param currentVersion 현재 앱의 버전 (예: "1.0.0")
+ * @param minVersion 최소 요구 버전 (Firebase Remote Config에서 가져온 값)
+ * @return true면 강제 업데이트 필요 (현재 버전 < 최소 요구 버전), false면 업데이트 불필요
+ */
+fun isUpdateRequired(currentVersion: String, minVersion: String): Boolean {
+    return compareVersions(currentVersion, minVersion) < 0
+}