tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Materialized the seekBar for devices below Lollipop, seekBar visible again in landscape and fixed a common FC

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-20 20:31:55 +02:00
commit 713cbf2b29
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -644,7 +644,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
public void resumePlaying() { public void resumePlaying() {
if (!isPlaying()) { if (!isPlaying()) {
if (requestFocus()) { if (requestFocus()) {
if (isPlayerPrepared) { if (isPlayerPrepared()) {
player.start(); player.start();
playingNotificationHelper.updatePlayState(isPlaying()); playingNotificationHelper.updatePlayState(isPlaying());
MusicPlayerWidget.updateWidgetsPlayState(this, isPlaying()); MusicPlayerWidget.updateWidgetsPlayState(this, isPlaying());
@ -669,7 +669,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
public void back(boolean force) { public void back(boolean force) {
if (position != -1) { if (position != -1) {
if (getSongProgressMillis() > 2000) { if (isPlayerPrepared() && getSongProgressMillis() > 2000) {
seekTo(0); seekTo(0);
} else { } else {
playPreviousSong(force); playPreviousSong(force);

4
app/src/main/res/drawable/slider_progress.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#00000000"/>
</shape>

4
app/src/main/res/drawable/slider_thumb.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<size <size
android:height="16dp" android:height="12dp"
android:width="16dp"/> android:width="12dp"/>
<solid <solid
android:color="@color/materialmusic_accent_color"/> android:color="@color/materialmusic_accent_color"/>
</shape> </shape>

2
app/src/main/res/layout-land/activity_music_controller.xml
View file

@ -207,7 +207,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/footer" android:layout_above="@+id/footer"
android:elevation="1dp" android:elevation="2dp"
android:padding="0dp" android:padding="0dp"
android:progressTint="@color/materialmusic_accent_color" android:progressTint="@color/materialmusic_accent_color"
android:thumbTint="@color/materialmusic_accent_color_darker" android:thumbTint="@color/materialmusic_accent_color_darker"

5
app/src/main/res/values/styles.xml
View file

@ -35,7 +35,10 @@
<item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:background">?android:attr/selectableItemBackground</item>
</style> </style>
<style name="MusicProgressSlider" parent="MusicProgressSliderParent" /> <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
<item name="android:thumbOffset">0dp</item>
<item name="android:thumb">@drawable/slider_thumb</item>
</style>
<style name="Toolbar"> <style name="Toolbar">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>