[fix] #282 일정등록 2번째 뷰 불러오기 버튼 삭제 및 오타 수정

TeamDATEROAD · Oct 29, 2024 · b29b685 · b29b685
1 parent 2c3aaf4
commit b29b685
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -91,9 +91,11 @@ dependencies {
     implementation(libs.bundles.androidx)
     implementation(platform(libs.androidx.compose.bom))
 
+
     // Google
     implementation(platform(libs.google.firebase.bom))
     implementation(libs.google.firebase.crashlytics)
+    implementation(libs.firebase.crashlytics.buildtools)
 
     // Network
     implementation(platform(libs.okhttp.bom))

diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollScreen.kt
@@ -391,21 +391,23 @@ fun EnrollScreen(
                     leftIconResource = R.drawable.ic_top_bar_back_white,
                     onLeftIconClick = onTopBarBackButtonClick,
                     buttonContent = {
-                        Row {
-                            DateRoadFilledButton(
-                                isEnabled = true,
-                                textContent = stringResource(id = R.string.top_bar_button_text_load),
-                                onClick = onTopBarLoadButtonClick,
-                                textStyle = DateRoadTheme.typography.bodyMed13,
-                                enabledBackgroundColor = DateRoadTheme.colors.purple600,
-                                enabledTextColor = DateRoadTheme.colors.white,
-                                disabledBackgroundColor = DateRoadTheme.colors.gray200,
-                                disabledTextColor = DateRoadTheme.colors.gray400,
-                                cornerRadius = 20.dp,
-                                paddingHorizontal = 10.dp,
-                                paddingVertical = 5.dp
-                            )
-                            Spacer(modifier = Modifier.width(16.dp))
+                        if (enrollUiState.page == EnrollScreenType.FIRST) {
+                            Row {
+                                DateRoadFilledButton(
+                                    isEnabled = true,
+                                    textContent = stringResource(id = R.string.top_bar_button_text_load),
+                                    onClick = onTopBarLoadButtonClick,
+                                    textStyle = DateRoadTheme.typography.bodyMed13,
+                                    enabledBackgroundColor = DateRoadTheme.colors.purple600,
+                                    enabledTextColor = DateRoadTheme.colors.white,
+                                    disabledBackgroundColor = DateRoadTheme.colors.gray200,
+                                    disabledTextColor = DateRoadTheme.colors.gray400,
+                                    cornerRadius = 20.dp,
+                                    paddingHorizontal = 10.dp,
+                                    paddingVertical = 5.dp
+                                )
+                                Spacer(modifier = Modifier.width(16.dp))
+                            }
                         }
                     }
                 )
@@ -499,7 +501,7 @@ fun EnrollScreen(
         },
         titleText = stringResource(id = R.string.region_bottom_sheet_title),
         buttonText = stringResource(id = R.string.apply),
-        onButtonClick = { regoion, area -> onRegionBottomSheetButtonClick(regoion, area) },
+        onButtonClick = { region, area -> onRegionBottomSheetButtonClick(region, area) },
         onDismissRequest = onRegionBottomSheetDismissRequest
     )
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -31,6 +31,7 @@ pagingCommonAndroid = "3.3.2"
 googleServices = "4.4.2"
 firebaseCrashlytics = "3.0.2"
 firebaseBom = "33.3.0"
+firebaseCrashlyticsBuildtools = "3.0.2"
 
 # Accompanist
 accompanistPager = "0.25.0"
@@ -82,6 +83,7 @@ google-services = { group = "com.google.gms", name = "google-services", version.
 google-firebase-crashlytics-gradle = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlytics" }
 google-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
 google-firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
+firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
 
 # Accompanist
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanistPager" }
@@ -110,7 +112,6 @@ kakao-cert = { group = "com.kakao.sdk", name = "v2-cert", version.ref = "kakao"
 amplitude = { group = "com.amplitude", name = "analytics-android", version.ref = "amplitude" }
 lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottieCompose" }
 
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }