Commit 83982146 authored by Alexandre Perraud's avatar Alexandre Perraud

Repeat : cosmetic renaming

parent 98e01921
......@@ -35,7 +35,7 @@
<attr name="ic_playlist" format="reference" />
<attr name="ic_playlist_on" format="reference" />
<attr name="ic_repeat" format="reference" />
<attr name="ic_repeat_on" format="reference" />
<attr name="ic_repeat_all" format="reference" />
<attr name="ic_repeat_one" format="reference" />
<attr name="ic_shuffle" format="reference" />
<attr name="ic_shuffle_on" format="reference" />
......
......@@ -47,7 +47,7 @@
<item name="ic_playlist">@drawable/ic_playlist</item>
<item name="ic_playlist_on">@drawable/ic_playlist_on</item>
<item name="ic_repeat">@drawable/ic_repeat</item>
<item name="ic_repeat_on">@drawable/ic_repeat_on</item>
<item name="ic_repeat_all">@drawable/ic_repeat_all</item>
<item name="ic_repeat_one">@drawable/ic_repeat_one</item>
<item name="ic_shuffle">@drawable/ic_shuffle</item>
<item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
......@@ -136,7 +136,7 @@
<item name="ic_playlist">@drawable/ic_playlist_w</item>
<item name="ic_playlist_on">@drawable/ic_playlist_on</item>
<item name="ic_repeat">@drawable/ic_repeat_w</item>
<item name="ic_repeat_on">@drawable/ic_repeat_on</item>
<item name="ic_repeat_all">@drawable/ic_repeat_all</item>
<item name="ic_repeat_one">@drawable/ic_repeat_one</item>
<item name="ic_shuffle">@drawable/ic_shuffle_w</item>
<item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
......
......@@ -361,7 +361,7 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
break;
default:
case PlaybackService.REPEAT_ALL:
mRepeat.setImageResource(UiTools.getResourceFromAttribute(act, R.attr.ic_repeat_on));
mRepeat.setImageResource(UiTools.getResourceFromAttribute(act, R.attr.ic_repeat_all));
mRepeat.setContentDescription(getResources().getString(R.string.repeat_all));
break;
}
......
......@@ -331,7 +331,7 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
0, 0);
break;
case PlaybackService.REPEAT_ALL:
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_on, 0, 0);
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_all, 0, 0);
break;
case PlaybackService.REPEAT_ONE:
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_one, 0, 0);
......@@ -347,7 +347,7 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
break;
case PlaybackService.REPEAT_ONE:
if (mService.hasPlaylist()){
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_on, 0, 0);
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_all, 0, 0);
mService.setRepeatType(PlaybackService.REPEAT_ALL);
} else {
mRepeat.setCompoundDrawablesWithIntrinsicBounds(0,
......
......@@ -345,7 +345,7 @@ public class AudioPlayerActivity extends BaseTvActivity implements PlaybackServi
int type = mService.getRepeatType();
if (type == PlaybackService.REPEAT_NONE){
mService.setRepeatType(PlaybackService.REPEAT_ALL);
mRepeat.setImageResource(R.drawable.ic_repeat_on);
mRepeat.setImageResource(R.drawable.ic_repeat_all);
} else if (type == PlaybackService.REPEAT_ALL) {
mService.setRepeatType(PlaybackService.REPEAT_ONE);
mRepeat.setImageResource(R.drawable.ic_repeat_one);
......
......@@ -175,6 +175,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
private ImageView mPlaylistToggle;
private RecyclerView mPlaylist;
private PlaylistAdapter mPlaylistAdapter;
private ImageView mPlaylistNext;
private ImageView mPlaylistPrevious;
private static final int SURFACE_BEST_FIT = 0;
private static final int SURFACE_FIT_HORIZONTAL = 1;
......
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