baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge branch 'master' of https://github.com/SpajicM/NewPipe into count

Browse source
This commit is contained in:
Christian Schabesberger 2017-06-11 14:03:49 +02:00
commit a482aa1e21
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
View file

@ -286,15 +286,13 @@ public class BackgroundPlayer extends Service {
public void onPrepared(boolean playWhenReady) { public void onPrepared(boolean playWhenReady) {
super.onPrepared(playWhenReady); super.onPrepared(playWhenReady);
if (simpleExoPlayer.getDuration() < 15000) { if (simpleExoPlayer.getDuration() < 15000) {
PROGRESS_LOOP_INTERVAL = 1000;
FAST_FORWARD_REWIND_AMOUNT = 2000; FAST_FORWARD_REWIND_AMOUNT = 2000;
} else if (simpleExoPlayer.getDuration() > 60 * 60 * 1000) { } else if (simpleExoPlayer.getDuration() > 60 * 60 * 1000) {
PROGRESS_LOOP_INTERVAL = 2000;
FAST_FORWARD_REWIND_AMOUNT = 60000; FAST_FORWARD_REWIND_AMOUNT = 60000;
} else { } else {
PROGRESS_LOOP_INTERVAL = 2000;
FAST_FORWARD_REWIND_AMOUNT = 10000; FAST_FORWARD_REWIND_AMOUNT = 10000;
} }
PROGRESS_LOOP_INTERVAL = 1000;
basePlayerImpl.getPlayer().setVolume(1f); basePlayerImpl.getPlayer().setVolume(1f);
} }
@ -323,6 +321,7 @@ public class BackgroundPlayer extends Service {
public void onUpdateProgress(int currentProgress, int duration, int bufferPercent) { public void onUpdateProgress(int currentProgress, int duration, int bufferPercent) {
if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false); if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false); if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
if (bigNotRemoteView != null) bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));
updateNotification(-1); updateNotification(-1);
} }

25
app/src/main/res/layout/player_notification_expanded.xml
View file

@ -76,6 +76,20 @@
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
tools:progress="52"/> tools:progress="52"/>
<TextView
android:id="@+id/notificationTime"
style="@android:style/TextAppearance.StatusBar.EventContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="2dp"
android:layout_alignTop="@+id/notificationProgressBar"
android:layout_toRightOf="@+id/notificationCover"
android:ellipsize="end"
android:maxLines="1"
android:textSize="12sp"
tools:text="Duis posuere"/>
<RelativeLayout <RelativeLayout
android:id="@+id/notificationControls" android:id="@+id/notificationControls"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -88,17 +102,14 @@
<ImageButton <ImageButton
android:id="@+id/notificationRepeat" android:id="@+id/notificationRepeat"
android:layout_width="45dp" android:layout_width="25dp"
android:layout_height="match_parent" android:layout_height="25dp"
android:layout_marginLeft="8dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="#00000000" android:background="#00000000"
android:clickable="true" android:clickable="true"
android:paddingBottom="4dp" android:scaleType="fitXY"
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:paddingTop="4dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_white" android:src="@drawable/ic_repeat_white"
tools:ignore="ContentDescription"/> tools:ignore="ContentDescription"/>