Merge pull request #3653 from owncloud/feature/thumbnail_click_action

Preview available when user clicks on thumbnail in file detail

Author: fesave

CHANGELOG.md

@@ -23,6 +23,7 @@ Summary
 * Enhancement - New option to show or not hidden files: [#2578](https://github.com/owncloud/android/issues/2578)
 * Enhancement - Option to allow screenshots or not in Android Enterprise: [#3625](https://github.com/owncloud/android/issues/3625)
 * Enhancement - Full name is shown in shares: [#1106](https://github.com/owncloud/android/issues/1106)
+* Enhancement - Thumbnail click action in file detail: [#3653](https://github.com/owncloud/android/pull/3653)
 
 Details
 -------
@@ -143,6 +144,13 @@ Details
    https://github.com/owncloud/android/issues/1106
    https://github.com/owncloud/android/pull/3636
 
+* Enhancement - Thumbnail click action in file detail: [#3653](https://github.com/owncloud/android/pull/3653)
+
+   When a user clicks on a file's detail view thumbnail, the file is automatically downloaded and
+   previewed.
+
+   https://github.com/owncloud/android/pull/3653
+
 Changelog for ownCloud Android Client [2.20.0] (2022-02-16)
 =======================================
 The following sections list the changes in ownCloud Android Client 2.20.0 relevant to

changelog/unreleased/3653

@@ -0,0 +1,6 @@
+Enhancement: Thumbnail click action in file detail
+
+When a user clicks on a file's detail view thumbnail,
+the file is automatically downloaded and previewed.
+
+https://github.com/owncloud/android/pull/3653

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -53,6 +53,10 @@
 import com.owncloud.android.ui.controller.TransferProgressController;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
+import com.owncloud.android.ui.preview.PreviewAudioFragment;
+import com.owncloud.android.ui.preview.PreviewImageFragment;
+import com.owncloud.android.ui.preview.PreviewTextFragment;
+import com.owncloud.android.ui.preview.PreviewVideoFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 import com.owncloud.android.utils.PreferenceUtils;
@@ -329,11 +333,48 @@ public void onClick(View v) {
                 ((FileDisplayActivity) mContainerActivity).cancelTransference(getFile());
                 break;
             }
+            case R.id.fdIcon: {
+                displayFile(getFile());
+            }
             default:
                 Timber.e("Incorrect view clicked!");
         }
     }
 
+    private void displayFile(OCFile file) {
+        if (PreviewImageFragment.canBePreviewed(file)) {
+            // preview image - it handles the sync, if needed
+            ((FileDisplayActivity) mContainerActivity).startImagePreview(file);
+        } else if (PreviewTextFragment.canBePreviewed(file)) {
+            ((FileDisplayActivity) mContainerActivity).startTextPreview(file);
+            mContainerActivity.getFileOperationsHelper().syncFile(file);
+
+        } else if (PreviewAudioFragment.canBePreviewed(file)) {
+            // media preview
+            ((FileDisplayActivity) mContainerActivity).startAudioPreview(file, 0);
+            mContainerActivity.getFileOperationsHelper().syncFile(file);
+
+        } else if (PreviewVideoFragment.canBePreviewed(file) && !file.isDownloading()) {
+            // Available offline exception, don't initialize streaming
+            if (!file.isDown() && file.isAvailableOffline()) {
+                // sync file content, then open with external apps
+                ((FileDisplayActivity) mContainerActivity).startSyncThenOpen(file);
+            } else {
+                // media preview
+                ((FileDisplayActivity) mContainerActivity).startVideoPreview(file, 0);
+            }
+
+            // If the file is already downloaded sync it, just to update it if there is a
+            // new available file version
+            if (file.isDown()) {
+                mContainerActivity.getFileOperationsHelper().syncFile(file);
+            }
+        } else {
+            // sync file content, then open with external apps
+            ((FileDisplayActivity) mContainerActivity).startSyncThenOpen(file);
+        }
+    }
+
     /**
      * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be
      * replaced.
@@ -424,6 +465,7 @@ private void setFiletype(OCFile file) {
         }
 
         ImageView iv = getView().findViewById(R.id.fdIcon);
+        iv.setOnClickListener(this);
 
         if (iv != null) {
             Bitmap thumbnail;

owncloudApp/src/main/res/layout/file_details_fragment.xml

@@ -45,8 +45,8 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:ellipsize="end"
-            android:paddingStart="@dimen/standard_margin"
             android:gravity="center_vertical"
+            android:paddingStart="@dimen/standard_margin"
             android:text=""
             android:textAppearance="?android:attr/textAppearanceLarge"
             app:layout_constraintBottom_toBottomOf="@id/fdIcon"