Skip to content

Video preview: use fullscreen dialog for video instead of new activity #11089

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

Merged
AlvaroBrey merged 5 commits into from
Nov 29, 2022
Merged

Video preview: use fullscreen dialog for video instead of new activity #11089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbb8551
Video preview: use fullscreen dialog for video instead of new activity
AlvaroBrey Nov 24, 2022
b55d576
Fix lint and spotbugs
AlvaroBrey Nov 24, 2022
efa7d9e
Remove unused theme
AlvaroBrey Nov 24, 2022
bdc0fc7
PreviewVideoFullscreenDialog: use listeners to control transfer, and …
AlvaroBrey Nov 25, 2022
3f990c3
PreviewVideoFullscreenDialog: workaround for rotated videos on sdk < 29
AlvaroBrey Nov 28, 2022
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
5 changes: 0 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@
android:name=".ui.preview.PreviewImageActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.Overlay" />
<activity
android:name=".ui.preview.PreviewVideoActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.Fullscreen" />

<service
android:name=".authentication.AccountAuthenticatorService"
android:exported="false">
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/nextcloud/client/di/ComponentsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
import com.owncloud.android.ui.preview.PreviewTextFileFragment;
import com.owncloud.android.ui.preview.PreviewTextFragment;
import com.owncloud.android.ui.preview.PreviewTextStringFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
import com.owncloud.android.ui.preview.pdf.PreviewPdfFragment;
import com.owncloud.android.ui.trashbin.TrashbinActivity;
import com.owncloud.android.utils.FilesUploadHelper;
Expand Down Expand Up @@ -200,9 +199,6 @@ abstract class ComponentsModule {
@ContributesAndroidInjector
abstract PreviewImageActivity previewImageActivity();

@ContributesAndroidInjector
abstract PreviewVideoActivity previewVideoActivity();

@ContributesAndroidInjector
abstract ReceiveExternalFilesActivity receiveExternalFilesActivity();

Expand Down
11 changes: 5 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
import com.owncloud.android.ui.preview.PreviewTextFileFragment;
import com.owncloud.android.ui.preview.PreviewTextFragment;
import com.owncloud.android.ui.preview.PreviewTextStringFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
import com.owncloud.android.ui.preview.pdf.PreviewPdfFragment;
import com.owncloud.android.utils.DataHolderUtil;
import com.owncloud.android.utils.DisplayUtils;
Expand Down Expand Up @@ -2191,8 +2190,8 @@ public void startMediaPreview(OCFile file,
} else {
Intent previewIntent = new Intent();
previewIntent.putExtra(EXTRA_FILE, file);
previewIntent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, startPlaybackPosition);
previewIntent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, autoplay);
previewIntent.putExtra(PreviewMediaFragment.EXTRA_START_POSITION, startPlaybackPosition);
previewIntent.putExtra(PreviewMediaFragment.EXTRA_AUTOPLAY, autoplay);
FileOperationsHelper fileOperationsHelper = new FileOperationsHelper(this,
getUserAccountManager(),
connectivityService, editorUtils);
Expand Down Expand Up @@ -2373,10 +2372,10 @@ public void onMessageEvent(SyncEventFinished event) {
Bundle bundle = event.getIntent().getExtras();
if (event.getIntent().getBooleanExtra(TEXT_PREVIEW, false)) {
startTextPreview((OCFile) bundle.get(EXTRA_FILE), true);
} else if (bundle.containsKey(PreviewVideoActivity.EXTRA_START_POSITION)) {
} else if (bundle.containsKey(PreviewMediaFragment.EXTRA_START_POSITION)) {
startMediaPreview((OCFile) bundle.get(EXTRA_FILE),
(long) bundle.get(PreviewVideoActivity.EXTRA_START_POSITION),
(boolean) bundle.get(PreviewVideoActivity.EXTRA_AUTOPLAY), true, true);
(long) bundle.get(PreviewMediaFragment.EXTRA_START_POSITION),
(boolean) bundle.get(PreviewMediaFragment.EXTRA_AUTOPLAY), true, true);
} else if (bundle.containsKey(PreviewImageActivity.EXTRA_VIRTUAL_TYPE)) {
startImagePreview((OCFile) bundle.get(EXTRA_FILE),
(VirtualFolderType) bundle.get(PreviewImageActivity.EXTRA_VIRTUAL_TYPE),
Expand Down
27 changes: 14 additions & 13 deletions app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.activity.DrawerActivity;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
Expand All @@ -87,6 +86,7 @@
import androidx.annotation.StringRes;
import androidx.appcompat.widget.AppCompatImageButton;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;

/**
Expand All @@ -105,10 +105,14 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene

public static final String EXTRA_FILE = "FILE";
public static final String EXTRA_USER = "USER";
public static final String EXTRA_AUTOPLAY = "AUTOPLAY";
public static final String EXTRA_START_POSITION = "START_POSITION";

private static final String EXTRA_PLAY_POSITION = "PLAY_POSITION";
private static final String EXTRA_PLAYING = "PLAYING";
private static final double MIN_DENSITY_RATIO = 24.0;


private static final String FILE = "FILE";
private static final String USER = "USER";
private static final String PLAYBACK_POSITION = "PLAYBACK_POSITION";
Expand All @@ -128,6 +132,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
FragmentPreviewMediaBinding binding;
private ViewGroup emptyListView;
private ExoPlayer exoPlayer;
private NextcloudClient nextcloudClient;

/**
* Creates a fragment to preview a file.
Expand Down Expand Up @@ -328,9 +333,9 @@ public void onStart() {
final Handler handler = new Handler();
Executors.newSingleThreadExecutor().execute(() -> {
try {
final NextcloudClient client = clientFactory.createNextcloudClient(accountManager.getUser());
nextcloudClient = clientFactory.createNextcloudClient(accountManager.getUser());
handler.post(() ->{
exoPlayer = NextcloudExoPlayer.createNextcloudExoplayer(requireContext(), client);
exoPlayer = NextcloudExoPlayer.createNextcloudExoplayer(requireContext(), nextcloudClient);
exoPlayer.addListener(new ExoplayerListener(requireContext(), binding.exoplayerView, exoPlayer));
playVideo();
});
Expand Down Expand Up @@ -602,14 +607,10 @@ public boolean onTouch(View v, MotionEvent event) {
}

private void startFullScreenVideo() {
Intent intent = new Intent(getActivity(), PreviewVideoActivity.class);
intent.putExtra(FileActivity.EXTRA_USER, user);
intent.putExtra(FileActivity.EXTRA_FILE, getFile());
intent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, exoPlayer.isPlaying());
intent.putExtra(PreviewVideoActivity.EXTRA_STREAM_URL, videoUri);
exoPlayer.pause();
intent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, exoPlayer.getCurrentPosition());
startActivityForResult(intent, FileActivity.REQUEST_CODE__LAST_SHARED + 1);
final FragmentActivity activity = getActivity();
if (activity != null) {
new PreviewVideoFullscreenDialog(activity, nextcloudClient, exoPlayer, binding.exoplayerView).show();
}
}

@Override
Expand All @@ -623,8 +624,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
Log_OC.v(TAG, "onActivityResult " + this);
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == Activity.RESULT_OK) {
savedPlaybackPosition = data.getLongExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
autoplay = data.getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, false);
savedPlaybackPosition = data.getLongExtra(PreviewMediaFragment.EXTRA_START_POSITION, 0);
autoplay = data.getBooleanExtra(PreviewMediaFragment.EXTRA_AUTOPLAY, false);
}
}

Expand Down
211 changes: 0 additions & 211 deletions app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt
View file
Open in desktop

This file was deleted.

Loading