From bf8c6e8c7986a8b6e0da4b481f21c8fe399a5e74 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Mar 2025 11:48:00 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/core/ui/utils/RequestPushPermission.kt | 5 ++--- .../impl/model/PushNotificationsModel.kt | 2 +- .../impl/presentation/ui/PushNotificationsScreen.kt | 8 +++----- .../wallet/ui/components/PushNotificationsBottomSheet.kt | 8 +++----- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/RequestPushPermission.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/RequestPushPermission.kt index 1b21fff1ef..f70452b5f7 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/utils/RequestPushPermission.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/utils/RequestPushPermission.kt @@ -2,7 +2,6 @@ package com.tangem.core.ui.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.MutableState import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState @@ -16,7 +15,7 @@ import com.google.accompanist.permissions.rememberPermissionState @Composable fun requestPushPermission( pushPermission: String?, - isClicked: MutableState, + isClicked: Boolean, onAllow: () -> Unit, onDeny: () -> Unit, ): () -> Unit { @@ -26,7 +25,7 @@ fun requestPushPermission( // Check if user granted permission and close bottom sheet LaunchedEffect(key1 = permissionState?.status, isClicked) { - if (!isClicked.value) return@LaunchedEffect + if (!isClicked) return@LaunchedEffect if (permissionState?.status?.isGranted == true) { onAllow() } else { diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt index fb23fe3946..29cd04e418 100644 --- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt +++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt @@ -17,7 +17,7 @@ import javax.inject.Inject @Stable @ModelScoped -class PushNotificationsModel @Inject constructor( +internal class PushNotificationsModel @Inject constructor( override val dispatchers: CoroutineDispatcherProvider, private val neverRequestPermissionUseCase: NeverRequestPermissionUseCase, private val neverToInitiallyAskPermissionUseCase: NeverToInitiallyAskPermissionUseCase, diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt index 0e09e38cc3..01d07a68ab 100644 --- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt +++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt @@ -1,9 +1,7 @@ package com.tangem.features.pushnotifications.impl.presentation.ui import androidx.compose.foundation.layout.systemBarsPadding -import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember +import androidx.compose.runtime.* import androidx.compose.ui.Modifier import com.tangem.core.ui.components.showcase.Showcase import com.tangem.core.ui.components.showcase.model.ShowcaseButtonModel @@ -21,7 +19,7 @@ internal fun PushNotificationsScreen( onAllowPermission: () -> Unit, onDenyPermission: () -> Unit, ) { - val isClicked = remember { mutableStateOf(false) } + var isClicked by remember { mutableStateOf(false) } val requestPushPermission = requestPushPermission( isClicked = isClicked, onAllow = onAllowPermission, @@ -45,7 +43,7 @@ internal fun PushNotificationsScreen( primaryButton = ShowcaseButtonModel( buttonText = resourceReference(R.string.common_allow), onClick = { - isClicked.value = true + isClicked = true onRequest() requestPushPermission() }, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/PushNotificationsBottomSheet.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/PushNotificationsBottomSheet.kt index eb10376318..4bbb305824 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/PushNotificationsBottomSheet.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/PushNotificationsBottomSheet.kt @@ -6,9 +6,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember +import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.tangem.core.ui.components.PrimaryButton @@ -36,7 +34,7 @@ internal fun PushNotificationsBottomSheet(config: TangemBottomSheetConfig) { @Composable private fun PushNotificationsSheetContent(content: PushNotificationsBottomSheetConfig, onDismiss: () -> Unit) { - val isClicked = remember { mutableStateOf(false) } + var isClicked by remember { mutableStateOf(false) } val requestPushPermission = requestPushPermission( pushPermission = getPushPermissionOrNull(), isClicked = isClicked, @@ -86,7 +84,7 @@ private fun PushNotificationsSheetContent(content: PushNotificationsBottomSheetC PrimaryButton( text = stringResourceSafe(R.string.common_allow), onClick = { - isClicked.value = true + isClicked = true content.onRequest() requestPushPermission() },