Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add tap to pause to video trimming editor.

Browse Source
This commit is contained in:
Alan Evans
2020-03-05 09:49:14 -04:00
committed by Greyson Parrelli
parent 28bbfd88b2
commit 5038210d78
5 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
View File

@@ -34,12 +34,12 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
private final Throttler videoScanThrottle = new Throttler(150);
private final Handler handler = new Handler();
private Controller controller;
private Data data = new Data();
private Uri uri;
private VideoPlayer player;
private VideoEditorHud hud;
private Runnable updatePosition;
private Controller controller;
private Data data = new Data();
private Uri uri;
private VideoPlayer player;
@Nullable private VideoEditorHud hud;
private Runnable updatePosition;
public static MediaSendVideoFragment newInstance(@NonNull Uri uri) {
Bundle args = new Bundle();
@@ -92,16 +92,21 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
Log.w(TAG, e);
}
player.setOnClickListener(v -> {
player.pause();
hud.showPlayButton();
});
player.setPlayerCallback(new VideoPlayer.PlayerCallback() {
@Override
public void onPlaying() {
hud.playing();
hud.fadePlayButton();
}
@Override
public void onStopped() {
hud.stopped();
hud.showPlayButton();
}
});
}
@@ -200,6 +205,9 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
public void notifyHidden() {
if (player != null) {
player.pause();
if (hud != null) {
hud.showPlayButton();
}
}
}
@@ -207,6 +215,10 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
public void onEditVideoDuration(long totalDurationUs, long startTimeUs, long endTimeUs, boolean fromEdited, boolean editingComplete) {
controller.onTouchEventsNeeded(!editingComplete);
if (hud != null) {
hud.hidePlayButton();
}
boolean wasEdited = data.durationEdited;
boolean durationEdited = startTimeUs > 0 || endTimeUs < totalDurationUs;
@@ -241,7 +253,7 @@ public class MediaSendVideoFragment extends Fragment implements VideoEditorHud.E
@Override
public void onPlay() {
player.playFromStart();
player.play();
}
@Override