TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 12:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always show view-once video remaining time.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-01-07 14:57:21 -05:00 committed by Alan Evans
parent c142928fad
commit c6b9855198
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
View File

@ -36,9 +36,6 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActionBarActivity
private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_MESSAGE_ID = "message_id";
private static final String KEY_URI = "uri"; private static final String KEY_URI = "uri";
private static final int OVERLAY_TIMEOUT_S = 2;
private static final int FADE_OUT_DURATION_MS = 200;
private ImageView image; private ImageView image;
private VideoPlayer video; private VideoPlayer video;
private View closeButton; private View closeButton;
@ -46,20 +43,14 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActionBarActivity
private ViewOnceMessageViewModel viewModel; private ViewOnceMessageViewModel viewModel;
private Uri uri; private Uri uri;
private int updateCounter;
private final Handler handler = new Handler(Looper.getMainLooper()); private final Handler handler = new Handler(Looper.getMainLooper());
private final Runnable durationUpdateRunnable = () -> { private final Runnable durationUpdateRunnable = () -> {
long timeLeft = TimeUnit.MILLISECONDS.toSeconds(video.getDuration()) - updateCounter; long timeLeft = TimeUnit.MILLISECONDS.toSeconds(video.getDuration() - video.getPlaybackPosition());
long minutes = timeLeft / 60; long minutes = timeLeft / 60;
long seconds = timeLeft % 60; long seconds = timeLeft % 60;
duration.setText(getString(R.string.ViewOnceMessageActivity_video_duration, minutes, seconds)); duration.setText(getString(R.string.ViewOnceMessageActivity_video_duration, minutes, seconds));
updateCounter++;
if (updateCounter > OVERLAY_TIMEOUT_S) {
animateOutOverlay();
} else {
scheduleDurationUpdate(); scheduleDurationUpdate();
}
}; };
public static Intent getIntent(@NonNull Context context, long messageId, @NonNull Uri uri) { public static Intent getIntent(@NonNull Context context, long messageId, @NonNull Uri uri) {
@ -108,7 +99,6 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public void onPlayerReady() { public void onPlayerReady() {
updateCounter = 0;
handler.post(durationUpdateRunnable); handler.post(durationUpdateRunnable);
} }
@ -163,13 +153,8 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActionBarActivity
.into(image); .into(image);
} }
private void animateOutOverlay() {
duration.animate().alpha(0f).setDuration(200).start();
closeButton.animate().alpha(0f).setDuration(200).start();
}
private void scheduleDurationUpdate() { private void scheduleDurationUpdate() {
handler.postDelayed(durationUpdateRunnable, 1000L); handler.postDelayed(durationUpdateRunnable, 100);
} }
private void cancelDurationUpdate() { private void cancelDurationUpdate() {

7
app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
View File

@ -135,6 +135,13 @@ public class VideoPlayer extends FrameLayout {
return 0L; return 0L;
} }
public long getPlaybackPosition() {
if (this.exoPlayer != null) {
return this.exoPlayer.getCurrentPosition();
}
return 0L;
}
public void setWindow(@Nullable Window window) { public void setWindow(@Nullable Window window) {
this.window = window; this.window = window;
} }