diff options
48 files changed, 14 insertions, 13 deletions
diff --git a/res/drawable-hdpi/media_backward.png b/res/drawable-hdpi/media_backward.png Binary files differdeleted file mode 100644 index 3bb85e68..00000000 --- a/res/drawable-hdpi/media_backward.png +++ /dev/null diff --git a/res/drawable-hdpi/media_backward_dark.png b/res/drawable-hdpi/media_backward_dark.png Binary files differnew file mode 100644 index 00000000..b1dde4f5 --- /dev/null +++ b/res/drawable-hdpi/media_backward_dark.png diff --git a/res/drawable-hdpi/media_backward_light.png b/res/drawable-hdpi/media_backward_light.png Binary files differindex 14188c86..3e277267 100644 --- a/res/drawable-hdpi/media_backward_light.png +++ b/res/drawable-hdpi/media_backward_light.png diff --git a/res/drawable-hdpi/media_forward.png b/res/drawable-hdpi/media_forward.png Binary files differdeleted file mode 100644 index cf39f1f0..00000000 --- a/res/drawable-hdpi/media_forward.png +++ /dev/null diff --git a/res/drawable-hdpi/media_forward_dark.png b/res/drawable-hdpi/media_forward_dark.png Binary files differnew file mode 100644 index 00000000..eb2546c7 --- /dev/null +++ b/res/drawable-hdpi/media_forward_dark.png diff --git a/res/drawable-hdpi/media_forward_light.png b/res/drawable-hdpi/media_forward_light.png Binary files differindex 9e172d8f..185e3c39 100644 --- a/res/drawable-hdpi/media_forward_light.png +++ b/res/drawable-hdpi/media_forward_light.png diff --git a/res/drawable-hdpi/media_pause.png b/res/drawable-hdpi/media_pause.png Binary files differdeleted file mode 100644 index d4cab525..00000000 --- a/res/drawable-hdpi/media_pause.png +++ /dev/null diff --git a/res/drawable-hdpi/media_pause_dark.png b/res/drawable-hdpi/media_pause_dark.png Binary files differnew file mode 100644 index 00000000..b057588e --- /dev/null +++ b/res/drawable-hdpi/media_pause_dark.png diff --git a/res/drawable-hdpi/media_pause_light.png b/res/drawable-hdpi/media_pause_light.png Binary files differindex 8ebf9b45..e01815e3 100644 --- a/res/drawable-hdpi/media_pause_light.png +++ b/res/drawable-hdpi/media_pause_light.png diff --git a/res/drawable-hdpi/media_start.png b/res/drawable-hdpi/media_start.png Binary files differdeleted file mode 100644 index 2af5996f..00000000 --- a/res/drawable-hdpi/media_start.png +++ /dev/null diff --git a/res/drawable-hdpi/media_start_dark.png b/res/drawable-hdpi/media_start_dark.png Binary files differnew file mode 100644 index 00000000..dbfd337a --- /dev/null +++ b/res/drawable-hdpi/media_start_dark.png diff --git a/res/drawable-hdpi/media_start_light.png b/res/drawable-hdpi/media_start_light.png Binary files differindex 45cad73c..e4310efc 100644 --- a/res/drawable-hdpi/media_start_light.png +++ b/res/drawable-hdpi/media_start_light.png diff --git a/res/drawable-hdpi/media_stop.png b/res/drawable-hdpi/media_stop.png Binary files differdeleted file mode 100644 index 329eb906..00000000 --- a/res/drawable-hdpi/media_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/media_stop_dark.png b/res/drawable-hdpi/media_stop_dark.png Binary files differnew file mode 100644 index 00000000..5ceb39f3 --- /dev/null +++ b/res/drawable-hdpi/media_stop_dark.png diff --git a/res/drawable-hdpi/media_stop_light.png b/res/drawable-hdpi/media_stop_light.png Binary files differindex 110d538e..8deca73e 100644 --- a/res/drawable-hdpi/media_stop_light.png +++ b/res/drawable-hdpi/media_stop_light.png diff --git a/res/drawable-mdpi/media_backward_dark.png b/res/drawable-mdpi/media_backward_dark.png Binary files differnew file mode 100644 index 00000000..4f2233a1 --- /dev/null +++ b/res/drawable-mdpi/media_backward_dark.png diff --git a/res/drawable-mdpi/media_backward_light.png b/res/drawable-mdpi/media_backward_light.png Binary files differnew file mode 100644 index 00000000..425f2df7 --- /dev/null +++ b/res/drawable-mdpi/media_backward_light.png diff --git a/res/drawable-mdpi/media_forward_dark.png b/res/drawable-mdpi/media_forward_dark.png Binary files differnew file mode 100644 index 00000000..1641c0fa --- /dev/null +++ b/res/drawable-mdpi/media_forward_dark.png diff --git a/res/drawable-mdpi/media_forward_light.png b/res/drawable-mdpi/media_forward_light.png Binary files differnew file mode 100644 index 00000000..2e66868f --- /dev/null +++ b/res/drawable-mdpi/media_forward_light.png diff --git a/res/drawable-mdpi/media_pause_dark.png b/res/drawable-mdpi/media_pause_dark.png Binary files differnew file mode 100644 index 00000000..3580dab4 --- /dev/null +++ b/res/drawable-mdpi/media_pause_dark.png diff --git a/res/drawable-mdpi/media_pause_light.png b/res/drawable-mdpi/media_pause_light.png Binary files differnew file mode 100644 index 00000000..7e9ade73 --- /dev/null +++ b/res/drawable-mdpi/media_pause_light.png diff --git a/res/drawable-mdpi/media_start_dark.png b/res/drawable-mdpi/media_start_dark.png Binary files differnew file mode 100644 index 00000000..a2f198ae --- /dev/null +++ b/res/drawable-mdpi/media_start_dark.png diff --git a/res/drawable-mdpi/media_start_light.png b/res/drawable-mdpi/media_start_light.png Binary files differnew file mode 100644 index 00000000..d69107ba --- /dev/null +++ b/res/drawable-mdpi/media_start_light.png diff --git a/res/drawable-mdpi/media_stop_dark.png b/res/drawable-mdpi/media_stop_dark.png Binary files differnew file mode 100644 index 00000000..944482e6 --- /dev/null +++ b/res/drawable-mdpi/media_stop_dark.png diff --git a/res/drawable-mdpi/media_stop_light.png b/res/drawable-mdpi/media_stop_light.png Binary files differnew file mode 100644 index 00000000..ff1932a1 --- /dev/null +++ b/res/drawable-mdpi/media_stop_light.png diff --git a/res/drawable-xhdpi/media_backward_dark.png b/res/drawable-xhdpi/media_backward_dark.png Binary files differnew file mode 100644 index 00000000..3c9921a8 --- /dev/null +++ b/res/drawable-xhdpi/media_backward_dark.png diff --git a/res/drawable-xhdpi/media_backward_light.png b/res/drawable-xhdpi/media_backward_light.png Binary files differnew file mode 100644 index 00000000..aafd76fa --- /dev/null +++ b/res/drawable-xhdpi/media_backward_light.png diff --git a/res/drawable-xhdpi/media_forward_dark.png b/res/drawable-xhdpi/media_forward_dark.png Binary files differnew file mode 100644 index 00000000..b082b3a6 --- /dev/null +++ b/res/drawable-xhdpi/media_forward_dark.png diff --git a/res/drawable-xhdpi/media_forward_light.png b/res/drawable-xhdpi/media_forward_light.png Binary files differnew file mode 100644 index 00000000..20772843 --- /dev/null +++ b/res/drawable-xhdpi/media_forward_light.png diff --git a/res/drawable-xhdpi/media_pause_dark.png b/res/drawable-xhdpi/media_pause_dark.png Binary files differnew file mode 100644 index 00000000..aafdd4aa --- /dev/null +++ b/res/drawable-xhdpi/media_pause_dark.png diff --git a/res/drawable-xhdpi/media_pause_light.png b/res/drawable-xhdpi/media_pause_light.png Binary files differnew file mode 100644 index 00000000..2639777d --- /dev/null +++ b/res/drawable-xhdpi/media_pause_light.png diff --git a/res/drawable-xhdpi/media_start_dark.png b/res/drawable-xhdpi/media_start_dark.png Binary files differnew file mode 100644 index 00000000..9e63c90b --- /dev/null +++ b/res/drawable-xhdpi/media_start_dark.png diff --git a/res/drawable-xhdpi/media_start_light.png b/res/drawable-xhdpi/media_start_light.png Binary files differnew file mode 100644 index 00000000..2ff8c399 --- /dev/null +++ b/res/drawable-xhdpi/media_start_light.png diff --git a/res/drawable-xhdpi/media_stop_dark.png b/res/drawable-xhdpi/media_stop_dark.png Binary files differnew file mode 100644 index 00000000..9cb32909 --- /dev/null +++ b/res/drawable-xhdpi/media_stop_dark.png diff --git a/res/drawable-xhdpi/media_stop_light.png b/res/drawable-xhdpi/media_stop_light.png Binary files differnew file mode 100644 index 00000000..edf13ccf --- /dev/null +++ b/res/drawable-xhdpi/media_stop_light.png diff --git a/res/drawable-xxhdpi/media_backward_dark.png b/res/drawable-xxhdpi/media_backward_dark.png Binary files differnew file mode 100644 index 00000000..5b6c6148 --- /dev/null +++ b/res/drawable-xxhdpi/media_backward_dark.png diff --git a/res/drawable-xxhdpi/media_backward_light.png b/res/drawable-xxhdpi/media_backward_light.png Binary files differnew file mode 100644 index 00000000..32f7d3bc --- /dev/null +++ b/res/drawable-xxhdpi/media_backward_light.png diff --git a/res/drawable-xxhdpi/media_forward_dark.png b/res/drawable-xxhdpi/media_forward_dark.png Binary files differnew file mode 100644 index 00000000..ca4ee295 --- /dev/null +++ b/res/drawable-xxhdpi/media_forward_dark.png diff --git a/res/drawable-xxhdpi/media_forward_light.png b/res/drawable-xxhdpi/media_forward_light.png Binary files differnew file mode 100644 index 00000000..208e46e9 --- /dev/null +++ b/res/drawable-xxhdpi/media_forward_light.png diff --git a/res/drawable-xxhdpi/media_pause_dark.png b/res/drawable-xxhdpi/media_pause_dark.png Binary files differnew file mode 100644 index 00000000..4b5aacbc --- /dev/null +++ b/res/drawable-xxhdpi/media_pause_dark.png diff --git a/res/drawable-xxhdpi/media_pause_light.png b/res/drawable-xxhdpi/media_pause_light.png Binary files differnew file mode 100644 index 00000000..111f6d00 --- /dev/null +++ b/res/drawable-xxhdpi/media_pause_light.png diff --git a/res/drawable-xxhdpi/media_start_dark.png b/res/drawable-xxhdpi/media_start_dark.png Binary files differnew file mode 100644 index 00000000..641ad544 --- /dev/null +++ b/res/drawable-xxhdpi/media_start_dark.png diff --git a/res/drawable-xxhdpi/media_start_light.png b/res/drawable-xxhdpi/media_start_light.png Binary files differnew file mode 100644 index 00000000..a6286203 --- /dev/null +++ b/res/drawable-xxhdpi/media_start_light.png diff --git a/res/drawable-xxhdpi/media_stop_dark.png b/res/drawable-xxhdpi/media_stop_dark.png Binary files differnew file mode 100644 index 00000000..9a9c432a --- /dev/null +++ b/res/drawable-xxhdpi/media_stop_dark.png diff --git a/res/drawable-xxhdpi/media_stop_light.png b/res/drawable-xxhdpi/media_stop_light.png Binary files differnew file mode 100644 index 00000000..79eb8d95 --- /dev/null +++ b/res/drawable-xxhdpi/media_stop_light.png diff --git a/res/values/themes.xml b/res/values/themes.xml index 4735b161..9e10376b 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -21,12 +21,12 @@ <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> <item name="android:textColorSecondary">@color/cyan</item> <item name="offline_icon">@drawable/main_offline</item> - <item name="media_button_backward">@drawable/media_backward</item> - <item name="media_button_forward">@drawable/media_forward</item> - <item name="media_button_pause">@drawable/media_pause</item> + <item name="media_button_backward">@drawable/media_backward_dark</item> + <item name="media_button_forward">@drawable/media_forward_dark</item> + <item name="media_button_pause">@drawable/media_pause_dark</item> <item name="media_button_repeat_off">@drawable/media_repeat_off</item> - <item name="media_button_start">@drawable/media_start</item> - <item name="media_button_stop">@drawable/media_stop</item> + <item name="media_button_start">@drawable/media_start_dark</item> + <item name="media_button_stop">@drawable/media_stop_dark</item> <item name="chat">@drawable/ic_menu_chat_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="download_none">@drawable/download_none_dark</item> @@ -42,12 +42,12 @@ <item name="android:textColorSecondary">@color/cyan</item> <item name="android:windowBackground">@drawable/background</item> <item name="offline_icon">@drawable/main_offline</item> - <item name="media_button_backward">@drawable/media_backward</item> - <item name="media_button_forward">@drawable/media_forward</item> - <item name="media_button_pause">@drawable/media_pause</item> + <item name="media_button_backward">@drawable/media_backward_dark</item> + <item name="media_button_forward">@drawable/media_forward_dark</item> + <item name="media_button_pause">@drawable/media_pause_dark</item> <item name="media_button_repeat_off">@drawable/media_repeat_off</item> - <item name="media_button_start">@drawable/media_start</item> - <item name="media_button_stop">@drawable/media_stop</item> + <item name="media_button_start">@drawable/media_start_dark</item> + <item name="media_button_stop">@drawable/media_stop_dark</item> <item name="chat">@drawable/ic_menu_chat_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="download_none">@drawable/download_none_dark</item> diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 5b3733da..4df064e5 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -356,8 +356,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity { getImageLoader().loadImage(coverArtView, song, false, false);
int[] attrs = new int[] {(getDownloadService().getPlayerState() == PlayerState.STARTED) ? R.attr.media_button_pause : R.attr.media_button_start};
TypedArray typedArray = this.obtainStyledAttributes(attrs);
- Drawable drawable = typedArray.getDrawable(0);
- startButton.setImageDrawable(drawable);
+ startButton.setImageResource(typedArray.getResourceId(0, 0));
typedArray.recycle();
}
diff --git a/src/github/daneren2005/dsub/view/SongView.java b/src/github/daneren2005/dsub/view/SongView.java index 24e2df0f..ea1f63c5 100644 --- a/src/github/daneren2005/dsub/view/SongView.java +++ b/src/github/daneren2005/dsub/view/SongView.java @@ -223,7 +223,9 @@ public class SongView extends UpdateView implements Checkable { if (playing) { if(!this.playing) { this.playing = playing; - titleTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.now_playing, 0, 0, 0); + int[] attrs = new int[] {R.attr.media_button_start}; + TypedArray typedArray = context.obtainStyledAttributes(attrs); + titleTextView.setCompoundDrawablesWithIntrinsicBounds(typedArray.getResourceId(0, 0), 0, 0, 0); } } else { if(this.playing) { |
