Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1728 from mfietz/audioplayer_v1.0.12

Browse Source 
Audioplayer v1.0.14 & Audio controls dialog fix
This commit is contained in:
Tom Hennen 2016-03-03 19:38:37 -05:00
commit 651688f3ad
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -31,6 +31,8 @@ import com.bumptech.glide.Glide;
import com.joanzapata.iconify.IconDrawable; import com.joanzapata.iconify.IconDrawable;
import com.joanzapata.iconify.fonts.FontAwesomeIcons; import com.joanzapata.iconify.fonts.FontAwesomeIcons;
import java.util.Locale;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.feed.FeedMedia;
@ -458,9 +460,10 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
if(controller != null && controller.canSetPlaybackSpeed()) { if(controller != null && controller.canSetPlaybackSpeed()) {
float playbackSpeed = (progress + 10) / 20.0f; float playbackSpeed = (progress + 10) / 20.0f;
controller.setPlaybackSpeed(playbackSpeed); controller.setPlaybackSpeed(playbackSpeed);
String speed = String.format("%.2f", playbackSpeed); String speedPref = String.format(Locale.US, "%.2f", playbackSpeed);
UserPreferences.setPlaybackSpeed(speed); UserPreferences.setPlaybackSpeed(speedPref);
txtvPlaybackSpeed.setText(speed + "x"); String speedStr = String.format("%.2fx", playbackSpeed);
txtvPlaybackSpeed.setText(speedStr);
} else if(fromUser) { } else if(fromUser) {
float speed = Float.valueOf(UserPreferences.getPlaybackSpeed()); float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
barPlaybackSpeed.post(() -> { barPlaybackSpeed.post(() -> {
@ -879,7 +882,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
private void updateButPlaybackSpeed() { private void updateButPlaybackSpeed() {
if (controller != null && butPlaybackSpeed != null) { if (controller != null && butPlaybackSpeed != null) {
butPlaybackSpeed.setText(UserPreferences.getPlaybackSpeed() + "x"); float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
String speedStr = String.format("%.2fx", speed);
butPlaybackSpeed.setText(speedStr);
} }
} }

2
build.gradle
View File

@ -57,7 +57,7 @@ project.ext {
rxJavaVersion = "1.1.0" rxJavaVersion = "1.1.0"
rxJavaRulesVersion = "1.1.0.0" rxJavaRulesVersion = "1.1.0.0"
audioPlayerVersion = "v1.0.12" audioPlayerVersion = "v1.0.14"
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {