merge: 내 프로필 화면 수정

* feat(MyProfileScreenUiState): 한 줄 소개가 비어있으면 소개말이 없다는 표시 추가 * chore(build.gradle.kts): 빌드 실패 문제 해결
woowacourse-teams · Aug 2, 2023 · d804e91 · d804e91
1 parent 69f1f4a
commit d804e91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/android/2023-emmsale/app/build.gradle.kts b/android/2023-emmsale/app/build.gradle.kts
@@ -1,11 +1,13 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 
 plugins {
     id("org.jetbrains.kotlin.android")
     id("com.android.application") version "8.0.2"
     id("com.google.gms.google-services")
     kotlin("plugin.serialization") version "1.8.21"
     id("kotlin-kapt")
+    id("com.google.firebase.crashlytics")
 }
 
 android {
@@ -31,13 +33,6 @@ android {
         buildConfig = true
     }
     buildTypes {
-        getByName("debug") {
-            isMinifyEnabled = true
-            configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = false
-            }
-        }
-
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
@@ -67,21 +62,6 @@ android {
             events.addAll(arrayOf(org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED, org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED, org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED))
         }
     }
-    flavorDimensions += "environment"
-    productFlavors {
-        create("staging") {
-            dimension = "environment"
-            configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = false
-            }
-        }
-        create("prod") {
-            dimension = "environment"
-            configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = true
-            }
-        }
-    }
 }
 
 fun getApiKey(propertyKey: String): String {

diff --git a/...rc/main/java/com/emmsale/presentation/ui/main/myProfile/uiState/MyProfileScreenUiState.kt b/...rc/main/java/com/emmsale/presentation/ui/main/myProfile/uiState/MyProfileScreenUiState.kt
@@ -18,6 +18,8 @@ data class MyProfileScreenUiState(
     val isNotLogin: Boolean = false,
 ) {
     companion object {
+        private const val BLANK_DESCRIPTION_SUBSTITUTION = "소개말이 없습니다."
+
         val Loading = MyProfileScreenUiState(
             isLoading = true,
             isError = false,
@@ -39,7 +41,7 @@ data class MyProfileScreenUiState(
                 errorMessage = "",
                 memberId = member.id,
                 memberName = member.name,
-                description = member.description,
+                description = member.description.ifBlank { BLANK_DESCRIPTION_SUBSTITUTION },
                 memberImageUrl = member.imageUrl,
                 jobs = member.getActivities(ActivityType.JOB).map(ActivityUiState::from),
                 educations = member.getActivities(ActivityType.EDUCATION)