feat: Add functionality to create and edit shortcuts with improved dialog handling

Author: yogeshpaliyal

app/src/main/java/com/yogeshpaliyal/deepr/ui/components/CreateShortcutDialog.kt

@@ -9,34 +9,49 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import com.yogeshpaliyal.deepr.Deepr
+import com.yogeshpaliyal.deepr.util.createShortcut
+import com.yogeshpaliyal.deepr.util.getShortcut
+import com.yogeshpaliyal.deepr.util.isShortcutSupported
 
 @Composable
 fun CreateShortcutDialog(deepr: Deepr, onDismiss: () -> Unit, onCreate: (Deepr, String) -> Unit) {
-    var shortcutName by remember { mutableStateOf("") }
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text("Create Shortcut") },
-        text = {
-            TextField(
-                value = shortcutName,
-                onValueChange = { shortcutName = it },
-                label = { Text("Shortcut Name") },
-                placeholder = { Text(text = deepr.link) }
+    val context = LocalContext.current
+    val existingShortcut = getShortcut(context, deepr.id)
+    if (isShortcutSupported(context)) {
+        var shortcutName by remember {
+            mutableStateOf(
+                existingShortcut?.shortLabel?.toString() ?: ""
             )
-        },
-        confirmButton = {
-            Button(
-                onClick = { onCreate(deepr, shortcutName) },
-                enabled = shortcutName.isNotBlank()
-            ) {
-                Text("Create")
-            }
-        },
-        dismissButton = {
-            Button(onClick = onDismiss) {
-                Text("Cancel")
-            }
         }
-    )
+        AlertDialog(
+            onDismissRequest = onDismiss,
+            title = { Text("${if (existingShortcut == null) "Create" else "Edit"} Shortcut") },
+            text = {
+                TextField(
+                    value = shortcutName,
+                    onValueChange = { shortcutName = it },
+                    label = { Text("Shortcut Name") },
+                    placeholder = { Text(text = deepr.link) }
+                )
+            },
+            confirmButton = {
+                Button(
+                    onClick = {
+                        onCreate(deepr, shortcutName)
+                        createShortcut(context, deepr, shortcutName, existingShortcut != null)
+                    },
+                    enabled = shortcutName.isNotBlank()
+                ) {
+                    Text(if (existingShortcut == null) "Create" else "Edit")
+                }
+            },
+            dismissButton = {
+                Button(onClick = onDismiss) {
+                    Text("Cancel")
+                }
+            }
+        )
+    }
 }

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Home.kt

@@ -53,7 +53,8 @@ import androidx.compose.ui.unit.dp
 import com.yogeshpaliyal.deepr.Deepr
 import com.yogeshpaliyal.deepr.ui.components.CreateShortcutDialog
 import com.yogeshpaliyal.deepr.ui.components.EditDeeplinkDialog
-import com.yogeshpaliyal.deepr.util.createShortcut
+import com.yogeshpaliyal.deepr.util.hasShortcut
+import com.yogeshpaliyal.deepr.util.isShortcutSupported
 import com.yogeshpaliyal.deepr.util.isValidDeeplink
 import com.yogeshpaliyal.deepr.util.openDeeplink
 import compose.icons.TablerIcons
@@ -200,7 +201,6 @@ fun Content(viewModel: AccountViewModel) {
                 deepr = deepr,
                 onDismiss = { showShortcutDialog = null },
                 onCreate = { d, name ->
-                    createShortcut(context, d, name)
                     showShortcutDialog = null
                 }
             )
@@ -382,6 +382,28 @@ fun DeeprList(
     }
 }
 
+
+@Composable
+fun ShortcutMenuItem(account: Deepr, onShortcutClick: (Deepr) -> Unit) {
+    val context = LocalContext.current
+    val shortcutExists = remember(account.id) { hasShortcut(context, account.id) }
+
+    if (isShortcutSupported(LocalContext.current)) {
+        DropdownMenuItem(
+            text = { Text(if (shortcutExists) "Edit shortcut" else "Add shortcut") },
+            onClick = {
+                onShortcutClick(account)
+            },
+            leadingIcon = {
+                Icon(
+                    TablerIcons.Plus,
+                    contentDescription = if (shortcutExists) "Edit shortcut" else "Add shortcut"
+                )
+            }
+        )
+    }
+}
+
 @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)
 @Composable
 fun DeeprItem(
@@ -463,19 +485,10 @@ fun DeeprItem(
                             )
                         }
                     )
-                    DropdownMenuItem(
-                        text = { Text("Add shortcut") },
-                        onClick = {
-                            onShortcutClick(account)
-                            expanded = false
-                        },
-                        leadingIcon = {
-                            Icon(
-                                TablerIcons.Plus,
-                                contentDescription = "Add shortcut"
-                            )
-                        }
-                    )
+                    ShortcutMenuItem(account) {
+                        onShortcutClick(it)
+                        expanded = false
+                    }
                     DropdownMenuItem(
                         text = { Text("Edit") },
                         onClick = {

app/src/main/java/com/yogeshpaliyal/deepr/util/ShortcutUtils.kt

@@ -2,15 +2,17 @@ package com.yogeshpaliyal.deepr.util
 
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.os.Build
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.net.toUri
 import com.yogeshpaliyal.deepr.Deepr
 import com.yogeshpaliyal.deepr.R
 
-fun createShortcut(context: Context, deepr: Deepr, shortcutName: String) {
-    if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {
+fun createShortcut(context: Context, deepr: Deepr, shortcutName: String, alreadyExists: Boolean) {
+    if (isShortcutSupported(context)) {
         val shortcutInfo = ShortcutInfoCompat.Builder(context, "deepr_${deepr.id}")
             .setShortLabel(shortcutName)
             .setLongLabel(shortcutName)
@@ -19,7 +21,45 @@ fun createShortcut(context: Context, deepr: Deepr, shortcutName: String) {
 
             })
             .build()
+        if (alreadyExists) {
+            // If the shortcut already exists, we update it
+            ShortcutManagerCompat.updateShortcuts(context, listOf(shortcutInfo))
+        } else {
+            // Otherwise, we request to pin the new shortcut
+            ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null)
+        }
+    }
+}
+
+fun isShortcutSupported(context: Context): Boolean {
+    // Check if the device supports pinned shortcuts
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+            ShortcutManagerCompat.isRequestPinShortcutSupported(context)
+}
+
+/**
+ * Checks if a shortcut already exists for the given deeplink
+ */
+fun getShortcut(context: Context, deeprId: Long): ShortcutInfo? {
+    // On Android 10+ (API 29+), we can check for pinned shortcuts
+    if (isShortcutSupported(context)) {
+        val shortcutManager = context.getSystemService(Context.SHORTCUT_SERVICE) as android.content.pm.ShortcutManager?
 
-        ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null)
+        // Get all pinned shortcuts if available
+        val shortcuts = shortcutManager?.pinnedShortcuts
+
+        // Check if our shortcut exists
+        return shortcuts?.find { it.id == "deepr_$deeprId" }
     }
+
+    // For older Android versions, we can't reliably check if a shortcut exists
+    // So we'll return false by default
+    return null
+}
+
+/**
+ * Checks if a shortcut already exists for the given deeplink
+ */
+fun hasShortcut(context: Context, deeprId: Long): Boolean {
+    return getShortcut(context, deeprId) != null
 }