🔀 :: (#719) 알림 설정 페이지 토스트 제거

team-aliens · Aug 12, 2024 · 2d2e0e0 · 2d2e0e0
2 parents 0594d4d + b600088
commit 2d2e0e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/.../java/team/aliens/dms/android/feature/notification/settings/NotificationSettingsScreen.kt b/.../java/team/aliens/dms/android/feature/notification/settings/NotificationSettingsScreen.kt
@@ -2,7 +2,6 @@ package team.aliens.dms.android.feature.notification.settings
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -17,15 +16,13 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -41,7 +38,6 @@ import team.aliens.dms.android.core.designsystem.Scaffold
 import team.aliens.dms.android.core.designsystem.Switch
 import team.aliens.dms.android.core.notification.notificationPermissionGranted
 import team.aliens.dms.android.core.ui.PaddingDefaults
-import team.aliens.dms.android.core.ui.bottomPadding
 import team.aliens.dms.android.core.ui.collectInLaunchedEffectWithLifecycle
 import team.aliens.dms.android.core.ui.horizontalPadding
 import team.aliens.dms.android.core.ui.topPadding
@@ -63,19 +59,15 @@ internal fun NotificationSettingsScreen(
     val toast = LocalToast.current
 
     viewModel.sideEffectFlow.collectInLaunchedEffectWithLifecycle { sideEffect ->
-        when(sideEffect) {
+        when (sideEffect) {
             NotificationSettingsSideEffect.CurrentNotificationsStatusNotFound -> toast.showErrorToast(
                 message = context.getString(R.string.notification_not_current)
             )
-            NotificationSettingsSideEffect.SubscribeNotificationSuccess -> toast.showSuccessToast(
-                message = context.getString(R.string.notification_subscribe_success)
-            )
+
             NotificationSettingsSideEffect.SubscribeNotificationFailure -> toast.showErrorToast(
                 message = context.getString(R.string.notification_subscribe_fail)
             )
-            NotificationSettingsSideEffect.UnSubscribeNotificationSuccess -> toast.showSuccessToast(
-                message = context.getString(R.string.notification_unsubscribe_success)
-            )
+
             NotificationSettingsSideEffect.UnSubscribeNotificationFailure -> toast.showErrorToast(
                 message = context.getString(R.string.notification_unsubscribe_fail)
             )
@@ -109,7 +101,7 @@ internal fun NotificationSettingsScreen(
                 .topPadding(PaddingDefaults.Large),
             verticalArrangement = Arrangement.spacedBy(24.dp),
         ) {
-            if(!notificationPermissionGranted(context)) {
+            if (!notificationPermissionGranted(context)) {
                 Notice()
             }
             Notifications(
@@ -142,6 +134,7 @@ private fun Notice() {
         )
     }
 }
+
 @Composable
 private fun Notifications(
     status: List<NotificationTopicGroup.Status>,

diff --git a/...va/team/aliens/dms/android/feature/notification/settings/NotificationSettingsViewModel.kt b/...va/team/aliens/dms/android/feature/notification/settings/NotificationSettingsViewModel.kt
@@ -77,8 +77,6 @@ internal class NotificationSettingsViewModel @Inject constructor(
                     deviceToken = deviceToken,
                     topic = topic,
                 )
-            }.onSuccess {
-                postSideEffect(NotificationSettingsSideEffect.SubscribeNotificationSuccess)
             }.onFailure {
                 postSideEffect(NotificationSettingsSideEffect.SubscribeNotificationFailure)
             }
@@ -95,8 +93,6 @@ internal class NotificationSettingsViewModel @Inject constructor(
                     deviceToken = deviceToken,
                     topic = topic,
                 )
-            }.onSuccess {
-                postSideEffect(NotificationSettingsSideEffect.UnSubscribeNotificationSuccess)
             }.onFailure {
                 postSideEffect(NotificationSettingsSideEffect.UnSubscribeNotificationFailure)
             }
@@ -125,8 +121,6 @@ internal sealed class NotificationSettingsIntent : Intent() {
 
 internal sealed class NotificationSettingsSideEffect : SideEffect() {
     data object CurrentNotificationsStatusNotFound : NotificationSettingsSideEffect()
-    data object SubscribeNotificationSuccess : NotificationSettingsSideEffect()
     data object SubscribeNotificationFailure : NotificationSettingsSideEffect()
-    data object UnSubscribeNotificationSuccess : NotificationSettingsSideEffect()
     data object UnSubscribeNotificationFailure : NotificationSettingsSideEffect()
 }