Commit 84217cb1 authored by Alexandre Perraud's avatar Alexandre Perraud Committed by Ludovic Fauvet
Browse files

Audio : Uniformize some icons names


Signed-off-by: Ludovic Fauvet's avatarLudovic Fauvet <etix@videolan.org>
parent 0a8c42c8
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_backward_normal" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/ic_backward_glow" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_backward_glow" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_backward_pressed" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_backward_pressed" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_backward_normal"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_forward_normal" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/ic_forward_glow" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_forward_glow" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_forward_pressed" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_forward_pressed" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_forward_normal"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_pause_normal" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/ic_pause_glow" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_pause_glow" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_pause_pressed" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_pause_pressed" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_pause_normal"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_play_normal" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/ic_play_glow" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_play_glow" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_play_pressed" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_play_pressed" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_play_normal"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_stop_normal" android:state_focused="true" android:state_pressed="false"/>
<item android:drawable="@drawable/ic_stop_glow" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_stop_glow" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_stop_pressed" android:state_focused="true" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_stop_pressed" android:state_focused="false" android:state_pressed="true"/>
<item android:drawable="@drawable/ic_stop_normal"/>
</selector>
\ No newline at end of file
......@@ -42,7 +42,7 @@
android:background="#00000000"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_playlist_switch_glow" />
android:src="@drawable/ic_playlist_pressed" />
<ImageButton
android:id="@+id/adv_function"
......@@ -163,7 +163,7 @@
android:contentDescription="@string/shuffle"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_shuffle" />
android:src="@drawable/ic_shuffle_normal" />
<ImageButton
android:id="@+id/previous"
......@@ -205,7 +205,7 @@
android:contentDescription="@string/repeat"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_repeat" />
android:src="@drawable/ic_repeat_normal" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -208,9 +208,9 @@ public class AudioPlayer extends Fragment implements IAudioPlayer {
public void onClick(View v) {
mSwitcher.showNext();
if (mSwitcher.getDisplayedChild() == 0)
mPlaylistSwitch.setImageResource(R.drawable.ic_playlist_switch_glow);
mPlaylistSwitch.setImageResource(R.drawable.ic_playlist_pressed);
else
mPlaylistSwitch.setImageResource(R.drawable.ic_playlist_switch);
mPlaylistSwitch.setImageResource(R.drawable.ic_playlist_normal);
}
});
mSongsList.setOnItemClickListener(new OnItemClickListener() {
......@@ -321,20 +321,20 @@ public class AudioPlayer extends Fragment implements IAudioPlayer {
mHeaderPlayPause.setContentDescription(getString(R.string.play));
}
if (mAudioController.isShuffling()) {
mShuffle.setImageResource(R.drawable.ic_shuffle_glow);
mShuffle.setImageResource(R.drawable.ic_shuffle_pressed);
} else {
mShuffle.setImageResource(R.drawable.ic_shuffle);
mShuffle.setImageResource(R.drawable.ic_shuffle_normal);
}
switch(mAudioController.getRepeatType()) {
case None:
mRepeat.setImageResource(R.drawable.ic_repeat);
mRepeat.setImageResource(R.drawable.ic_repeat_normal);
break;
case Once:
mRepeat.setImageResource(R.drawable.ic_repeat_one);
break;
default:
case All:
mRepeat.setImageResource(R.drawable.ic_repeat_glow);
mRepeat.setImageResource(R.drawable.ic_repeat_pressed);
break;
}
if (mAudioController.hasNext())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment