Merge branch 'develop' into BOOK-364-feature/#193

Author: seoyoon513

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

@@ -12,6 +12,7 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
             applyPlugins(
                 Plugins.ANDROID_LIBRARY,
                 Plugins.KOTLIN_COMPOSE,
+                Plugins.COMPOSE_STABILITY_ANALYZER,
             )
 
             extensions.configure<LibraryExtension> {

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

@@ -11,6 +11,8 @@ object Plugins {
     const val ANDROID_APPLICATION = "com.android.application"
     const val ANDROID_LIBRARY = "com.android.library"
 
+    const val COMPOSE_STABILITY_ANALYZER = "com.github.skydoves.compose.stability.analyzer"
+
     const val HILT = "dagger.hilt.android.plugin"
     const val KSP = "com.google.devtools.ksp"
     const val GOOGLE_SERVICES = "com.google.gms.google-services"

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.gradle.dependency.handler.extensions)
     alias(libs.plugins.kotlin.detekt)
     alias(libs.plugins.kotlin.ktlint)
+    alias(libs.plugins.compose.stability.analyzer) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false

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

@@ -3,6 +3,7 @@ package com.ninecraft.booket.core.common.constants
 import androidx.annotation.StringRes
 
 data class ErrorDialogSpec(
+    val title: String? = null,
     val message: String,
     @StringRes val buttonLabelResId: Int,
     val action: () -> Unit,

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

@@ -1,5 +1,5 @@
 package com.ninecraft.booket.core.common.constants
 
 enum class ErrorScope {
-    GLOBAL, LOGIN, BOOK_REGISTER, RECORD_REGISTER
+    GLOBAL, LOGIN, AUTH_SESSION_EXPIRED,
 }

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

@@ -16,7 +16,6 @@ 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))
@@ -31,7 +30,6 @@ fun Context.externalShareForBitmap(bitmap: ImageBitmap) {
     }
 }
 
-@Suppress("TooGenericExceptionCaught")
 fun Context.saveImageToGallery(bitmap: ImageBitmap) {
     try {
         val fileName = "reed_record_${System.currentTimeMillis()}.png"

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

@@ -0,0 +1,12 @@
+package com.ninecraft.booket.core.common.extensions
+
+import com.ninecraft.booket.core.common.utils.ErrorType
+import com.ninecraft.booket.core.common.utils.isNetworkError
+
+fun Throwable.toErrorType(): ErrorType {
+    return if (this.isNetworkError()) {
+        ErrorType.NetworkError
+    } else {
+        ErrorType.ServerError
+    }
+}

…oket/core/common/util/EmotionAnalyzer.kt …ket/core/common/utils/EmotionAnalyzer.ktcore/common/src/main/kotlin/com/ninecraft/booket/core/common/util/EmotionAnalyzer.kt renamed to core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/EmotionAnalyzer.kt core/common/src/main/kotlin/com/ninecraft/booket/core/common/util/EmotionAnalyzer.kt renamed to core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/EmotionAnalyzer.kt

@@ -1,4 +1,4 @@
-package com.ninecraft.booket.core.common.util
+package com.ninecraft.booket.core.common.utils
 
 import com.ninecraft.booket.core.model.EmotionModel
 

core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/ErrorType.kt

@@ -0,0 +1,9 @@
+package com.ninecraft.booket.core.common.utils
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface ErrorType {
+    data object NetworkError : ErrorType
+    data object ServerError : ErrorType
+}

core/common/src/main/kotlin/com/ninecraft/booket/core/common/utils/HandleException.kt

@@ -23,7 +23,13 @@ fun handleException(
 ) {
     when {
         exception is HttpException && exception.code() == 401 -> {
-            onLoginRequired()
+            postErrorDialog(
+                errorScope = ErrorScope.AUTH_SESSION_EXPIRED,
+                exception = exception,
+                action = {
+                    onLoginRequired()
+                },
+            )
         }
 
         exception is HttpException -> {
@@ -51,56 +57,42 @@ fun postErrorDialog(
     @StringRes buttonLabelResId: Int = R.string.confirm,
     action: () -> Unit = {},
 ) {
-    val spec = buildDialog(
-        scope = errorScope,
-        exception = exception,
-        buttonLabelResId = buttonLabelResId,
-        action = action,
-    )
-
-    ErrorEventHelper.sendError(event = ErrorEvent.ShowDialog(spec))
-}
-
-private fun buildDialog(
-    scope: ErrorScope,
-    exception: Throwable,
-    @StringRes buttonLabelResId: Int,
-    action: () -> Unit,
-): ErrorDialogSpec {
-    val message = when {
+    val (title, message) = when {
         exception.isNetworkError() -> {
-            "네트워크 연결이 불안정합니다.\n인터넷 연결을 확인해주세요"
+            null to "네트워크 연결이 불안정합니다.\n인터넷 연결을 확인해주세요"
         }
 
         exception is HttpException -> {
-            when (scope) {
+            when (errorScope) {
                 ErrorScope.GLOBAL -> {
-                    "알 수 없는 문제가 발생했어요.\n다시 시도해주세요"
+                    null to "알 수 없는 문제가 발생했어요.\n다시 시도해주세요"
                 }
 
                 ErrorScope.LOGIN -> {
-                    "예기치 않은 오류가 발생했습니다.\n다시 로그인 해주세요."
+                    "로그인 오류" to "예기치 않은 오류가 발생했습니다.\n다시 로그인 해주세요."
                 }
 
-                ErrorScope.BOOK_REGISTER -> {
-                    "도서 등록 중 오류가 발생했어요.\n다시 시도해주세요"
-                }
-
-                ErrorScope.RECORD_REGISTER -> {
-                    "기록 저장에 실패했어요.\n다시 시도해주세요"
+                ErrorScope.AUTH_SESSION_EXPIRED -> {
+                    null to "세션이 만료되었어요.\n다시 로그인 해주세요"
                 }
             }
         }
 
         else -> {
-            "알 수 없는 문제가 발생했어요.\n다시 시도해주세요"
+            null to "알 수 없는 문제가 발생했어요.\n다시 시도해주세요"
         }
     }
 
-    return ErrorDialogSpec(message = message, buttonLabelResId = buttonLabelResId, action = action)
+    val spec = ErrorDialogSpec(
+        title = title,
+        message = message,
+        buttonLabelResId = buttonLabelResId,
+        action = action,
+    )
+
+    ErrorEventHelper.sendError(event = ErrorEvent.ShowDialog(spec))
 }
 
-@Suppress("TooGenericExceptionCaught")
 private fun HttpException.parseErrorMessage(): String? {
     return try {
         val errorBody = response()?.errorBody()?.string()