Merge pull request #17093 from nextcloud/feat/swipe-video-preview-to-image-from-file-list

feat: swipe video preview to image from file list

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -521,6 +521,22 @@ public List<OCFile> getFolderImages(OCFile folder, boolean onlyOnDevice) {
         return imageList;
     }
 
+    public List<OCFile> getFolderImagesAndVideos(OCFile folder, boolean onlyOnDevice) {
+        List<OCFile> mediaList = new ArrayList<>();
+
+        if (folder != null) {
+            List<OCFile> folderContent = getFolderContent(folder, onlyOnDevice);
+
+            for (OCFile ocFile : folderContent) {
+                if (MimeTypeUtil.isImageOrVideo(ocFile)) {
+                    mediaList.add(ocFile);
+                }
+            }
+        }
+
+        return mediaList;
+    }
+
     public boolean saveFile(OCFile ocFile) {
         Log_OC.d(TAG, "saving file: " + ocFile.getRemotePath());
 

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

@@ -870,6 +870,11 @@ class FileDisplayActivity :
         val file = mWaitingToPreview ?: return false
 
         return when {
+            MimeTypeUtil.isVideo(file) -> {
+                startImagePreview(file, true)
+                true
+            }
+
             PreviewMediaActivity.canBePreviewed(file) -> {
                 startMediaPreview(file, 0, true, true, true, true)
                 true
@@ -2041,6 +2046,9 @@ class FileDisplayActivity :
         } else if (PreviewTextFileFragment.canBePreviewed(file)) {
             setFabVisible?.onComplete(false)
             startTextPreview(file, false)
+        } else if (MimeTypeUtil.isVideo(file)) {
+            setFabVisible?.onComplete(false)
+            startImagePreview(file, true)
         } else if (PreviewMediaActivity.Companion.canBePreviewed(file)) {
             setFabVisible?.onComplete(false)
             startMediaPreview(file, 0, true, true, false, true)

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

@@ -118,6 +118,7 @@
 import com.owncloud.android.utils.EncryptionUtilsV2;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
+import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.overlay.OverlayManager;
 import com.owncloud.android.utils.theme.ThemeUtils;
@@ -1213,7 +1214,10 @@ private void handlePendingDownloadFile(OCFile file) {
         User account = accountManager.getUser();
         OCCapability capability = mContainerActivity.getStorageManager().getCapability(account.getAccountName());
 
-        if (PreviewMediaActivity.Companion.canBePreviewed(file) && !file.isEncrypted() && mContainerActivity instanceof FileDisplayActivity fda) {
+        if (MimeTypeUtil.isVideo(file) && !file.isEncrypted() && mContainerActivity instanceof FileDisplayActivity fda) {
+            setFabVisible(false);
+            fda.startImagePreview(file, true, null);
+        } else if (PreviewMediaActivity.Companion.canBePreviewed(file) && !file.isEncrypted() && mContainerActivity instanceof FileDisplayActivity fda) {
             setFabVisible(false);
             fda.startMediaPreview(file, 0, true, true, true, true);
         } else if (editorUtils.isEditorAvailable(accountManager.getUser(), file.getMimeType()) && !file.isEncrypted()) {

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt

@@ -278,8 +278,8 @@ class PreviewImageActivity :
         val optionalUser = user
         if (optionalUser.isPresent) {
             var file: OCFile? = file ?: throw IllegalStateException("Instanced with a NULL OCFile")
-            // / Validate handled file (first image to preview)
-            require(MimeTypeUtil.isImage(file)) { "Non-image file passed as argument" }
+            // / Validate handled file (first media item to preview)
+            require(MimeTypeUtil.isImageOrVideo(file)) { "Non-image/video file passed as argument" }
 
             // Update file according to DB file, if it is possible
             if (file!!.fileId > FileDataStorageManager.ROOT_PARENT_ID) {

app/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.kt

@@ -60,7 +60,7 @@ class PreviewImagePagerAdapter : FragmentStateAdapter {
         this.user = user
         this.selectedFile = selectedFile
         mStorageManager = storageManager
-        imageFiles = mStorageManager.getFolderImages(parentFolder, onlyOnDevice)
+        imageFiles = mStorageManager.getFolderImagesAndVideos(parentFolder, onlyOnDevice)
 
         val sortOrder = preferences.getSortOrderByFolder(parentFolder)
         val foldersBeforeFiles = preferences.isSortFoldersBeforeFiles()

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

@@ -12,7 +12,6 @@
  */
 package com.owncloud.android.ui.preview
 
-import android.app.Activity
 import android.content.ComponentName
 import android.content.DialogInterface
 import android.content.Intent
@@ -143,7 +142,6 @@ class PreviewMediaActivity :
         WindowCompat.setDecorFitsSystemWindows(window, false)
         applyWindowInsets()
         initArguments(savedInstanceState)
-
         if (MimeTypeUtil.isVideo(file)) {
             // release any background media session if exists
             sendAudioSessionReleaseBroadcast()
@@ -799,13 +797,8 @@ class PreviewMediaActivity :
         showDetails(file)
     }
 
-    override fun onBrowsedDownTo(folder: OCFile?) {
-        // TODO Auto-generated method stub
-    }
-
-    override fun onTransferStateChanged(file: OCFile?, downloading: Boolean, uploading: Boolean) {
-        // TODO Auto-generated method stub
-    }
+    override fun onBrowsedDownTo(folder: OCFile?) = Unit
+    override fun onTransferStateChanged(file: OCFile?, downloading: Boolean, uploading: Boolean) = Unit
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
@@ -818,15 +811,12 @@ class PreviewMediaActivity :
         Log_OC.v(TAG, "onActivityResult $this")
         super.onActivityResult(requestCode, resultCode, data)
 
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == RESULT_OK) {
             savedPlaybackPosition = data?.getLongExtra(EXTRA_START_POSITION, 0) ?: 0
             autoplay = data?.getBooleanExtra(EXTRA_AUTOPLAY, false) ?: false
         }
     }
 
-    /**
-     * Opens the previewed file with an external application.
-     */
     private fun openFile() {
         stopPreview(true)
         fileOperationsHelper.openFile(file)
@@ -855,12 +845,6 @@ class PreviewMediaActivity :
         private const val PLAYBACK_POSITION = "PLAYBACK_POSITION"
         private const val AUTOPLAY = "AUTOPLAY"
 
-        /**
-         * Helper method to test if an [OCFile] can be passed to a [PreviewMediaActivity] to be previewed.
-         *
-         * @param file File to test if can be previewed.
-         * @return 'True' if the file can be handled by the activity.
-         */
         fun canBePreviewed(file: OCFile?): Boolean =
             file != null && (MimeTypeUtil.isAudio(file) || MimeTypeUtil.isVideo(file))
     }

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt

@@ -185,6 +185,7 @@ class PreviewMediaFragment :
     override fun onResume() {
         super.onResume()
         applyWindowInsets()
+        prepareMedia()
     }
 
     @OptIn(UnstableApi::class)
@@ -238,18 +239,13 @@ class PreviewMediaFragment :
             putParcelable(EXTRA_FILE, file)
             putParcelable(EXTRA_USER, user)
 
-            savedPlaybackPosition = exoPlayer?.currentPosition ?: 0L
-            autoplay = exoPlayer?.isPlaying ?: false
+            savedPlaybackPosition = exoPlayer?.currentPosition ?: savedPlaybackPosition
+            autoplay = exoPlayer?.isPlaying ?: autoplay
             putLong(EXTRA_PLAY_POSITION, savedPlaybackPosition)
             putBoolean(EXTRA_PLAYING, autoplay)
         }
     }
 
-    override fun onStart() {
-        super.onStart()
-        prepareMedia()
-    }
-
     private fun prepareMedia() {
         if (file == null || !isAdded) {
             Log_OC.d(TAG, "File is null or fragment not attached to a context.")
@@ -499,12 +495,11 @@ class PreviewMediaFragment :
         autoplay = false
     }
 
-    override fun onStop() {
+    override fun onPause() {
         if (!isFullscreenActive) {
             releaseVideoPlayer()
         }
-        releaseVideoPlayer()
-        super.onStop()
+        super.onPause()
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -585,11 +580,6 @@ class PreviewMediaFragment :
         super.onDetach()
     }
 
-    override fun onPause() {
-        exoPlayer?.pause()
-        super.onPause()
-    }
-
     companion object {
         private val TAG: String = PreviewMediaFragment::class.java.simpleName