minor

ARK-Builders · Oct 23, 2024 · fc7d732 · fc7d732
1 parent 9b843b7
commit fc7d732
Showing 1 changed file with 10 additions and 23 deletions.
diff --git a/app/src/main/java/dev/arkbuilders/rate/presentation/pairalert/PairAlertConditionScreen.kt b/app/src/main/java/dev/arkbuilders/rate/presentation/pairalert/PairAlertConditionScreen.kt
@@ -78,9 +78,9 @@ fun PairAlertConditionScreen(navigator: DestinationsNavigator) {
         viewModel(factory = DIManager.component.pairAlertVMFactory())
 
     val ctx = LocalContext.current
-    val onScreenOpenNotificationPermissionLauncher = rememberNotificationPermissionOnScreenOpen(ctx)
+    val onScreenOpenNotificationPermissionLauncher = rememberNotificationPermissionLauncher(ctx)
     val onNewPairNotificationPermissionLauncher =
-        rememberNotificationPermissionOnNewPair(
+        rememberNotificationPermissionLauncher(
             ctx = ctx,
             onGranted = viewModel::onNotificationPermissionGrantedOnNewPair,
         )
@@ -411,36 +411,23 @@ private fun Empty(
 }
 
 @Composable
-private fun rememberNotificationPermissionOnScreenOpen(ctx: Context) =
-    rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission(),
-    ) { isGranted ->
-        if (isGranted.not()) {
-            toastNotificationPermissionExplanation(ctx)
-        }
-    }
-
-@Composable
-private fun rememberNotificationPermissionOnNewPair(
+private fun rememberNotificationPermissionLauncher(
     ctx: Context,
-    onGranted: () -> Unit,
+    onGranted: (() -> Unit)? = null,
 ) = rememberLauncherForActivityResult(
     ActivityResultContracts.RequestPermission(),
 ) { isGranted ->
     if (isGranted) {
-        onGranted()
+        onGranted?.invoke()
     } else {
-        toastNotificationPermissionExplanation(ctx)
+        Toast.makeText(
+            ctx,
+            ctx.getString(R.string.alert_post_notification_permission_explanation),
+            Toast.LENGTH_SHORT,
+        ).show()
     }
 }
 
-private fun toastNotificationPermissionExplanation(ctx: Context) =
-    Toast.makeText(
-        ctx,
-        ctx.getString(R.string.alert_post_notification_permission_explanation),
-        Toast.LENGTH_SHORT,
-    ).show()
-
 private val previewPairAlert =
     PairAlert(
         id = 0,