From 20abdaf2c138ffae4451bcfa7f87df0d39f82172 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sun, 26 Jan 2025 12:38:15 +0900 Subject: [PATCH] =?UTF-8?q?[FEATURE]#223=20:=20=EB=A1=9C=EB=94=A9=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wespot/entire/screen/setting/AccountSettingScreen.kt | 8 +++++++- .../wespot/entire/screen/setting/RevokeConfirmScreen.kt | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/AccountSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/AccountSettingScreen.kt index df69c788..1236ccbf 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/AccountSettingScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/AccountSettingScreen.kt @@ -27,7 +27,9 @@ import com.bff.wespot.entire.state.EntireAction import com.bff.wespot.entire.state.EntireSideEffect import com.bff.wespot.entire.viewmodel.EntireViewModel import com.bff.wespot.navigation.Navigator +import com.bff.wespot.ui.component.LoadingAnimation import com.ramcosta.composedestinations.annotation.Destination +import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect interface AccountSettingNavigator { @@ -47,6 +49,7 @@ fun AccountSettingScreen( var showDialog by remember { mutableStateOf(false) } val action = viewModel::onAction + val state by viewModel.collectAsState() viewModel.collectSideEffect { when (it) { @@ -54,7 +57,6 @@ fun AccountSettingScreen( val intent = activityNavigator.navigateToAuth(context) context.startActivity(intent) } - else -> {} } } @@ -94,6 +96,10 @@ fun AccountSettingScreen( onDismissRequest = { }, ) } + + if (state.isLoading) { + LoadingAnimation() + } } @Composable diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/RevokeConfirmScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/RevokeConfirmScreen.kt index 3b0b99e3..6d435cd9 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/RevokeConfirmScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/RevokeConfirmScreen.kt @@ -37,6 +37,7 @@ import com.bff.wespot.entire.viewmodel.EntireViewModel import com.bff.wespot.navigation.Navigator import com.bff.wespot.navigation.util.EXTRA_TOAST_MESSAGE import com.bff.wespot.ui.component.BottomButtonLayout +import com.bff.wespot.ui.component.LoadingAnimation import com.bff.wespot.ui.component.WSBottomSheet import com.bff.wespot.ui.component.WSSelectionItem import com.bff.wespot.ui.util.handleSideEffect @@ -170,6 +171,10 @@ fun RevokeConfirmScreen( onDismissRequest = { }, ) } + + if (state.isLoading) { + LoadingAnimation() + } } @Composable