From f18dbf17975cf51dd5883d098cf83b9335f5cd4a Mon Sep 17 00:00:00 2001 From: arinming Date: Wed, 7 Feb 2024 22:06:59 +0900 Subject: [PATCH] =?UTF-8?q?FEAT:=20=EA=B8=B0=EB=B3=B8=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20/=20=EC=B6=94=EA=B0=80=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EA=B5=AC=EB=B6=84=20(#101)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/model/profile/edit/ProfileEditUiState.kt | 2 +- .../model/profile/edit/ProfileEditViewModel.kt | 4 ---- .../presentation/ui/profile/edit/ProfileEditScreen.kt | 8 ++++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditUiState.kt b/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditUiState.kt index 323d980..499a649 100644 --- a/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditUiState.kt +++ b/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditUiState.kt @@ -1,5 +1,5 @@ package com.kusitms.presentation.model.profile.edit data class ProfileEditUiState( - val currentSelectedProfileFilter: String = "", + val currentSelectedProfileFilter: String = "기본 프로필", ) diff --git a/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt b/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt index ddcc1ce..4bf9725 100644 --- a/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt +++ b/presentation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt @@ -136,10 +136,6 @@ class ProfileEditViewModel @Inject constructor( _introduce.value = introduce } - fun updateSignInStatus(signInStatus: SignInStatus) { - _signInStatus.value = signInStatus - } - private fun validateFields() { _isAllFieldsValid.value = _major.value.isNotBlank() && diff --git a/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileEditScreen.kt b/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileEditScreen.kt index 405608b..fbf2148 100644 --- a/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileEditScreen.kt +++ b/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileEditScreen.kt @@ -48,7 +48,7 @@ fun ProfileEditScreen( val scrollState = rememberScrollState() val expanded by viewModel.expended.collectAsStateWithLifecycle() - + val uiState by viewModel.uiState.collectAsState() Column { KusitsmTopBarBackTextWithIcon( @@ -101,7 +101,11 @@ fun ProfileEditScreen( verticalArrangement = Arrangement.Top, horizontalAlignment = Alignment.Start ) { - ProfileAdd() + if (uiState.currentSelectedProfileFilter == "기본 프로필") { + ProfileBasic(viewModel) + } else { + ProfileAdd(viewModel) + } } } }