diff --git a/app/src/main/java/com/smashing/app/data/repository/api/UserRepository.kt b/app/src/main/java/com/smashing/app/data/repository/api/UserRepository.kt index 273cae852..fa86c58ce 100644 --- a/app/src/main/java/com/smashing/app/data/repository/api/UserRepository.kt +++ b/app/src/main/java/com/smashing/app/data/repository/api/UserRepository.kt @@ -1,13 +1,11 @@ package com.smashing.app.data.repository.api -import com.smashing.app.data.model.review.GameReviewResult import com.smashing.app.data.model.profile.user.UserProfileInfo +import com.smashing.app.data.model.review.GameReviewResult interface UserRepository { suspend fun getUserProfileId(): String? suspend fun getUserNickname(): String? - suspend fun setUserInfo(userProfileId: String, userNickname: String) - suspend fun clearUserInfo() suspend fun getUserInfoDetail( userProfileId: String, sportCode: String?, diff --git a/app/src/main/java/com/smashing/app/data/repository/impl/UserRepositoryImpl.kt b/app/src/main/java/com/smashing/app/data/repository/impl/UserRepositoryImpl.kt index 34f0fb727..3f47d2ebe 100644 --- a/app/src/main/java/com/smashing/app/data/repository/impl/UserRepositoryImpl.kt +++ b/app/src/main/java/com/smashing/app/data/repository/impl/UserRepositoryImpl.kt @@ -21,12 +21,6 @@ class UserRepositoryImpl @Inject constructor( override suspend fun getUserNickname(): String? = localUserDataSource.getUserNickName() - override suspend fun setUserInfo(userProfileId: String, userNickname: String) = - localUserDataSource.setUserInfo(userProfileId, userNickname) - - override suspend fun clearUserInfo() = - localUserDataSource.clearUserInfo() - override suspend fun getUserInfoDetail( userProfileId: String, sportCode: String? diff --git a/app/src/main/java/com/smashing/app/data/type/SportType.kt b/app/src/main/java/com/smashing/app/data/type/SportType.kt index 25f16b2c3..0766389a7 100644 --- a/app/src/main/java/com/smashing/app/data/type/SportType.kt +++ b/app/src/main/java/com/smashing/app/data/type/SportType.kt @@ -22,8 +22,7 @@ enum class SportType( ); companion object { - fun findSportType(sportId: Long): SportType = entries.find { it.id == sportId } ?: PING_PONG fun findSportTypeToSportName(sportName: String): SportType = entries.find { it.sportName == sportName } ?: PING_PONG fun findSportTypeToSportCode(sportCode: String): SportType = entries.find { it.code == sportCode } ?: PING_PONG } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/smashing/app/presentation/confirmreview/ConfirmReviewScreen.kt b/app/src/main/java/com/smashing/app/presentation/confirmreview/ConfirmReviewScreen.kt index f4528c835..7ed67391c 100644 --- a/app/src/main/java/com/smashing/app/presentation/confirmreview/ConfirmReviewScreen.kt +++ b/app/src/main/java/com/smashing/app/presentation/confirmreview/ConfirmReviewScreen.kt @@ -20,13 +20,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.smashing.app.R.drawable.ic_thumbs_down_lg import com.smashing.app.R.drawable.ic_thumbs_up_double_lg import com.smashing.app.R.drawable.ic_thumbs_up_lg -import com.smashing.app.R.string.review import com.smashing.app.R.string.confirm import com.smashing.app.R.string.confirm_review_arrived_with_nickname +import com.smashing.app.R.string.review import com.smashing.app.core.designsystem.component.button.SmashingButton import com.smashing.app.core.designsystem.component.topbar.SmashingDefaultTopBar -import com.smashing.app.core.designsystem.style.ButtonStyle import com.smashing.app.core.designsystem.state.TopBarState +import com.smashing.app.core.designsystem.style.ButtonStyle import com.smashing.app.core.designsystem.theme.SmashingAndroidTheme import com.smashing.app.core.designsystem.theme.SmashingTheme import com.smashing.app.data.type.ReviewRatingType @@ -43,7 +43,6 @@ fun ConfirmReviewRoute( ConfirmReviewScreen( uiState = uiState, - onBackClick = navigateUp, onConfirmClick = navigateUp, modifier = modifier, ) @@ -52,7 +51,6 @@ fun ConfirmReviewRoute( @Composable private fun ConfirmReviewScreen( uiState: ConfirmReviewContract.State, - onBackClick: () -> Unit, onConfirmClick: () -> Unit, modifier: Modifier = Modifier, ) { @@ -126,7 +124,6 @@ private fun ConfirmReviewScreenPreview() { reviewText = "매너가 좋으셨습니다. 다음에 또 해요!", tags = persistentListOf("시간 약속을 잘 지켜요", "경기 매너가 좋아요"), ), - onBackClick = {}, onConfirmClick = {}, ) } diff --git a/app/src/main/java/com/smashing/app/presentation/notice/NoticeScreen.kt b/app/src/main/java/com/smashing/app/presentation/notice/NoticeScreen.kt index 94415e3f5..f844e32a7 100644 --- a/app/src/main/java/com/smashing/app/presentation/notice/NoticeScreen.kt +++ b/app/src/main/java/com/smashing/app/presentation/notice/NoticeScreen.kt @@ -21,6 +21,10 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.smashing.app.R +import com.smashing.app.R.string.no +import com.smashing.app.R.string.notice_change_dialog_change_btn +import com.smashing.app.R.string.notice_change_dialog_subtitle +import com.smashing.app.R.string.notice_change_dialog_title import com.smashing.app.core.designsystem.component.appicon.AppIcon import com.smashing.app.core.designsystem.component.dialog.SmashingDialog import com.smashing.app.core.designsystem.component.topbar.SmashingDefaultTopBar @@ -30,9 +34,11 @@ import com.smashing.app.core.designsystem.theme.SmashingAndroidTheme import com.smashing.app.core.designsystem.theme.SmashingTheme import com.smashing.app.core.extension.onBottomReached import com.smashing.app.data.model.notification.Notification +import com.smashing.app.data.type.SportType import com.smashing.app.presentation.matching.type.MatchingType import com.smashing.app.presentation.notice.component.NoticeItem + @Composable fun NoticeRoute( navigateUp: () -> Unit, @@ -136,14 +142,16 @@ private fun NoticeScreen( ) if (uiState.isChangeDialogVisible) { - val sportName = uiState.targetChangeSport.sportType.sportName + val sport = uiState.targetChangeSport.sportType + val sportText = sport.sportName + if (sport == SportType.BADMINTON) "으로" else "로" + SmashingDialog( - title = "${sportName}로 종목을 변경하시겠어요?", + title = stringResource(notice_change_dialog_title, sportText), onDismissClick = onDismissChangeProfile, - subtitle = "종목은 재변경 가능합니다.", + subtitle = stringResource(notice_change_dialog_subtitle), type = DialogStyle.ALERT, - confirmText = "변경하기", - dismissText = "아니요", + confirmText = stringResource(notice_change_dialog_change_btn), + dismissText = stringResource(no), onConfirmClick = onConfirmChangeProfile, ) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f9c72cc3..c3260db73 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,5 @@ - + + 매칭 탐색 @@ -361,14 +362,14 @@ 매칭 취소 대기 중 unknown 받은 매칭 - 받은 요청이 없어요 + 받은 매칭이 없어요 보낸 매칭 - 보낸 요청이 없어요 + 보낸 매칭이 없어요 매칭 확정 확정된 매칭이 없어요 직접 경쟁을 신청해보세요! 요청을 취소하시겠습니까? - 요청 취소 시 24시간 후 재요청할 수 있습니다. + 취소 시 24시간 후 재요청할 수 있습니다. 정말 매칭을 취소하시겠습니까? 매칭 상대도 동의해야 취소가 완료됩니다. @@ -384,6 +385,9 @@ 알림 + %s 종목을 변경하시겠어요? + 종목은 내 프로필에서 재변경 가능합니다. + 변경하기 + @@ -445,5 +449,4 @@ 정말 로그아웃하시겠습니까? -