Merge pull request #111 from Joe3112/feature/android-notification-set…

…tings Android notification permission opens notification settings
MohamedRejeb · Jul 10, 2024 · aa64fbc · aa64fbc
2 parents c047d29 + 0edfc3f
commit aa64fbc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/...rc/androidMain/kotlin/com/mohamedrejeb/calf/permissions/MutablePermissionState.android.kt b/...rc/androidMain/kotlin/com/mohamedrejeb/calf/permissions/MutablePermissionState.android.kt
@@ -9,6 +9,7 @@ import android.provider.Settings
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Stable
@@ -106,10 +107,14 @@ internal actual class MutablePermissionState(
     actual override fun openAppSettings() {
         if (context == null) return
 
-        val intent = Intent().apply {
-            action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-            data = Uri.fromParts("package", context.packageName, null)
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        val intent = when (permission) {
+            Permission.Notification -> if (supportsNotificationSettings()) {
+                createAppNotificationsIntent(context)
+            } else {
+                createAppSettingsIntent(context)
+            }
+
+            else -> createAppSettingsIntent(context)
         }
         context.startActivity(intent)
     }
@@ -132,4 +137,20 @@ internal actual class MutablePermissionState(
             PermissionStatus.Denied(activity.shouldShowRationale(androidPermission))
         }
     }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun createAppNotificationsIntent(context: Context) =
+        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
+            putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+        }
+
+    private fun supportsNotificationSettings() =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+
+    private fun createAppSettingsIntent(context: Context) =
+        Intent().apply {
+            action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+            data = Uri.fromParts("package", context.packageName, null)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
 }
diff --git a/...le/common/src/commonMain/kotlin/com.mohamedrejeb.calf.sample/screens/PermissionsScreen.kt b/...le/common/src/commonMain/kotlin/com.mohamedrejeb.calf.sample/screens/PermissionsScreen.kt
@@ -110,7 +110,24 @@ private fun PermissionItem(permission: Permission) {
         )
     }
 
+
+
     Spacer(modifier = Modifier.height(16.dp))
 
+    if (permission == Permission.Notification) {
+        Button(
+            onClick = {
+                permissionState.openAppSettings()
+            },
+        ) {
+            Text(
+                text = "Open Notification Settings",
+            )
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+    }
+
+
     HorizontalDivider()
 }