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

bug fix

Browse Source
This commit is contained in:
nuclearfog 2022-08-24 22:08:27 +02:00
parent 5cf559bc30
commit 0e33182f4d
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/backend/utils/AppStyles.java
View File

@ -253,7 +253,7 @@ public final class AppStyles {
Drawable icon = AppCompatResources.getDrawable(context, resId);
setDrawableColor(icon, settings.getIconColor());
if (mTab.getCustomView() == null) {
tabView = View.inflate(context, R.layout.tabitem, null);
tabView = View.inflate(context, R.layout.item_tab, null);
mTab.setCustomView(tabView);
} else {
// Update existing view

34
app/src/main/java/org/nuclearfog/twidda/ui/activities/VideoViewer.java
View File

@ -20,6 +20,7 @@ import static android.widget.Toast.LENGTH_SHORT;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnDismissListener;
import android.content.Intent;
import android.graphics.PixelFormat;
import android.location.Location;
@ -50,11 +51,11 @@ import org.nuclearfog.twidda.ui.dialogs.ConfirmDialog;
import org.nuclearfog.twidda.ui.dialogs.ConfirmDialog.OnConfirmListener;
/**
* Media viewer activity for images and videos
* video player activity to show local and online videos/animations
*
* @author nuclearfog
*/
public class VideoViewer extends MediaActivity implements OnSeekBarChangeListener, OnCompletionListener, DialogInterface.OnDismissListener,
public class VideoViewer extends MediaActivity implements OnSeekBarChangeListener, OnCompletionListener, OnDismissListener,
OnPreparedListener, OnInfoListener, OnErrorListener, OnClickListener, OnTouchListener, OnConfirmListener {
/**
@ -294,16 +295,25 @@ public class VideoViewer extends MediaActivity implements OnSeekBarChangeListene
public void onPrepared(MediaPlayer mp) {
// enable controls for video
if (enableVideoExtras) {
if (playStatus == IDLE) {
playStatus = PLAY;
video_progress.setMax(mp.getDuration());
duration.setText(StringTools.formatMediaTime(mp.getDuration()));
mp.setOnInfoListener(this);
}
if (playStatus == PLAY) {
int videoPos = video_progress.getProgress();
mp.seekTo(videoPos);
mp.start();
switch (playStatus) {
case IDLE:
// initialize seekbar
playStatus = PLAY;
video_progress.setMax(mp.getDuration());
duration.setText(StringTools.formatMediaTime(mp.getDuration()));
mp.setOnInfoListener(this);
// fall through
case PLAY:
// set video pos and start playback
mp.seekTo(video_progress.getProgress());
mp.start();
break;
case PAUSE:
// set only video pos
mp.seekTo(video_progress.getProgress());
break;
}
}
// setup video looping for gif

0
app/src/main/res/layout/tabitem.xml → app/src/main/res/layout/item_tab.xml
View File