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 5ed6042149cf..cfd9b562263d 100644 --- a/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt +++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt @@ -19,12 +19,12 @@ enum class FileAction(@IdRes val id: Int, @StringRes val title: Int, @DrawableRe // 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), // 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), @@ -32,7 +32,7 @@ enum class FileAction(@IdRes val id: Int, @StringRes val title: Int, @DrawableRe // 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 diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 5f94428bc426..77f1accb9069 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -669,11 +669,12 @@ public void openActionsMenu(final int filesCount, final Set checkedFiles } if (isAPKorAAB(checkedFiles)) { - toHide.add(R.id.action_send_share_file); toHide.add(R.id.action_export_file); toHide.add(R.id.action_sync_file); toHide.add(R.id.action_download_file); } + // NMC: always hide the share menu because we have renamed another menu for sharing (NMC) + toHide.add(R.id.action_send_share_file); final var childFragmentManager = getChildFragmentManager(); final var actionBottomSheet = FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow, toHide) diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt index 2b4aa3a0ddbb..f7980c9a55de 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt @@ -395,7 +395,9 @@ class PreviewImageFragment : FileFragment(), Injectable { 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 ) ) diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt index 9350f1f9a081..fc9ba70bc4d5 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt @@ -579,7 +579,9 @@ class PreviewMediaActivity : 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 (getFile() != null && getFile().isSharedWithMe && !getFile().canReshare()) { diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt index a1b99fe8ea4d..bbf1e6a42e79 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt @@ -339,7 +339,9 @@ class PreviewMediaFragment : FileFragment(), OnTouchListener, Injectable { 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 ) ) diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java index 410173d0fab6..9625ce03f9ea 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java @@ -284,7 +284,9 @@ private void showFileActions(OCFile file) { 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 (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) { additionalFilter.add(R.id.action_send_share_file); diff --git a/app/src/test/java/com/nmc/android/FileActionIconTest.kt b/app/src/test/java/com/nmc/android/FileActionIconTest.kt new file mode 100644 index 000000000000..3d0f612b8e3c --- /dev/null +++ b/app/src/test/java/com/nmc/android/FileActionIconTest.kt @@ -0,0 +1,17 @@ +package com.nmc.android + +import com.nextcloud.ui.fileactions.FileAction +import org.junit.Assert +import org.junit.Test +import com.owncloud.android.R + +class FileActionIconTest { + + @Test + fun verifyShareAndSyncFileIcon(){ + val list = FileAction.SORTED_VALUES + Assert.assertEquals(R.drawable.ic_share,list[4].icon) + Assert.assertEquals(R.drawable.ic_content_copy,list[7].icon) + Assert.assertEquals(R.drawable.ic_cloud_download,list[8].icon) + } +} \ No newline at end of file