Commit 4bf5db1001c6d3ecf21b74d073a6786e486d8f3b
1 parent
95e16d3c
Revertidos los botones por falta de tiempo
Showing
2 changed files
with
12 additions
and
39 deletions
VitamioBundle/res/layout/mediacontroller.xml
| @@ -40,63 +40,37 @@ | @@ -40,63 +40,37 @@ | ||
| 40 | 40 | ||
| 41 | <ImageButton | 41 | <ImageButton |
| 42 | android:id="@+id/mediacontroller_play_pause" | 42 | android:id="@+id/mediacontroller_play_pause" |
| 43 | - android:layout_width="30dip" | 43 | + android:layout_width="54.6dip" |
| 44 | android:layout_height="30dip" | 44 | android:layout_height="30dip" |
| 45 | android:layout_centerHorizontal="true" | 45 | android:layout_centerHorizontal="true" |
| 46 | - android:layout_marginLeft="10dip" | ||
| 47 | - android:layout_marginRight="10dip" | ||
| 48 | android:background="#00000000" | 46 | android:background="#00000000" |
| 49 | android:contentDescription="@string/mediacontroller_play_pause" | 47 | android:contentDescription="@string/mediacontroller_play_pause" |
| 50 | android:gravity="center" | 48 | android:gravity="center" |
| 51 | - android:src="@android:drawable/ic_media_pause" /> | 49 | + android:src="@drawable/mediacontroller_pause_button" /> |
| 52 | 50 | ||
| 53 | <ImageButton | 51 | <ImageButton |
| 54 | android:id="@+id/ImageButton01" | 52 | android:id="@+id/ImageButton01" |
| 55 | - android:layout_width="30dip" | 53 | + android:layout_width="54.6dip" |
| 56 | android:layout_height="30dip" | 54 | android:layout_height="30dip" |
| 57 | - android:layout_marginLeft="10dip" | ||
| 58 | - android:layout_marginRight="10dip" | 55 | + android:layout_marginRight="20dp" |
| 59 | android:layout_toLeftOf="@+id/mediacontroller_play_pause" | 56 | android:layout_toLeftOf="@+id/mediacontroller_play_pause" |
| 60 | android:background="#00000000" | 57 | android:background="#00000000" |
| 61 | android:gravity="center" | 58 | android:gravity="center" |
| 62 | android:scaleType="fitCenter" | 59 | android:scaleType="fitCenter" |
| 63 | - android:src="@android:drawable/ic_media_rew" /> | 60 | + android:src="@drawable/mediacontroller_ff_left" /> |
| 64 | 61 | ||
| 65 | <ImageButton | 62 | <ImageButton |
| 66 | android:id="@+id/ImageButton02" | 63 | android:id="@+id/ImageButton02" |
| 67 | - android:layout_width="30dip" | ||
| 68 | - android:layout_height="30dip" | ||
| 69 | - android:layout_marginLeft="10dip" | ||
| 70 | - android:layout_marginRight="10dip" | ||
| 71 | - android:layout_toRightOf="@+id/mediacontroller_play_pause" | ||
| 72 | - android:background="#00000000" | ||
| 73 | - android:gravity="center" | ||
| 74 | - android:scaleType="fitCenter" | ||
| 75 | - android:src="@android:drawable/ic_media_ff" /> | ||
| 76 | - | ||
| 77 | - <ImageButton | ||
| 78 | - android:id="@+id/ImageButton04" | ||
| 79 | - android:layout_width="30dip" | ||
| 80 | - android:layout_height="30dip" | ||
| 81 | - android:layout_marginLeft="10dip" | ||
| 82 | - android:layout_marginRight="20dip" | ||
| 83 | - android:layout_toRightOf="@id/ImageButton02" | ||
| 84 | - android:background="#00000000" | ||
| 85 | - android:gravity="center" | ||
| 86 | - android:scaleType="fitCenter" | ||
| 87 | - android:src="@android:drawable/ic_media_next" /> | ||
| 88 | - | ||
| 89 | - <ImageButton | ||
| 90 | - android:id="@+id/ImageButton03" | ||
| 91 | - android:layout_width="30dip" | 64 | + android:layout_width="54.6dip" |
| 92 | android:layout_height="30dip" | 65 | android:layout_height="30dip" |
| 66 | + android:layout_alignParentTop="true" | ||
| 93 | android:layout_marginLeft="20dip" | 67 | android:layout_marginLeft="20dip" |
| 94 | - android:layout_marginRight="10dip" | ||
| 95 | - android:layout_toLeftOf="@id/ImageButton01" | 68 | + android:layout_marginRight="40dip" |
| 69 | + android:layout_toRightOf="@+id/mediacontroller_play_pause" | ||
| 96 | android:background="#00000000" | 70 | android:background="#00000000" |
| 97 | android:gravity="center" | 71 | android:gravity="center" |
| 98 | android:scaleType="fitCenter" | 72 | android:scaleType="fitCenter" |
| 99 | - android:src="@android:drawable/ic_media_previous" /> | 73 | + android:src="@drawable/mediacontroller_ff_right" /> |
| 100 | 74 | ||
| 101 | </RelativeLayout> | 75 | </RelativeLayout> |
| 102 | 76 |
VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
| @@ -20,7 +20,6 @@ package io.vov.vitamio.widget; | @@ -20,7 +20,6 @@ package io.vov.vitamio.widget; | ||
| 20 | import io.vov.utils.Log; | 20 | import io.vov.utils.Log; |
| 21 | import io.vov.utils.StringUtils; | 21 | import io.vov.utils.StringUtils; |
| 22 | import io.vov.vitamio.R; | 22 | import io.vov.vitamio.R; |
| 23 | -import android.R.drawable; | ||
| 24 | import android.content.Context; | 23 | import android.content.Context; |
| 25 | import android.graphics.Rect; | 24 | import android.graphics.Rect; |
| 26 | import android.media.AudioManager; | 25 | import android.media.AudioManager; |
| @@ -469,9 +468,9 @@ public class MediaController extends FrameLayout { | @@ -469,9 +468,9 @@ public class MediaController extends FrameLayout { | ||
| 469 | return; | 468 | return; |
| 470 | 469 | ||
| 471 | if (mPlayer.isPlaying()) | 470 | if (mPlayer.isPlaying()) |
| 472 | - mPauseButton.setImageResource(drawable.ic_media_pause); | 471 | + mPauseButton.setImageResource(R.drawable.mediacontroller_pause_button); |
| 473 | else | 472 | else |
| 474 | - mPauseButton.setImageResource(drawable.ic_media_play); | 473 | + mPauseButton.setImageResource(R.drawable.mediacontroller_play_button); |
| 475 | } | 474 | } |
| 476 | 475 | ||
| 477 | private void doPauseResume() { | 476 | private void doPauseResume() { |