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

Merge branch 'develop' of github.com:AntennaPod/AntennaPod into develop

Browse Source
This commit is contained in:
Tom Hennen 2016-03-03 19:38:50 -05:00
commit 0dc57a373b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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.fonts.FontAwesomeIcons;
import java.util.Locale;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.feed.FeedMedia;
@ -247,6 +249,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
controller.release();
}
controller = newPlaybackController();
if(butPlay != null) {
butPlay.setOnClickListener(controller.newOnPlayButtonClickListener());
}
}
@Override
@ -455,9 +460,10 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
if(controller != null && controller.canSetPlaybackSpeed()) {
float playbackSpeed = (progress + 10) / 20.0f;
controller.setPlaybackSpeed(playbackSpeed);
String speed = String.format("%.2f", playbackSpeed);
UserPreferences.setPlaybackSpeed(speed);
txtvPlaybackSpeed.setText(speed + "x");
String speedPref = String.format(Locale.US, "%.2f", playbackSpeed);
UserPreferences.setPlaybackSpeed(speedPref);
String speedStr = String.format("%.2fx", playbackSpeed);
txtvPlaybackSpeed.setText(speedStr);
} else if(fromUser) {
float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
barPlaybackSpeed.post(() -> {
@ -876,7 +882,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
private void updateButPlaybackSpeed() {
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"
rxJavaRulesVersion = "1.1.0.0"
audioPlayerVersion = "v1.0.12"
audioPlayerVersion = "v1.0.14"
}
task wrapper(type: Wrapper) {