diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt index 82769d1d..05cb5cfe 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt +++ b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt @@ -3,10 +3,8 @@ package org.sopt.dateroad.data.mapper.todata import org.sopt.dateroad.domain.model.EditProfile import org.sopt.dateroad.domain.model.Profile -fun Profile.toEditProfile(): EditProfile { - return EditProfile( - name = this.name, - tags = this.tag, - image = this.imageUrl ?: "" - ) -} +fun Profile.toEditProfile(): EditProfile = EditProfile( + name = this.name, + tags = this.tag, + image = this.imageUrl +) diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt b/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt index a6373dea..6a09be0f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt +++ b/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt @@ -3,5 +3,5 @@ package org.sopt.dateroad.domain.model data class EditProfile( val name: String = "", val tags: List = listOf(), - val image: String? = null + val image: String? = "" ) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt index 30211ab6..3e0a3157 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt @@ -85,7 +85,7 @@ fun ProfileRoute( when (profileSideEffect) { is ProfileContract.ProfileSideEffect.NavigateToHome -> navigationToHome() is ProfileContract.ProfileSideEffect.NavigateToMyPage -> navigationToMyPage() - else -> {} + is ProfileContract.ProfileSideEffect.PopBackStack -> popBackStack() } } } @@ -117,7 +117,6 @@ fun ProfileRoute( ) } - LoadState.Loading -> DateRoadLoadingView() LoadState.Success -> navigationToHome() LoadState.Error -> DateRoadErrorView()