Merge pull request #258 from Team-Clody/develop

[RELEASE/#257] Version 1.1.1 배포를 진행합니다.

Author: MoonsuKang

app/build.gradle.kts

@@ -25,8 +25,8 @@ android {
         applicationId = "com.sopt.clody"
         minSdk = 28
         targetSdk = 35
-        versionCode = 23
-        versionName = "1.1.0"
+        versionCode = 25
+        versionName = "1.1.1"
         val kakaoApiKey: String = properties.getProperty("kakao.api.key")
         val amplitudeApiKey: String = properties.getProperty("amplitude.api.key")
         val googleAdmobAppId: String = properties.getProperty("GOOGLE_ADMOB_APP_ID", "")
@@ -56,8 +56,8 @@ android {
         }
 
         release {
-            isMinifyEnabled = true
-            isShrinkResources = true
+            isMinifyEnabled = false
+            isShrinkResources = false
             buildConfigField("String", "CLODY_BASE_URL", properties["clody.base.url"].toString())
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),

app/src/main/java/com/sopt/clody/presentation/ui/home/screen/ScrollableCalendar.kt

@@ -29,9 +29,11 @@ fun ScrollableCalendar(
     onDiaryDataUpdated: (Int, String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    LaunchedEffect(selectedDate) {
-        homeViewModel.updateDiaryState(diaries)
-        onDiaryDataUpdated(homeViewModel.diaryCount.value, homeViewModel.replyStatus.value)
+    LaunchedEffect(selectedDate, diaries) {
+        if (selectedDate.year == selectedYear && selectedDate.monthValue == selectedMonth) {
+            homeViewModel.updateDiaryState(diaries)
+            onDiaryDataUpdated(homeViewModel.diaryCount.value, homeViewModel.replyStatus.value)
+        }
     }
     val scrollState = rememberScrollState()
 

app/src/main/java/com/sopt/clody/presentation/ui/replyloading/screen/ReplyLoadingScreen.kt

@@ -248,10 +248,9 @@ fun ReplyLoadingScreen(
                 )
 
                 Spacer(modifier = Modifier.heightForScreenPercentage(0.036f))
-                if (!isWaitingForPatchResponse && !isAdCompleted && !isFirstDiary) {
-                    QuickReplyAdButton(
-                        onClick = onShowAdClick,
-                    )
+                val shouldShowAdButton = !isComplete && !isAdCompleted && !isWaitingForPatchResponse && !isFirstDiary
+                if (shouldShowAdButton) {
+                    QuickReplyAdButton(onClick = onShowAdClick)
                 }
             }
         },

app/src/main/java/com/sopt/clody/presentation/ui/setting/navigation/SettingNavigator.kt

@@ -20,6 +20,8 @@ class SettingNavigator(
     }
 
     fun navigateBack() {
-        navController.navigateUp()
+        if (navController.currentBackStackEntry?.lifecycle?.currentState == androidx.lifecycle.Lifecycle.State.RESUMED) {
+            navController.popBackStack()
+        }
     }
 }