Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed behaviour, bug fix, media layout fix

Browse Source
This commit is contained in:
nuclearfog 2021-02-16 17:57:59 +01:00
parent 149edf5000
commit e5c53fcbbb
No known key found for this signature in database
GPG Key ID: D5490E4A81F97B14
5 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/activity/MediaActivity.java
View File

@ -163,7 +163,7 @@ abstract class MediaActivity extends AppCompatActivity implements LocationListen
@Override
public void run() {
public final void run() {
boolean imageSaved = false;
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {

83
app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java
View File

@ -3,6 +3,7 @@ package org.nuclearfog.twidda.activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.PixelFormat;
import android.location.Location;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
@ -106,14 +107,20 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
*/
private static final int SPEED_FACTOR = 6;
/**
* video play status
*/
private enum PlayStat {
PLAY,
PAUSE,
FORWARD,
BACKWARD
BACKWARD,
IDLE
}
@Nullable
private ScheduledExecutorService progressUpdate;
@Nullable
private ImageLoader imageAsync;
private TextView duration, position;
@ -128,7 +135,7 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
private String[] mediaLinks;
private int type;
private PlayStat playStat = PlayStat.PAUSE;
private PlayStat playStat = PlayStat.IDLE;
private int videoPos = 0;
@ -149,9 +156,9 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
ImageButton forward = controlPanel.findViewById(R.id.controller_forward);
ImageButton backward = controlPanel.findViewById(R.id.controller_backward);
ImageButton share = controlPanel.findViewById(R.id.controller_share);
GlobalSettings settings = GlobalSettings.getInstance(this);
adapter = new ImageAdapter(settings, this);
share.setImageResource(R.drawable.share);
forward.setImageResource(R.drawable.forward);
backward.setImageResource(R.drawable.backward);
@ -179,10 +186,13 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
break;
case MEDIAVIEWER_VIDEO:
if (!mediaLinks[0].startsWith("http"))
share.setVisibility(GONE); // local image
videoView.setVisibility(VISIBLE);
controlPanel.setVisibility(VISIBLE);
// disable black background
videoView.setZOrderMediaOverlay(true);
videoView.getHolder().setFormat(PixelFormat.TRANSPARENT);
if (!mediaLinks[0].startsWith("http"))
share.setVisibility(GONE); // local image
progressUpdate = Executors.newScheduledThreadPool(1);
progressUpdate.scheduleWithFixedDelay(new Runnable() {
public void run() {
@ -217,6 +227,8 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
protected void onStop() {
super.onStop();
if (type == MEDIAVIEWER_VIDEO) {
playStat = PlayStat.PAUSE;
setPlayPauseButton();
videoPos = videoView.getCurrentPosition();
videoView.pause();
}
@ -227,7 +239,8 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
protected void onDestroy() {
if (imageAsync != null && imageAsync.getStatus() == RUNNING)
imageAsync.cancel(true);
progressUpdate.shutdown();
if (progressUpdate != null)
progressUpdate.shutdown();
super.onDestroy();
}
@ -237,19 +250,17 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
// play video
if (v.getId() == R.id.controller_play) {
if (!videoView.isPlaying()) {
play.setVisibility(INVISIBLE);
pause.setVisibility(VISIBLE);
videoView.resume();
playStat = PlayStat.PLAY;
setPlayPauseButton();
}
}
// pause video
if (v.getId() == R.id.controller_pause) {
if (videoView.isPlaying()) {
pause.setVisibility(INVISIBLE);
play.setVisibility(VISIBLE);
videoView.pause();
playStat = PlayStat.PAUSE;
setPlayPauseButton();
}
}
// open link with another app
@ -272,17 +283,23 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
if (event.getAction() == ACTION_DOWN) {
playStat = PlayStat.BACKWARD;
videoView.pause();
} else if (event.getAction() == ACTION_UP) {
return true;
}
if (event.getAction() == ACTION_UP) {
playStat = PlayStat.PLAY;
videoView.resume();
return true;
}
} else if (v.getId() == R.id.controller_forward) {
if (event.getAction() == ACTION_DOWN) {
playStat = PlayStat.FORWARD;
videoView.pause();
} else if (event.getAction() == ACTION_UP) {
return true;
}
if (event.getAction() == ACTION_UP) {
playStat = PlayStat.PLAY;
videoView.resume();
return true;
}
} else if (v.getId() == R.id.video_view) {
if (event.getAction() == ACTION_DOWN) {
@ -291,6 +308,7 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
} else {
controlPanel.setVisibility(VISIBLE);
}
return true;
}
}
return false;
@ -327,7 +345,8 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
if (type == MEDIAVIEWER_ANGIF) {
mp.setLooping(true);
} else {
playStat = PlayStat.PLAY;
if (playStat == PlayStat.IDLE)
playStat = PlayStat.PLAY;
video_progress.setMax(mp.getDuration());
duration.setText(StringTools.formatMediaTime(mp.getDuration()));
if (videoPos > 0) {
@ -337,7 +356,7 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
mp.setOnSeekCompleteListener(this);
}
mp.setOnInfoListener(this);
if (!mp.isPlaying()) {
if (playStat == PlayStat.PLAY) {
mp.start();
}
}
@ -381,25 +400,24 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
@Override
public void onCompletion(MediaPlayer mp) {
pause.setVisibility(INVISIBLE);
play.setVisibility(VISIBLE);
playStat = PlayStat.PAUSE;
setPlayPauseButton();
videoPos = 0;
}
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
position.setText(StringTools.formatMediaTime(progress));
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
videoView.pause();
}
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
position.setText(StringTools.formatMediaTime(progress));
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
videoPos = seekBar.getProgress();
@ -438,13 +456,27 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
}
/**
* updates controller panel seekbar
* set play pause button
*/
private void setPlayPauseButton() {
if (playStat == PlayStat.PAUSE || playStat == PlayStat.IDLE) {
play.setVisibility(VISIBLE);
pause.setVisibility(INVISIBLE);
} else {
play.setVisibility(INVISIBLE);
pause.setVisibility(VISIBLE);
}
}
/**
* updates controller panel SeekBar
*/
private void updateSeekBar() {
switch (playStat) {
case PLAY:
video_progress.setProgress(videoPos);
videoPos = videoView.getCurrentPosition();
video_progress.setProgress(videoPos);
video_progress.setProgress(videoPos);
break;
case FORWARD:
@ -453,6 +485,7 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
videoPos = videoView.getDuration();
videoView.pause();
videoView.seekTo(videoPos);
video_progress.setProgress(videoPos);
break;
case BACKWARD:
@ -461,8 +494,8 @@ public class MediaViewer extends MediaActivity implements OnImageClickListener,
videoPos = 0;
videoView.pause();
videoView.seekTo(videoPos);
video_progress.setProgress(videoPos);
break;
}
video_progress.setProgress(videoPos);
}
}

15
app/src/main/res/layout/page_media.xml
View File

@ -26,7 +26,7 @@
android:layout_marginLeft="@dimen/mediapage_preview_margin"
android:layout_marginBottom="@dimen/mediapage_preview_margin"
android:scrollbars="horizontal"
android:visibility="invisible"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHeight_percent="0.2" />
@ -35,31 +35,32 @@
android:id="@+id/video_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
android:id="@+id/media_progress"
android:layout_width="@dimen/mediapage_circle_size"
android:layout_height="@dimen/mediapage_circle_size"
android:layout_marginTop="@dimen/mediapage_preview_margin"
app:layout_constraintBottom_toTopOf="@+id/image_list"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<include
android:id="@+id/media_controlpanel"
layout="@layout/popup_controlpanel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/mediapage_controller_bottom_margin"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
layout="@layout/popup_controlpanel" />
</androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/layout/popup_controlpanel.xml
View File

@ -23,9 +23,9 @@
android:layout_marginTop="@dimen/controller_seekbar_margin"
android:contentDescription="@string/button_play_pause"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@id/controller_forward"
app:layout_constraintStart_toEndOf="@id/controller_backward"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/controller_forward" />
<ImageButton
android:id="@+id/controller_pause"
@ -68,7 +68,6 @@
app:barrierDirection="bottom"
app:constraint_referenced_ids="controller_backward,controller_forward,controller_play" />
<TextView
android:id="@+id/controller_position"
android:layout_width="@dimen/controller_text_width"
@ -77,16 +76,17 @@
android:layout_marginLeft="@dimen/controller_text_margin"
android:singleLine="true"
android:textSize="@dimen/controller_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/controller_progress"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/controller_barrier" />
app:layout_constraintTop_toTopOf="@id/controller_progress"
app:layout_constraintBottom_toBottomOf="@+id/controller_progress"
app:layout_constraintEnd_toStartOf="@id/controller_progress" />
<SeekBar
android:id="@+id/controller_progress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/controller_seekbar_margin"
android:layout_marginTop="@dimen/controller_seekbar_margin"
android:layout_marginBottom="@dimen/controller_seekbar_margin"
android:contentDescription="@string/button_backward"
app:layout_constraintStart_toEndOf="@id/controller_position"
app:layout_constraintTop_toBottomOf="@id/controller_barrier"
@ -101,9 +101,9 @@
android:layout_marginRight="@dimen/controller_text_margin"
android:singleLine="true"
android:textSize="@dimen/controller_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/controller_progress"
app:layout_constraintTop_toBottomOf="@id/controller_barrier" />
app:layout_constraintTop_toTopOf="@id/controller_progress"
app:layout_constraintBottom_toBottomOf="@+id/controller_progress"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/values/dimens.xml
View File

@ -195,9 +195,9 @@
<!--dimens of controlpanel-->
<dimen name="controller_seekbar_margin">10dp</dimen>
<dimen name="controller_text_margin">5dp</dimen>
<dimen name="controller_text_size">12sp</dimen>
<dimen name="controller_text_size">11sp</dimen>
<dimen name="controller_button_width">64dp</dimen>
<dimen name="controller_button_height">32dp</dimen>
<dimen name="controller_text_width">60sp</dimen>
<dimen name="controller_text_width">36sp</dimen>
</resources>