Skip to content

Commit 2d2e0e0

Browse files
authored
๐Ÿ”€ :: (#719) ์•Œ๋ฆผ ์„ค์ • ํŽ˜์ด์ง€ ํ† ์ŠคํŠธ ์ œ๊ฑฐ
๐Ÿ”€ :: (#719) ์•Œ๋ฆผ ์„ค์ • ํŽ˜์ด์ง€ ํ† ์ŠคํŠธ ์ œ๊ฑฐ
2 parents 0594d4d + b600088 commit 2d2e0e0

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

โ€Žfeature/src/main/java/team/aliens/dms/android/feature/notification/settings/NotificationSettingsScreen.ktโ€Ž

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package team.aliens.dms.android.feature.notification.settings
22

33
import androidx.annotation.StringRes
44
import androidx.compose.foundation.background
5-
import androidx.compose.foundation.gestures.scrollable
65
import androidx.compose.foundation.layout.Arrangement
76
import androidx.compose.foundation.layout.Column
87
import androidx.compose.foundation.layout.Row
@@ -17,15 +16,13 @@ import androidx.compose.material3.Icon
1716
import androidx.compose.material3.IconButton
1817
import androidx.compose.material3.Text
1918
import androidx.compose.runtime.Composable
20-
import androidx.compose.runtime.LaunchedEffect
2119
import androidx.compose.runtime.getValue
2220
import androidx.compose.runtime.mutableStateOf
2321
import androidx.compose.runtime.remember
2422
import androidx.compose.runtime.setValue
2523
import androidx.compose.ui.Alignment
2624
import androidx.compose.ui.Modifier
2725
import androidx.compose.ui.draw.clip
28-
import androidx.compose.ui.graphics.Color
2926
import androidx.compose.ui.platform.LocalContext
3027
import androidx.compose.ui.res.painterResource
3128
import androidx.compose.ui.res.stringResource
@@ -41,7 +38,6 @@ import team.aliens.dms.android.core.designsystem.Scaffold
4138
import team.aliens.dms.android.core.designsystem.Switch
4239
import team.aliens.dms.android.core.notification.notificationPermissionGranted
4340
import team.aliens.dms.android.core.ui.PaddingDefaults
44-
import team.aliens.dms.android.core.ui.bottomPadding
4541
import team.aliens.dms.android.core.ui.collectInLaunchedEffectWithLifecycle
4642
import team.aliens.dms.android.core.ui.horizontalPadding
4743
import team.aliens.dms.android.core.ui.topPadding
@@ -63,19 +59,15 @@ internal fun NotificationSettingsScreen(
6359
val toast = LocalToast.current
6460

6561
viewModel.sideEffectFlow.collectInLaunchedEffectWithLifecycle { sideEffect ->
66-
when(sideEffect) {
62+
when (sideEffect) {
6763
NotificationSettingsSideEffect.CurrentNotificationsStatusNotFound -> toast.showErrorToast(
6864
message = context.getString(R.string.notification_not_current)
6965
)
70-
NotificationSettingsSideEffect.SubscribeNotificationSuccess -> toast.showSuccessToast(
71-
message = context.getString(R.string.notification_subscribe_success)
72-
)
66+
7367
NotificationSettingsSideEffect.SubscribeNotificationFailure -> toast.showErrorToast(
7468
message = context.getString(R.string.notification_subscribe_fail)
7569
)
76-
NotificationSettingsSideEffect.UnSubscribeNotificationSuccess -> toast.showSuccessToast(
77-
message = context.getString(R.string.notification_unsubscribe_success)
78-
)
70+
7971
NotificationSettingsSideEffect.UnSubscribeNotificationFailure -> toast.showErrorToast(
8072
message = context.getString(R.string.notification_unsubscribe_fail)
8173
)
@@ -109,7 +101,7 @@ internal fun NotificationSettingsScreen(
109101
.topPadding(PaddingDefaults.Large),
110102
verticalArrangement = Arrangement.spacedBy(24.dp),
111103
) {
112-
if(!notificationPermissionGranted(context)) {
104+
if (!notificationPermissionGranted(context)) {
113105
Notice()
114106
}
115107
Notifications(
@@ -142,6 +134,7 @@ private fun Notice() {
142134
)
143135
}
144136
}
137+
145138
@Composable
146139
private fun Notifications(
147140
status: List<NotificationTopicGroup.Status>,

โ€Žfeature/src/main/java/team/aliens/dms/android/feature/notification/settings/NotificationSettingsViewModel.ktโ€Ž

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ internal class NotificationSettingsViewModel @Inject constructor(
7777
deviceToken = deviceToken,
7878
topic = topic,
7979
)
80-
}.onSuccess {
81-
postSideEffect(NotificationSettingsSideEffect.SubscribeNotificationSuccess)
8280
}.onFailure {
8381
postSideEffect(NotificationSettingsSideEffect.SubscribeNotificationFailure)
8482
}
@@ -95,8 +93,6 @@ internal class NotificationSettingsViewModel @Inject constructor(
9593
deviceToken = deviceToken,
9694
topic = topic,
9795
)
98-
}.onSuccess {
99-
postSideEffect(NotificationSettingsSideEffect.UnSubscribeNotificationSuccess)
10096
}.onFailure {
10197
postSideEffect(NotificationSettingsSideEffect.UnSubscribeNotificationFailure)
10298
}
@@ -125,8 +121,6 @@ internal sealed class NotificationSettingsIntent : Intent() {
125121

126122
internal sealed class NotificationSettingsSideEffect : SideEffect() {
127123
data object CurrentNotificationsStatusNotFound : NotificationSettingsSideEffect()
128-
data object SubscribeNotificationSuccess : NotificationSettingsSideEffect()
129124
data object SubscribeNotificationFailure : NotificationSettingsSideEffect()
130-
data object UnSubscribeNotificationSuccess : NotificationSettingsSideEffect()
131125
data object UnSubscribeNotificationFailure : NotificationSettingsSideEffect()
132126
}

0 commit comments

Comments
ย (0)