wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/ui/albumItemActions/AlbumItemAction.kt

@@ -19,19 +19,13 @@ enum class AlbumItemAction(val id: Int, val titleId: Int, val iconId: Int) {
         R.id.action_select_images_from_account,
         R.string.album_upload_from_account,
         R.drawable.file_image
-    ),
-    RENAME_ALBUM(R.id.action_rename_file, R.string.album_rename, R.drawable.ic_edit),
-    SHARE_ALBUM(R.id.action_share_album, R.string.album_share, R.drawable.ic_share),
-    DELETE_ALBUM(R.id.action_delete, R.string.album_delete, R.drawable.ic_delete);
+    );
 
     companion object {
         @JvmField
         val SORTED_VALUES = listOf(
             UPLOAD_FROM_CAMERA_ROLL,
-            SELECT_IMAGES_FROM_ACCOUNT,
-            RENAME_ALBUM,
-            SHARE_ALBUM,
-            DELETE_ALBUM
+            SELECT_IMAGES_FROM_ACCOUNT
         )
     }
 }

app/src/main/java/com/owncloud/android/ui/fragment/albums/AlbumItemsFragment.kt

@@ -230,7 +230,7 @@ class AlbumItemsFragment :
             viewThemeUtils.material.themeFAB(this)
 
             setOnClickListener {
-                openAlbumActionsMenu()
+                openAddMediaMenu()
             }
         }
 
@@ -284,17 +284,18 @@ class AlbumItemsFragment :
             object : MenuProvider {
                 override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
                     menu.clear()
+                    menuInflater.inflate(R.menu.fragment_album_items, menu)
                 }
 
-                override fun onMenuItemSelected(menuItem: MenuItem): Boolean = true
+                override fun onMenuItemSelected(menuItem: MenuItem): Boolean = onAlbumActionChosen(menuItem.itemId)
             },
             viewLifecycleOwner,
             Lifecycle.State.RESUMED
         )
     }
 
-    private fun openAlbumActionsMenu() {
-        throttler.run("overflowClick") {
+    private fun openAddMediaMenu() {
+        throttler.run("addMediaClick") {
             val supportFragmentManager = requireActivity().supportFragmentManager
 
             AlbumItemActionsBottomSheet.newInstance()
@@ -336,7 +337,7 @@ class AlbumItemsFragment :
             true
         }
 
-        R.id.action_rename_file -> {
+        R.id.action_rename_album -> {
             CreateAlbumDialogFragment.newInstance(albumName)
                 .show(
                     requireActivity().supportFragmentManager,
@@ -350,7 +351,7 @@ class AlbumItemsFragment :
             true
         }
 
-        R.id.action_delete -> {
+        R.id.action_delete_album -> {
             showConfirmationDialog(true, null)
             true
         }

app/src/main/res/menu/fragment_album_items.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@id/action_rename_album"
+        android:orderInCategory="1"
+        android:title="@string/album_rename"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@id/action_share_album"
+        android:orderInCategory="2"
+        android:title="@string/album_share"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@id/action_delete_album"
+        android:orderInCategory="3"
+        android:title="@string/album_delete"
+        app:showAsAction="never" />
+
+</menu>

app/src/main/res/values/ids.xml

@@ -40,4 +40,6 @@
     <item name="action_select_images_from_account" type="id"/>
     <item name="action_add_to_album" type="id"/>
     <item name="action_share_album" type="id"/>
+    <item name="action_rename_album" type="id"/>
+    <item name="action_delete_album" type="id"/>
 </resources>