Fix longclick when same action is present multiple times

Author: Crustack

app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt

@@ -334,7 +334,11 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
 
     fun finishAfterDeleteForever() = super.finish()
 
-    private fun showActionSelectionDialog(oldAction: EditAction, isBottomBar: Boolean = false) {
+    private fun showActionSelectionDialog(
+        oldAction: EditAction,
+        index: Int,
+        isBottomBar: Boolean = false,
+    ) {
         val actions = EditAction.entries.filter { it != EditAction.RESTORE }
         ActionSelectionBottomSheet(
                 actions,
@@ -349,7 +353,6 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                         )
                     } else {
                         val currentActions = prefs.editNoteActivityTopActions.value.toMutableList()
-                        val index = currentActions.indexOf(oldAction)
                         if (
                             index != -1 &&
                                 index < NotallyXPreferences.DEFAULT_EDIT_NOTE_TOP_ACTIONS.size
@@ -367,7 +370,6 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                     prefs.editNoteActivityBottomAction.save(newAction)
                 } else {
                     val currentActions = prefs.getSafeEditNoteActivityTopActions().toMutableList()
-                    val index = currentActions.indexOf(oldAction)
                     if (index != -1) {
                         currentActions[index] = newAction
                         prefs.editNoteActivityTopActions.save(currentActions)
@@ -602,7 +604,7 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
         // Try to get the view for long click
         post {
             button.setOnLongClickListener {
-                showActionSelectionDialog(action, isBottomBar = true)
+                showActionSelectionDialog(action, index = 0, isBottomBar = true)
                 true
             }
         }
@@ -937,22 +939,21 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
     private fun updateTopActions(topActions: List<EditAction>) {
         binding.Toolbar.menu.apply {
             clear()
-            topActions.forEach { action ->
+            topActions.forEachIndexed { idx, action ->
                 val (title, icon) =
                     action.getTitleAndIcon(
                         notallyModel.pinned,
                         notallyModel.viewMode.value,
                         notallyModel.folder,
                         notallyModel.type,
                     )
-                val menuItem =
-                    add(title, icon, MenuItem.SHOW_AS_ACTION_ALWAYS, itemId = action.itemId) {
-                        actionHandler.handleAction(action)
-                    }
+                add(title, icon, MenuItem.SHOW_AS_ACTION_ALWAYS, itemId = idx) {
+                    actionHandler.handleAction(action)
+                }
                 // Try to get the view for long click
                 binding.Toolbar.post {
-                    findViewById<View>(menuItem.itemId)?.setOnLongClickListener {
-                        showActionSelectionDialog(action)
+                    findViewById<View>(idx)?.setOnLongClickListener {
+                        showActionSelectionDialog(action, idx)
                         true
                     }
                 }

app/src/main/java/com/philkes/notallyx/presentation/viewmodel/preference/Preference.kt

@@ -401,22 +401,21 @@ enum class BiometricLock(override val textResId: Int) : StaticTextProvider {
     override fun getText(context: Context): String = context.getString(textResId)
 }
 
-enum class EditAction(override val textResId: Int, val drawableResId: Int, val itemId: Int) :
-    StaticTextProvider {
-    SEARCH(R.string.search, R.drawable.search, 1001),
-    PIN(R.string.pin, R.drawable.pin, 1002),
-    REMINDERS(R.string.reminders, R.drawable.notifications, 1003),
-    LABELS(R.string.labels, R.drawable.label, 1004),
-    CHANGE_COLOR(R.string.change_color, R.drawable.change_color, 1005),
-    DUPLICATE(R.string.duplicate, R.drawable.content_copy, 1006),
-    EXPORT(R.string.export, R.drawable.export, 1007),
-    SHARE(R.string.share, R.drawable.share, 1008),
-    DELETE(R.string.delete, R.drawable.delete, 1009),
-    ARCHIVE(R.string.archive, R.drawable.archive, 1010),
-    TOGGLE_VIEW_MODE(R.string.edit, R.drawable.visibility, 1011),
-    CONVERT(R.string.convert_to_list_note, R.drawable.convert_to_text, 1012),
-    DELETE_FOREVER(R.string.delete_forever, R.drawable.delete, 1014),
-    RESTORE(R.string.restore, R.drawable.restore, 1015);
+enum class EditAction(override val textResId: Int, val drawableResId: Int) : StaticTextProvider {
+    SEARCH(R.string.search, R.drawable.search),
+    PIN(R.string.pin, R.drawable.pin),
+    REMINDERS(R.string.reminders, R.drawable.notifications),
+    LABELS(R.string.labels, R.drawable.label),
+    CHANGE_COLOR(R.string.change_color, R.drawable.change_color),
+    DUPLICATE(R.string.duplicate, R.drawable.content_copy),
+    EXPORT(R.string.export, R.drawable.export),
+    SHARE(R.string.share, R.drawable.share),
+    DELETE(R.string.delete, R.drawable.delete),
+    ARCHIVE(R.string.archive, R.drawable.archive),
+    TOGGLE_VIEW_MODE(R.string.edit, R.drawable.visibility),
+    CONVERT(R.string.convert_to_list_note, R.drawable.convert_to_text),
+    DELETE_FOREVER(R.string.delete_forever, R.drawable.delete),
+    RESTORE(R.string.restore, R.drawable.restore);
 
     fun getTitleAndIcon(
         pinned: Boolean,