From d804e91095fedc0f8cd2f4c8ca91569c4e3fd377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=86=A0=EB=A7=88=EC=8A=A4?= <123928686+ki960213@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:43:02 +0900 Subject: [PATCH] =?UTF-8?q?merge:=20=EB=82=B4=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(MyProfileScreenUiState): 한 줄 소개가 비어있으면 소개말이 없다는 표시 추가 * chore(build.gradle.kts): 빌드 실패 문제 해결 --- android/2023-emmsale/app/build.gradle.kts | 24 ++----------------- .../uiState/MyProfileScreenUiState.kt | 4 +++- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/android/2023-emmsale/app/build.gradle.kts b/android/2023-emmsale/app/build.gradle.kts index e61c143de..bee3cc310 100644 --- a/android/2023-emmsale/app/build.gradle.kts +++ b/android/2023-emmsale/app/build.gradle.kts @@ -1,4 +1,5 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties +import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension plugins { id("org.jetbrains.kotlin.android") @@ -6,6 +7,7 @@ plugins { 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 { - 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 { - mappingFileUploadEnabled = false - } - } - create("prod") { - dimension = "environment" - configure { - mappingFileUploadEnabled = true - } - } - } } fun getApiKey(propertyKey: String): String { diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/myProfile/uiState/MyProfileScreenUiState.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/myProfile/uiState/MyProfileScreenUiState.kt index 9c7102e35..0bc0b45f7 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/main/myProfile/uiState/MyProfileScreenUiState.kt +++ b/android/2023-emmsale/app/src/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)