Fix -> video click event, overflow menu item hide and theming add menu

Signed-off-by: Surinder Kumar <[email protected]>

Author: surinder-tsys

app/src/main/java/com/owncloud/android/ui/activity/AlbumsPickerActivity.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 TSI-mc <surinder.kumar@t-systems.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -986,7 +986,7 @@ private void requestUploadOfFilesFromFileSystem(String localBasePath, String[] f
 
             connectivityService.isNetworkAndServerAvailable(result -> {
                 if (result) {
-                    boolean isValidFolderPath = FileNameValidator.INSTANCE.checkFolderPath(remotePathBase, getCapabilities(), this);
+                    boolean isValidFolderPath = FileNameValidator.INSTANCE.checkFolderPath(remotePathBase,getCapabilities(),this);
                     if (!isValidFolderPath) {
                         DisplayUtils.showSnackMessage(this, R.string.file_name_validator_error_contains_reserved_names_or_invalid_characters);
                         return;
@@ -1231,7 +1231,6 @@ protected void onResume() {
 
         Log_OC.v(TAG, "onResume() end");
     }
-
     private void setDrawerAllFiles() {
         if (MainApp.isOnlyPersonFiles()) {
             menuItemId = R.id.nav_personal_files;
@@ -1725,7 +1724,7 @@ private void observeWorkerState() {
                 previewFile(finishedState);
             } else if (state instanceof WorkerState.UploadFinished) {
                 refreshList();
-            } else if (state instanceof WorkerState.OfflineOperationsCompleted) {
+            } else if (state instanceof  WorkerState.OfflineOperationsCompleted) {
                 refreshCurrentDirectory();
             }
         });

app/src/main/java/com/owncloud/android/ui/adapter/albums/AlbumGridItemViewHolder.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 TSI-mc <surinder.kumar@t-systems.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 

app/src/main/java/com/owncloud/android/ui/adapter/albums/AlbumListItemViewHolder.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 TSI-mc <surinder.kumar@t-systems.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 

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

@@ -1,6 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
+ * SPDX-FileCopyrightText: 2025 TSI-mc <[email protected]>
  * SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
  * SPDX-FileCopyrightText: 2022 Álvaro Brey <[email protected]>
  * SPDX-FileCopyrightText: 2018-2021 Tobias Kaminsky <[email protected]>

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -80,6 +80,7 @@
 import com.owncloud.android.lib.resources.files.ToggleFavoriteRemoteOperation;
 import com.owncloud.android.lib.resources.status.E2EVersion;
 import com.owncloud.android.lib.resources.status.OCCapability;
+import com.owncloud.android.ui.activity.AlbumsPickerActivity;
 import com.owncloud.android.ui.activity.DrawerActivity;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -849,7 +850,13 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 
             if (OCFileListFragment.this instanceof GalleryFragment) {
                 final MenuItem addAlbumItem = menu.findItem(R.id.add_to_album);
+                // show add to album button for gallery to add media to Album
                 addAlbumItem.setVisible(true);
+
+                // hide the 3 dot menu icon while picking media for Albums
+                if (requireActivity() instanceof AlbumsPickerActivity) {
+                    item.setVisible(false);
+                }
             }
 
             getCommonAdapter().setMultiSelect(true);

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

@@ -61,16 +61,16 @@ import com.owncloud.android.lib.resources.albums.ReadAlbumItemsRemoteOperation
 import com.owncloud.android.lib.resources.albums.RemoveAlbumFileRemoteOperation
 import com.owncloud.android.lib.resources.albums.ToggleAlbumFavoriteRemoteOperation
 import com.owncloud.android.ui.activity.AlbumsPickerActivity
+import com.owncloud.android.ui.activity.AlbumsPickerActivity.Companion.intentForPickingMediaFiles
 import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.adapter.GalleryAdapter
 import com.owncloud.android.ui.dialog.CreateAlbumDialogFragment
 import com.owncloud.android.ui.events.FavoriteEvent
 import com.owncloud.android.ui.fragment.FileFragment
-import com.owncloud.android.ui.activity.AlbumsPickerActivity.Companion.intentForPickingMediaFiles
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
 import com.owncloud.android.ui.preview.PreviewImageFragment
-import com.owncloud.android.ui.preview.PreviewMediaActivity
+import com.owncloud.android.ui.preview.PreviewMediaActivity.Companion.canBePreviewed
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.ErrorMessageAdapter
 import com.owncloud.android.utils.FileStorageUtils
@@ -484,13 +484,17 @@ class AlbumItemsFragment : Fragment(), OCFileListFragmentInterface, Injectable {
             if (PreviewImageFragment.canBePreviewed(file)) {
                 (mContainerActivity as FileDisplayActivity).startImagePreview(file, !file.isDown)
             } else if (file.isDown) {
-                if (PreviewMediaActivity.canBePreviewed(file)) {
+                if (canBePreviewed(file)) {
                     (mContainerActivity as FileDisplayActivity).startMediaPreview(file, 0, true, true, false, true)
                 } else {
                     mContainerActivity?.getFileOperationsHelper()?.openFile(file)
                 }
             } else {
-                Log_OC.d(TAG, "Couldn't handle item click")
+                if (canBePreviewed(file) && !file.isEncrypted) {
+                    (mContainerActivity as FileDisplayActivity).startMediaPreview(file, 0, true, true, true, true)
+                } else {
+                    Log_OC.d(TAG, "Couldn't handle item click")
+                }
             }
         }
     }

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

@@ -12,13 +12,17 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
+import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
@@ -137,6 +141,17 @@ class AlbumsFragment : Fragment(), AlbumFragmentInterface, Injectable {
                 override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
                     menu.clear() // important: clears any existing activity menu
                     menuInflater.inflate(R.menu.fragment_create_album, menu)
+
+                    val addItem = menu.findItem(R.id.action_create_new_album)
+                    val coloredTitle = SpannableString(addItem.title).apply {
+                        setSpan(
+                            ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.primary)),
+                            0,
+                            length,
+                            Spannable.SPAN_INCLUSIVE_INCLUSIVE
+                        )
+                    }
+                    addItem.title = coloredTitle
                 }
 
                 override fun onMenuItemSelected(menuItem: MenuItem): Boolean {