Skip to content

File action menu icon changed & Hide share menu #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

File action menu icon changed & Hide share menu #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ 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),
UNSET_FAVORITE(R.id.action_unset_favorite, R.string.unset_favorite, R.drawable.ic_star),

// Uploads and downloads
DOWNLOAD_FILE(R.id.action_download_file, R.string.filedetails_download, R.drawable.ic_cloud_download),
DOWNLOAD_FOLDER(R.id.action_sync_file, R.string.filedetails_sync_file, R.drawable.ic_sync),
DOWNLOAD_FOLDER(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_sync_off),

// File sharing
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand All @@ -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()
}

Expand Down