From 1ab97fa57bf1f1d5f726c076fff2faddcd774d4c Mon Sep 17 00:00:00 2001 From: A117870935 Date: Thu, 25 May 2023 17:53:59 +0530 Subject: [PATCH] File action menu icon changed and test case added. NMC-2131: Hide send-share menu from 3 dot menu and hide see details menu from Preview fragments. --- .../com/nextcloud/ui/fileactions/FileAction.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt b/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt index f66521e5a407..228aa476fc7c 100644 --- a/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt +++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt @@ -25,13 +25,13 @@ enum class FileAction( // generic file actions EDIT(R.id.action_edit, R.string.action_edit, R.drawable.ic_edit), - SEE_DETAILS(R.id.action_see_details, R.string.actionbar_see_details, R.drawable.ic_information_outline), + SEE_DETAILS(R.id.action_see_details, R.string.actionbar_see_details, R.drawable.ic_share), REMOVE_FILE(R.id.action_remove_file, R.string.common_remove, R.drawable.ic_delete), LEAVE_SHARE(R.id.action_remove_file, R.string.common_leave_this_share, R.drawable.ic_cancel), // File moving RENAME_FILE(R.id.action_rename_file, R.string.common_rename, R.drawable.ic_rename), - MOVE_OR_COPY(R.id.action_move_or_copy, R.string.actionbar_move_or_copy, R.drawable.ic_external), + MOVE_OR_COPY(R.id.action_move_or_copy, R.string.actionbar_move_or_copy, R.drawable.ic_content_copy), // favorites FAVORITE(R.id.action_favorite, R.string.favorite, R.drawable.ic_star_outline), @@ -39,7 +39,7 @@ enum class FileAction( // Uploads and downloads DOWNLOAD_FILE(R.id.action_download_file, R.string.filedetails_download, R.drawable.ic_cloud_download), - SYNC_FILE(R.id.action_sync_file, R.string.filedetails_sync_file, R.drawable.ic_cloud_sync_on), + SYNC_FILE(R.id.action_sync_file, R.string.filedetails_sync_file, R.drawable.ic_cloud_download), CANCEL_SYNC(R.id.action_cancel_sync, R.string.common_cancel_sync, R.drawable.ic_cloud_sync_off), // File sharing @@ -106,7 +106,9 @@ enum class FileAction( R.id.action_move_or_copy, R.id.action_favorite, R.id.action_unset_favorite, - R.id.action_pin_to_homescreen + R.id.action_pin_to_homescreen, + // hide this option for NMC + R.id.action_see_details ) if (file != null) { @@ -171,7 +173,6 @@ enum class FileAction( if (checkedFiles.any { it.isAPKorAAB }) { result.addAll( listOf( - R.id.action_send_share_file, R.id.action_export_file, R.id.action_sync_file, R.id.action_download_file @@ -181,7 +182,8 @@ enum class FileAction( val actionsToHide = getActionsToHide(checkedFiles) result.addAll(actionsToHide) - + // NMC: always hide the share menu because we have renamed another menu for sharing (NMC) + result.add(R.id.action_send_share_file) return result.toList() }