release: 1.3.1 버전 업데이트 (to develop)

app/proguard-rules.pro

@@ -20,11 +20,47 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# kakao login
--keep class com.kakao.sdk.**.model.* { <fields>; }
--keep class * extends com.google.gson.TypeAdapter
-
 # https://github.com/square/okhttp/pull/6792
 -dontwarn org.bouncycastle.jsse.**
 -dontwarn org.conscrypt.*
 -dontwarn org.openjsse.**
+
+# 카카오 SDK 관련 난독화 방지
+-keep class com.kakao.** { *; }
+-keep interface com.kakao.** { *; }
+-dontwarn com.kakao.**
+
+# 카카오 로그인 SDK
+-keep class com.kakao.sdk.** { *; }
+-keep interface com.kakao.sdk.** { *; }
+-dontwarn com.kakao.sdk.**
+
+# 카카오 인증 관련
+-keep class com.kakao.sdk.auth.** { *; }
+-keep class com.kakao.sdk.user.** { *; }
+-keep class com.kakao.sdk.common.** { *; }
+
+# 네트워크 통신 관련
+-keepclassmembers class * {
+    @com.kakao.sdk.** *;
+}
+
+# Retrofit/OkHttp
+-keep class retrofit2.** { *; }
+-keep class okhttp3.** { *; }
+-dontwarn retrofit2.**
+-dontwarn okhttp3.**
+
+# JSON 직렬화 관련
+-keep class com.google.gson.** { *; }
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Intent 관련 유지
+-keep class * extends android.app.Activity
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keep class *.BuildConfig { *; }

app/src/main/java/com/into/websoso/ui/notificationDetail/NotificationDetailActivity.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.addCallback
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import com.into.websoso.core.common.util.setupWhiteStatusBar
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
@@ -17,6 +18,7 @@ class NotificationDetailActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         this.setupWhiteStatusBar()
 
         handleBackPressed()

app/src/main/java/com/into/websoso/ui/notificationDetail/NotificationDetailScreen.kt

@@ -2,7 +2,10 @@ package com.into.websoso.ui.notificationDetail
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
@@ -26,7 +29,8 @@ fun NotificationDetailScreen(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .background(White)
+            .windowInsetsPadding(WindowInsets.systemBars),
     ) {
         NotificationAppBar(onBackButtonClick)
         NotificationDetailContent(

core/auth-kakao/build.gradle.kts

@@ -6,6 +6,14 @@ plugins {
 
 android {
     setNamespace("core.auth_kakao")
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+
+            consumerProguardFiles("consumer-rules.pro")
+        }
+    }
 }
 
 dependencies {

core/auth-kakao/consumer-rules.pro

@@ -0,0 +1,37 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+# consumer-rules.pro
+-keep class com.kakao.sdk.** { *; }
+-keep interface com.kakao.sdk.** { *; }
+-dontwarn com.kakao.sdk.**
+
+# 카카오 로그인 관련 클래스 보호
+-keep class com.kakao.sdk.auth.** { *; }
+-keep class com.kakao.sdk.user.** { *; }
+-keep class com.kakao.sdk.common.** { *; }
+
+# 네트워크 관련 (카카오 SDK 의존성)
+-keep class retrofit2.** { *; }
+-keep class okhttp3.** { *; }
+-dontwarn retrofit2.**
+-dontwarn okhttp3.**

core/auth-kakao/src/main/java/com/into/websoso/core/auth_kakao/KakaoAuthClient.kt

@@ -34,24 +34,36 @@ class KakaoAuthClient
 
         private fun loginWithKakaotalk(loginContinuation: CancellableContinuation<AuthToken>) {
             client.loginWithKakaoTalk(context) { token, error ->
-                if (error != null) {
-                    if (error is ClientError && error.reason == ClientErrorCause.Cancelled) {
-                        loginContinuation.resumeWithException(error)
+                when {
+                    error != null -> {
+                        when {
+                            error is ClientError && error.reason == ClientErrorCause.Cancelled -> {
+                                loginWithKakaoAccount(loginContinuation)
+                            }
+
+                            else -> loginWithKakaoAccount(loginContinuation)
+                        }
                     }
 
-                    loginWithKakaoAccount(loginContinuation)
-                } else if (token != null) {
-                    loginContinuation.resume(token.accessToken.toAuthToken())
+                    token != null -> loginContinuation.resume(token.accessToken.toAuthToken())
+
+                    else -> loginWithKakaoAccount(loginContinuation)
                 }
             }
         }
 
         private fun loginWithKakaoAccount(loginContinuation: CancellableContinuation<AuthToken>) {
             client.loginWithKakaoAccount(context) { token, error ->
-                if (error != null) {
-                    loginContinuation.resumeWithException(error)
-                } else if (token != null) {
-                    loginContinuation.resume(token.accessToken.toAuthToken())
+                when {
+                    error != null -> loginContinuation.resumeWithException(error)
+
+                    token != null -> loginContinuation.resume(token.accessToken.toAuthToken())
+
+                    else -> {
+                        loginContinuation.resumeWithException(
+                            IllegalStateException("Both token and error are null"),
+                        )
+                    }
                 }
             }
         }

feature/signin/build.gradle.kts

@@ -6,6 +6,14 @@ plugins {
 
 android {
     setNamespace("feature.signin")
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+
+            consumerProguardFiles("consumer-rules.pro")
+        }
+    }
 }
 
 dependencies {

feature/signin/consumer-rules.pro

@@ -0,0 +1,37 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+# consumer-rules.pro (feature.signin 모듈)
+-keep class com.kakao.sdk.** { *; }
+-keep interface com.kakao.sdk.** { *; }
+-dontwarn com.kakao.sdk.**
+
+# 카카오 로그인 관련 클래스 보호
+-keep class com.kakao.sdk.auth.** { *; }
+-keep class com.kakao.sdk.user.** { *; }
+-keep class com.kakao.sdk.common.** { *; }
+
+# 네트워크 관련 (카카오 SDK 의존성)
+-keep class retrofit2.** { *; }
+-keep class okhttp3.** { *; }
+-dontwarn retrofit2.**
+-dontwarn okhttp3.**

feature/signin/src/main/java/com/into/websoso/feature/signin/SignInScreen.kt

@@ -53,9 +53,7 @@ fun SignInScreen(
                 )
             }
 
-            ShowToast -> {
-                // TODO: 실패 시 커스텀 스낵 바 구현
-            }
+            ShowToast -> {}
 
             NavigateToHome -> websosoNavigator.navigateToMainActivity(context::startActivity)
 

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 # App Versioning
-versionCode = "10015"
-versionName = "1.2.0"
+versionCode = "10022"
+versionName = "1.3.1"
 
 # Gradle Plugin & Kotlin
 android-gradle-plugin = "8.1.3"