From 0e7854099e2359893b1531a9ff1ee5c22df11787 Mon Sep 17 00:00:00 2001 From: flash159483 Date: Mon, 25 Nov 2024 21:02:36 +0900 Subject: [PATCH] =?UTF-8?q?[fix]#201:=20=EC=B2=AB=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=95=88=EB=82=B4=20=EC=82=AD=EC=A0=9C=ED=95=B4?= =?UTF-8?q?=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bff/wespot/domain/util/DataStoreKey.kt | 1 - .../bff/wespot/vote/screen/VoteHomeScreen.kt | 27 ------------------- .../bff/wespot/vote/state/home/VoteAction.kt | 2 -- .../bff/wespot/vote/state/home/VoteUiState.kt | 1 - .../vote/viewmodel/VoteHomeViewModel.kt | 20 -------------- feature/vote/src/main/res/values/strings.xml | 4 --- 6 files changed, 55 deletions(-) diff --git a/domain/src/main/kotlin/com/bff/wespot/domain/util/DataStoreKey.kt b/domain/src/main/kotlin/com/bff/wespot/domain/util/DataStoreKey.kt index b6883944..2911dcf2 100644 --- a/domain/src/main/kotlin/com/bff/wespot/domain/util/DataStoreKey.kt +++ b/domain/src/main/kotlin/com/bff/wespot/domain/util/DataStoreKey.kt @@ -6,7 +6,6 @@ object DataStoreKey { const val REFRESH_TOKEN_EXPIRED_AT = "refresh_token_expired_date" const val SIGN_UP_TOKEN = "signup_token" const val PUSH_TOKEN = "push_token" - const val SETTING_DIALOG = "setting_dialog" const val VOTE_ONBOARDING = "vote_onboarding" const val IS_NOTIFICATION_SET_UP = "is_notification_set_up" const val NAME = "name" diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteHomeScreen.kt b/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteHomeScreen.kt index 247e2735..c6de5a28 100644 --- a/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteHomeScreen.kt +++ b/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteHomeScreen.kt @@ -40,7 +40,6 @@ import com.bff.wespot.designsystem.component.banner.WSBanner import com.bff.wespot.designsystem.component.banner.WSBannerType import com.bff.wespot.designsystem.component.button.WSButton import com.bff.wespot.designsystem.component.indicator.WSHomeTabRow -import com.bff.wespot.designsystem.component.modal.WSDialog import com.bff.wespot.designsystem.theme.Gray100 import com.bff.wespot.designsystem.theme.Gray600 import com.bff.wespot.designsystem.theme.StaticTypeScale @@ -65,7 +64,6 @@ import com.bff.wespot.vote.ui.VoteCard import com.bff.wespot.vote.viewmodel.VoteHomeViewModel import com.ramcosta.composedestinations.annotation.Destination import kotlinx.collections.immutable.persistentListOf -import kotlinx.coroutines.delay import org.orbitmvi.orbit.compose.collectAsState import java.time.LocalDate @@ -121,23 +119,6 @@ internal fun VoteHomeScreen( } } - if (state.showSettingDialog) { - WSDialog( - title = stringResource(R.string.show_profile_setting), - subTitle = stringResource(R.string.write_introduction), - okButtonText = stringResource(R.string.sure), - cancelButtonText = stringResource(R.string.next_time), - okButtonClick = { - voteNavigator.navigateToCharacterScreen() - action(VoteAction.ChangeSettingDialog(false)) - }, - cancelButtonClick = { - action(VoteAction.ChangeSettingDialog(false)) - }, - onDismissRequest = {}, - ) - } - OnLifecycleEvent { owner, event -> when (event) { Lifecycle.Event.ON_RESUME -> { @@ -151,14 +132,6 @@ internal fun VoteHomeScreen( else -> {} } } - - LaunchedEffect(Unit) { - delay(EDIT_POPUP_TIME) - action(VoteAction.GetSettingDialogOption) - if (state.kakaoContent == KakaoContent.EMPTY) { - action(VoteAction.GetKakaoContent) - } - } } @Composable diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteAction.kt b/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteAction.kt index 8eaf67e6..145ad3ed 100644 --- a/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteAction.kt +++ b/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteAction.kt @@ -5,7 +5,5 @@ sealed class VoteAction { data object EndDate : VoteAction() data class GetFirst(val date: String) : VoteAction() data class OnTabChanged(val index: Int) : VoteAction() - data object GetSettingDialogOption : VoteAction() - data class ChangeSettingDialog(val showDialog: Boolean) : VoteAction() data object GetKakaoContent : VoteAction() } diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteUiState.kt b/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteUiState.kt index 7f2145ba..7c16c25d 100644 --- a/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteUiState.kt +++ b/feature/vote/src/main/java/com/bff/wespot/vote/state/home/VoteUiState.kt @@ -7,7 +7,6 @@ data class VoteUiState( val voteResults: List = emptyList(), val isLoading: Boolean = false, val selectedTabIndex: Int = 0, - val showSettingDialog: Boolean = false, val playStoreLink: String, val kakaoContent: KakaoContent = KakaoContent.EMPTY, ) diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/viewmodel/VoteHomeViewModel.kt b/feature/vote/src/main/java/com/bff/wespot/vote/viewmodel/VoteHomeViewModel.kt index 35cd43ab..93548253 100644 --- a/feature/vote/src/main/java/com/bff/wespot/vote/viewmodel/VoteHomeViewModel.kt +++ b/feature/vote/src/main/java/com/bff/wespot/vote/viewmodel/VoteHomeViewModel.kt @@ -4,10 +4,8 @@ import androidx.lifecycle.viewModelScope import com.bff.wespot.common.extension.onNetworkFailure import com.bff.wespot.common.util.toDateTimeString import com.bff.wespot.domain.repository.CommonRepository -import com.bff.wespot.domain.repository.DataStoreRepository import com.bff.wespot.domain.repository.firebase.config.RemoteConfigRepository import com.bff.wespot.domain.repository.vote.VoteRepository -import com.bff.wespot.domain.util.DataStoreKey import com.bff.wespot.domain.util.RemoteConfigKey import com.bff.wespot.model.common.KakaoSharingType import com.bff.wespot.ui.base.BaseViewModel @@ -36,7 +34,6 @@ import javax.inject.Inject @HiltViewModel class VoteHomeViewModel @Inject constructor( private val voteRepository: VoteRepository, - private val dataStoreRepository: DataStoreRepository, private val remoteConfigRepository: RemoteConfigRepository, private val commonRepository: CommonRepository, ) : BaseViewModel(), ContainerHost { @@ -69,8 +66,6 @@ class VoteHomeViewModel @Inject constructor( is VoteAction.EndDate -> stopUpdatingDate() is VoteAction.GetFirst -> getFirstVoteResults(action.date) is VoteAction.OnTabChanged -> onTabChanged(action.index) - is VoteAction.GetSettingDialogOption -> getSetting() - is VoteAction.ChangeSettingDialog -> changeSettingDialog(action.showDialog) VoteAction.GetKakaoContent -> getKakaoContent() } } @@ -111,21 +106,6 @@ class VoteHomeViewModel @Inject constructor( reduce { state.copy(selectedTabIndex = index) } } - private fun getSetting() = intent { - viewModelScope.launch(coroutineDispatcher) { - dataStoreRepository.getBoolean(DataStoreKey.SETTING_DIALOG).collect { - if (!it) { - reduce { state.copy(showSettingDialog = !it) } - } - } - } - } - - private fun changeSettingDialog(showDialog: Boolean) = intent { - reduce { state.copy(showSettingDialog = showDialog) } - dataStoreRepository.saveBoolean(DataStoreKey.SETTING_DIALOG, true) - } - private fun getKakaoContent() = intent { viewModelScope.launch(coroutineDispatcher) { commonRepository.getKakaoContent(KakaoSharingType.TELL.name) diff --git a/feature/vote/src/main/res/values/strings.xml b/feature/vote/src/main/res/values/strings.xml index 7077cf3c..39ee9b9c 100644 --- a/feature/vote/src/main/res/values/strings.xml +++ b/feature/vote/src/main/res/values/strings.xml @@ -40,10 +40,6 @@ 우리 반 친구가 아닌가요? 우리 반 친구를 잘못 신고한 것이 확인될 경우 서비스 이용에 제한이 생실 수 았어요 네 아니에요 - 프로필 설정을 해볼까요? - 친구들이 알아볼 수 있도록\n캐릭터 선택과 한 줄 소개 작성을 완료해 주세요 - 네 좋아요 - 다음에 할래요 프로필 설정을 중단하시나요? 선택하셨던 캐릭터와 배경색은 저장되지 않으며\n기본 캐릭터와 배경색으로 자동 설정됩니다 네 중단할래요