diff options
Diffstat (limited to 'app/src/main')
108 files changed, 9 insertions, 30 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SongView.java b/app/src/main/java/github/daneren2005/dsub/view/SongView.java index b9c5fa50..dda86162 100644 --- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java +++ b/app/src/main/java/github/daneren2005/dsub/view/SongView.java @@ -19,7 +19,6 @@ package github.daneren2005.dsub.view; import android.content.Context; -import android.content.res.TypedArray; import android.graphics.Color; import android.view.LayoutInflater; import android.view.View; @@ -216,10 +215,7 @@ public class SongView extends UpdateView2<MusicDirectory.Entry, Boolean> { this.moreImage = moreImage; } } else if(this.moreImage != R.drawable.download_none_light) { - int[] attrs = new int[] {R.attr.download_none}; - TypedArray typedArray = context.obtainStyledAttributes(attrs); - moreButton.setImageResource(typedArray.getResourceId(0, 0)); - typedArray.recycle(); + moreButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.download_none)); this.moreImage = R.drawable.download_none_light; } @@ -241,9 +237,7 @@ public class SongView extends UpdateView2<MusicDirectory.Entry, Boolean> { if (playing) { if(!this.playing) { this.playing = playing; - int[] attrs = new int[] {R.attr.media_button_start}; - TypedArray typedArray = context.obtainStyledAttributes(attrs); - titleTextView.setCompoundDrawablesWithIntrinsicBounds(typedArray.getResourceId(0, 0), 0, 0, 0); + titleTextView.setCompoundDrawablesWithIntrinsicBounds(DrawableTint.getDrawableRes(context, R.attr.playing), 0, 0, 0); } } else { if(this.playing) { diff --git a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java index fd74c872..ef5edc00 100644 --- a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java +++ b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java @@ -19,7 +19,6 @@ package github.daneren2005.dsub.view; import android.content.Context; -import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; @@ -231,9 +230,7 @@ public abstract class UpdateView<T> extends LinearLayout { } } else { if(shaded) { - int[] attrs = new int[] {R.attr.download_none}; - TypedArray typedArray = context.obtainStyledAttributes(attrs); - moreButton.setImageResource(typedArray.getResourceId(0, 0)); + moreButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.download_none)); shaded = false; } } diff --git a/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png Binary files differindex 67056a69..74b11687 100644 --- a/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png +++ b/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png diff --git a/app/src/main/res/drawable-hdpi/action_toggle_list_light.png b/app/src/main/res/drawable-hdpi/action_toggle_list_light.png Binary files differindex 77c3d03a..36a56aac 100644 --- a/app/src/main/res/drawable-hdpi/action_toggle_list_light.png +++ b/app/src/main/res/drawable-hdpi/action_toggle_list_light.png diff --git a/app/src/main/res/drawable-hdpi/media_backward_dark.png b/app/src/main/res/drawable-hdpi/media_backward_dark.png Binary files differindex deae7a8d..fb1f041f 100644 --- a/app/src/main/res/drawable-hdpi/media_backward_dark.png +++ b/app/src/main/res/drawable-hdpi/media_backward_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_backward_light.png b/app/src/main/res/drawable-hdpi/media_backward_light.png Binary files differindex 11a3b225..d97701bf 100644 --- a/app/src/main/res/drawable-hdpi/media_backward_light.png +++ b/app/src/main/res/drawable-hdpi/media_backward_light.png diff --git a/app/src/main/res/drawable-hdpi/media_forward_dark.png b/app/src/main/res/drawable-hdpi/media_forward_dark.png Binary files differindex b60f240d..89096015 100644 --- a/app/src/main/res/drawable-hdpi/media_forward_dark.png +++ b/app/src/main/res/drawable-hdpi/media_forward_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_forward_light.png b/app/src/main/res/drawable-hdpi/media_forward_light.png Binary files differindex cb4b70cf..0f440b74 100644 --- a/app/src/main/res/drawable-hdpi/media_forward_light.png +++ b/app/src/main/res/drawable-hdpi/media_forward_light.png diff --git a/app/src/main/res/drawable-hdpi/media_pause_dark.png b/app/src/main/res/drawable-hdpi/media_pause_dark.png Binary files differindex fdf1c1a2..71a23605 100644 --- a/app/src/main/res/drawable-hdpi/media_pause_dark.png +++ b/app/src/main/res/drawable-hdpi/media_pause_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_pause_light.png b/app/src/main/res/drawable-hdpi/media_pause_light.png Binary files differindex fdd2276f..46c22171 100644 --- a/app/src/main/res/drawable-hdpi/media_pause_light.png +++ b/app/src/main/res/drawable-hdpi/media_pause_light.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png Binary files differindex 995bbaa4..da5763c2 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_all_light.png b/app/src/main/res/drawable-hdpi/media_repeat_all_light.png Binary files differindex 6dfa1024..8be6ca88 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_all_light.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_all_light.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png Binary files differindex ce34c67d..7cabcfe7 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_off_light.png b/app/src/main/res/drawable-hdpi/media_repeat_off_light.png Binary files differindex 0211df57..c601fa6b 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_off_light.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_off_light.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png Binary files differindex 55321dc9..b2e6d094 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_repeat_single_light.png b/app/src/main/res/drawable-hdpi/media_repeat_single_light.png Binary files differindex 0879d340..54dc8035 100644 --- a/app/src/main/res/drawable-hdpi/media_repeat_single_light.png +++ b/app/src/main/res/drawable-hdpi/media_repeat_single_light.png diff --git a/app/src/main/res/drawable-hdpi/media_start_dark.png b/app/src/main/res/drawable-hdpi/media_start_dark.png Binary files differindex 6ac4d556..cc7cdafd 100644 --- a/app/src/main/res/drawable-hdpi/media_start_dark.png +++ b/app/src/main/res/drawable-hdpi/media_start_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_start_light.png b/app/src/main/res/drawable-hdpi/media_start_light.png Binary files differindex 3395873a..e4def5a1 100644 --- a/app/src/main/res/drawable-hdpi/media_start_light.png +++ b/app/src/main/res/drawable-hdpi/media_start_light.png diff --git a/app/src/main/res/drawable-hdpi/media_stop_dark.png b/app/src/main/res/drawable-hdpi/media_stop_dark.png Binary files differindex 33fca4c5..beedd70d 100644 --- a/app/src/main/res/drawable-hdpi/media_stop_dark.png +++ b/app/src/main/res/drawable-hdpi/media_stop_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_stop_light.png b/app/src/main/res/drawable-hdpi/media_stop_light.png Binary files differindex 947f220d..2ebf699d 100644 --- a/app/src/main/res/drawable-hdpi/media_stop_light.png +++ b/app/src/main/res/drawable-hdpi/media_stop_light.png diff --git a/app/src/main/res/drawable-hdpi/playing_dark.png b/app/src/main/res/drawable-hdpi/playing_dark.png Binary files differnew file mode 100644 index 00000000..ae0a7a16 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/playing_dark.png diff --git a/app/src/main/res/drawable-hdpi/playing_light.png b/app/src/main/res/drawable-hdpi/playing_light.png Binary files differnew file mode 100644 index 00000000..89bb167c --- /dev/null +++ b/app/src/main/res/drawable-hdpi/playing_light.png diff --git a/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png Binary files differindex 39df0cfa..442db2fb 100644 --- a/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png +++ b/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png diff --git a/app/src/main/res/drawable-mdpi/action_toggle_list_light.png b/app/src/main/res/drawable-mdpi/action_toggle_list_light.png Binary files differindex f769e18b..f078c702 100644 --- a/app/src/main/res/drawable-mdpi/action_toggle_list_light.png +++ b/app/src/main/res/drawable-mdpi/action_toggle_list_light.png diff --git a/app/src/main/res/drawable-mdpi/media_backward_dark.png b/app/src/main/res/drawable-mdpi/media_backward_dark.png Binary files differindex 445760de..188c14da 100644 --- a/app/src/main/res/drawable-mdpi/media_backward_dark.png +++ b/app/src/main/res/drawable-mdpi/media_backward_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_backward_light.png b/app/src/main/res/drawable-mdpi/media_backward_light.png Binary files differindex f970f58b..14db6396 100644 --- a/app/src/main/res/drawable-mdpi/media_backward_light.png +++ b/app/src/main/res/drawable-mdpi/media_backward_light.png diff --git a/app/src/main/res/drawable-mdpi/media_forward_dark.png b/app/src/main/res/drawable-mdpi/media_forward_dark.png Binary files differindex 6ee523fb..1a7960a3 100644 --- a/app/src/main/res/drawable-mdpi/media_forward_dark.png +++ b/app/src/main/res/drawable-mdpi/media_forward_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_forward_light.png b/app/src/main/res/drawable-mdpi/media_forward_light.png Binary files differindex df83d06f..47122975 100644 --- a/app/src/main/res/drawable-mdpi/media_forward_light.png +++ b/app/src/main/res/drawable-mdpi/media_forward_light.png diff --git a/app/src/main/res/drawable-mdpi/media_pause_dark.png b/app/src/main/res/drawable-mdpi/media_pause_dark.png Binary files differindex 00bada96..d2629514 100644 --- a/app/src/main/res/drawable-mdpi/media_pause_dark.png +++ b/app/src/main/res/drawable-mdpi/media_pause_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_pause_light.png b/app/src/main/res/drawable-mdpi/media_pause_light.png Binary files differindex fcb7723b..538ee077 100644 --- a/app/src/main/res/drawable-mdpi/media_pause_light.png +++ b/app/src/main/res/drawable-mdpi/media_pause_light.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png Binary files differindex 07c0a285..5d71cb4c 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_all_light.png b/app/src/main/res/drawable-mdpi/media_repeat_all_light.png Binary files differindex 1126d157..80d82db1 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_all_light.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_all_light.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png Binary files differindex 8f9e8008..b4984c5e 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_off_light.png b/app/src/main/res/drawable-mdpi/media_repeat_off_light.png Binary files differindex 50e3231a..ba832390 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_off_light.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_off_light.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png Binary files differindex 2cf5534c..1a6e2fc5 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_repeat_single_light.png b/app/src/main/res/drawable-mdpi/media_repeat_single_light.png Binary files differindex ac3deca5..77019cc2 100644 --- a/app/src/main/res/drawable-mdpi/media_repeat_single_light.png +++ b/app/src/main/res/drawable-mdpi/media_repeat_single_light.png diff --git a/app/src/main/res/drawable-mdpi/media_start_dark.png b/app/src/main/res/drawable-mdpi/media_start_dark.png Binary files differindex 56775074..76dcf44b 100644 --- a/app/src/main/res/drawable-mdpi/media_start_dark.png +++ b/app/src/main/res/drawable-mdpi/media_start_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_start_light.png b/app/src/main/res/drawable-mdpi/media_start_light.png Binary files differindex aefeb72e..101c6b8e 100644 --- a/app/src/main/res/drawable-mdpi/media_start_light.png +++ b/app/src/main/res/drawable-mdpi/media_start_light.png diff --git a/app/src/main/res/drawable-mdpi/media_stop_dark.png b/app/src/main/res/drawable-mdpi/media_stop_dark.png Binary files differindex 1d03b294..f2d9e384 100644 --- a/app/src/main/res/drawable-mdpi/media_stop_dark.png +++ b/app/src/main/res/drawable-mdpi/media_stop_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_stop_light.png b/app/src/main/res/drawable-mdpi/media_stop_light.png Binary files differindex 15840f8d..e1ee0ade 100644 --- a/app/src/main/res/drawable-mdpi/media_stop_light.png +++ b/app/src/main/res/drawable-mdpi/media_stop_light.png diff --git a/app/src/main/res/drawable-mdpi/playing_dark.png b/app/src/main/res/drawable-mdpi/playing_dark.png Binary files differnew file mode 100644 index 00000000..7ebe1d86 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/playing_dark.png diff --git a/app/src/main/res/drawable-mdpi/playing_light.png b/app/src/main/res/drawable-mdpi/playing_light.png Binary files differnew file mode 100644 index 00000000..ab2d44e2 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/playing_light.png diff --git a/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png Binary files differindex 08a9bedc..1c973af3 100644 --- a/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png +++ b/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png diff --git a/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png Binary files differindex c74cf4e9..34946bee 100644 --- a/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png +++ b/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_backward_dark.png b/app/src/main/res/drawable-xhdpi/media_backward_dark.png Binary files differindex d46da023..dab65359 100644 --- a/app/src/main/res/drawable-xhdpi/media_backward_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_backward_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_backward_light.png b/app/src/main/res/drawable-xhdpi/media_backward_light.png Binary files differindex 18821229..0973c6c1 100644 --- a/app/src/main/res/drawable-xhdpi/media_backward_light.png +++ b/app/src/main/res/drawable-xhdpi/media_backward_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_forward_dark.png b/app/src/main/res/drawable-xhdpi/media_forward_dark.png Binary files differindex a49131a9..17f23f05 100644 --- a/app/src/main/res/drawable-xhdpi/media_forward_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_forward_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_forward_light.png b/app/src/main/res/drawable-xhdpi/media_forward_light.png Binary files differindex b44d2601..1c05e0fb 100644 --- a/app/src/main/res/drawable-xhdpi/media_forward_light.png +++ b/app/src/main/res/drawable-xhdpi/media_forward_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_pause_dark.png b/app/src/main/res/drawable-xhdpi/media_pause_dark.png Binary files differindex 575592d2..f5445dda 100644 --- a/app/src/main/res/drawable-xhdpi/media_pause_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_pause_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_pause_light.png b/app/src/main/res/drawable-xhdpi/media_pause_light.png Binary files differindex a456b695..afc5574e 100644 --- a/app/src/main/res/drawable-xhdpi/media_pause_light.png +++ b/app/src/main/res/drawable-xhdpi/media_pause_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png Binary files differindex db5a1dec..afff465d 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png Binary files differindex 10f8ab1a..2c75bb45 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png Binary files differindex 58ff008a..aeac383a 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png Binary files differindex 95f96e24..59b0a251 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png Binary files differindex 22ad9fa0..0f91c68a 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png Binary files differindex ae07a07c..7d81893d 100644 --- a/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png +++ b/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_start_dark.png b/app/src/main/res/drawable-xhdpi/media_start_dark.png Binary files differindex 35136a95..0043ac88 100644 --- a/app/src/main/res/drawable-xhdpi/media_start_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_start_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_start_light.png b/app/src/main/res/drawable-xhdpi/media_start_light.png Binary files differindex 5f580848..7381275c 100644 --- a/app/src/main/res/drawable-xhdpi/media_start_light.png +++ b/app/src/main/res/drawable-xhdpi/media_start_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_stop_dark.png b/app/src/main/res/drawable-xhdpi/media_stop_dark.png Binary files differindex 1599def7..ec638e2d 100644 --- a/app/src/main/res/drawable-xhdpi/media_stop_dark.png +++ b/app/src/main/res/drawable-xhdpi/media_stop_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_stop_light.png b/app/src/main/res/drawable-xhdpi/media_stop_light.png Binary files differindex df087b58..0aad7407 100644 --- a/app/src/main/res/drawable-xhdpi/media_stop_light.png +++ b/app/src/main/res/drawable-xhdpi/media_stop_light.png diff --git a/app/src/main/res/drawable-xhdpi/playing_dark.png b/app/src/main/res/drawable-xhdpi/playing_dark.png Binary files differnew file mode 100644 index 00000000..0187d535 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/playing_dark.png diff --git a/app/src/main/res/drawable-xhdpi/playing_light.png b/app/src/main/res/drawable-xhdpi/playing_light.png Binary files differnew file mode 100644 index 00000000..cc8017fa --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/playing_light.png diff --git a/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png Binary files differindex 40e3d20c..409cbb50 100644 --- a/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png +++ b/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png Binary files differindex 1d928683..b04a1e6b 100644 --- a/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png +++ b/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_backward_dark.png b/app/src/main/res/drawable-xxhdpi/media_backward_dark.png Binary files differindex 0037079a..d4d74044 100644 --- a/app/src/main/res/drawable-xxhdpi/media_backward_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_backward_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_backward_light.png b/app/src/main/res/drawable-xxhdpi/media_backward_light.png Binary files differindex 139f777c..49fff2d0 100644 --- a/app/src/main/res/drawable-xxhdpi/media_backward_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_backward_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_forward_dark.png b/app/src/main/res/drawable-xxhdpi/media_forward_dark.png Binary files differindex 009f0121..0b7aacae 100644 --- a/app/src/main/res/drawable-xxhdpi/media_forward_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_forward_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_forward_light.png b/app/src/main/res/drawable-xxhdpi/media_forward_light.png Binary files differindex 518b4bdc..25fc995e 100644 --- a/app/src/main/res/drawable-xxhdpi/media_forward_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_forward_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_pause_dark.png b/app/src/main/res/drawable-xxhdpi/media_pause_dark.png Binary files differindex 78fc1490..1c37886e 100644 --- a/app/src/main/res/drawable-xxhdpi/media_pause_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_pause_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_pause_light.png b/app/src/main/res/drawable-xxhdpi/media_pause_light.png Binary files differindex dace7590..774d15f8 100644 --- a/app/src/main/res/drawable-xxhdpi/media_pause_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_pause_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png Binary files differindex 34b0cb10..8d61a761 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png Binary files differindex 981dd1b0..44eada6e 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png Binary files differindex 05595e80..ae86ddb4 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png Binary files differindex c53f512c..2a776d6a 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png Binary files differindex 09f57c28..8d54610c 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png Binary files differindex 290bcda7..cc108606 100644 --- a/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_start_dark.png b/app/src/main/res/drawable-xxhdpi/media_start_dark.png Binary files differindex a2f1edcc..ee472226 100644 --- a/app/src/main/res/drawable-xxhdpi/media_start_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_start_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_start_light.png b/app/src/main/res/drawable-xxhdpi/media_start_light.png Binary files differindex 9a885f23..13377cee 100644 --- a/app/src/main/res/drawable-xxhdpi/media_start_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_start_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_stop_dark.png b/app/src/main/res/drawable-xxhdpi/media_stop_dark.png Binary files differindex 630709a9..2d380a75 100644 --- a/app/src/main/res/drawable-xxhdpi/media_stop_dark.png +++ b/app/src/main/res/drawable-xxhdpi/media_stop_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_stop_light.png b/app/src/main/res/drawable-xxhdpi/media_stop_light.png Binary files differindex c85bd3aa..c2aee1ef 100644 --- a/app/src/main/res/drawable-xxhdpi/media_stop_light.png +++ b/app/src/main/res/drawable-xxhdpi/media_stop_light.png diff --git a/app/src/main/res/drawable-xxhdpi/playing_dark.png b/app/src/main/res/drawable-xxhdpi/playing_dark.png Binary files differnew file mode 100644 index 00000000..c10e8b39 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/playing_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/playing_light.png b/app/src/main/res/drawable-xxhdpi/playing_light.png Binary files differnew file mode 100644 index 00000000..52d8ccf5 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/playing_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png Binary files differindex 6cce6bb0..5efdb642 100644 --- a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png Binary files differindex e2ac61bd..957a3ac6 100644 --- a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png +++ b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png Binary files differindex 2b2b3710..9e3caf59 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_backward_light.png b/app/src/main/res/drawable-xxxhdpi/media_backward_light.png Binary files differindex 247dd016..b047f7d2 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_backward_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_backward_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png Binary files differindex e8432b66..b62ff39e 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_forward_light.png b/app/src/main/res/drawable-xxxhdpi/media_forward_light.png Binary files differindex 9ec784c4..1ac27750 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_forward_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_forward_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png b/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png Binary files differindex 767494c6..b0b249eb 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_pause_light.png b/app/src/main/res/drawable-xxxhdpi/media_pause_light.png Binary files differindex dfaf4097..b350170b 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_pause_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_pause_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png Binary files differindex 5a61ad86..fed644b6 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png Binary files differindex 9a0cca6d..b62042fe 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png Binary files differindex cdac547a..9e597a2b 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png Binary files differindex c5b3abe7..472c772c 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png Binary files differindex ce3d0d6d..6d543424 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png Binary files differindex d58a2523..355188ab 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_start_dark.png b/app/src/main/res/drawable-xxxhdpi/media_start_dark.png Binary files differindex 1b0d9c68..2d8db4f2 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_start_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_start_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_start_light.png b/app/src/main/res/drawable-xxxhdpi/media_start_light.png Binary files differindex a68b910d..41612b6f 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_start_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_start_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png b/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png Binary files differindex 0e783322..115dacc5 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png +++ b/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_stop_light.png b/app/src/main/res/drawable-xxxhdpi/media_stop_light.png Binary files differindex c9793500..578c6568 100644 --- a/app/src/main/res/drawable-xxxhdpi/media_stop_light.png +++ b/app/src/main/res/drawable-xxxhdpi/media_stop_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/playing_dark.png b/app/src/main/res/drawable-xxxhdpi/playing_dark.png Binary files differnew file mode 100644 index 00000000..35834c49 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/playing_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/playing_light.png b/app/src/main/res/drawable-xxxhdpi/playing_light.png Binary files differnew file mode 100644 index 00000000..7da95c49 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/playing_light.png diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml index 86ddade0..5e306847 100644 --- a/app/src/main/res/layout/appwidget4x1.xml +++ b/app/src/main/res/layout/appwidget4x1.xml @@ -58,7 +58,6 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="10dip" android:minHeight="12sp" - android:paddingBottom="4dip" android:paddingLeft="4dip" android:paddingRight="4dip" android:singleLine="true" @@ -71,16 +70,13 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="horizontal" - android:paddingBottom="4dip" - android:paddingTop="4dip" > + android:orientation="horizontal"> <ImageButton android:id="@+id/control_previous" android:layout_width="0dip" android:layout_height="fill_parent" android:layout_weight="1" - android:scaleType="center" style="@style/NotificationButton" android:src="@drawable/media_backward_dark" /> @@ -89,7 +85,6 @@ android:layout_width="0dip" android:layout_height="fill_parent" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> @@ -98,7 +93,6 @@ android:layout_width="0dip" android:layout_height="fill_parent" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml index 52d0c15c..9d94a3c6 100644 --- a/app/src/main/res/layout/appwidget4x2.xml +++ b/app/src/main/res/layout/appwidget4x2.xml @@ -86,7 +86,7 @@ android:text="Album" android:textColor="@color/appwidget_text" android:textSize="12sp" /> - + </LinearLayout> <LinearLayout @@ -96,14 +96,13 @@ android:layout_gravity="bottom" android:gravity="bottom" android:paddingBottom="4dip" - android:paddingTop="4dip" >" + android:paddingTop="4dip" > <ImageButton android:id="@+id/control_previous" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:scaleType="center" style="@style/NotificationButton" android:src="@drawable/media_backward_dark" /> @@ -112,7 +111,6 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> @@ -121,7 +119,6 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml index 4cfb4b77..989e9e3e 100644 --- a/app/src/main/res/layout/appwidget4x3.xml +++ b/app/src/main/res/layout/appwidget4x3.xml @@ -85,7 +85,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" style="@style/NotificationButton" android:src="@drawable/media_backward_dark" /> @@ -94,7 +93,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> @@ -103,7 +101,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml index 681d9252..96dceebb 100644 --- a/app/src/main/res/layout/appwidget4x4.xml +++ b/app/src/main/res/layout/appwidget4x4.xml @@ -87,7 +87,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" style="@style/NotificationButton" android:src="@drawable/media_backward_dark" /> @@ -96,7 +95,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> @@ -105,7 +103,6 @@ android:layout_width="0dip" android:layout_height="56dip" android:layout_weight="1" - android:scaleType="center" android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 2b9b7f50..8f1e27a8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -26,6 +26,7 @@ <attr name="volume" format="reference"/> <attr name="toggle_list" format="reference"/> <attr name="select_server" format="reference"/> + <attr name="playing" format="reference"/> <attr name="downloading" format="reference"/> <attr name="bookmark" format="reference"/> <attr name="share" format="reference"/> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 357ecdec..6eac0202 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -27,6 +27,7 @@ <item name="volume">@drawable/ic_action_volume_light</item> <item name="toggle_list">@drawable/action_toggle_list_light</item> <item name="select_server">@drawable/main_select_server_light</item> + <item name="playing">@drawable/playing_light</item> <item name="downloading">@drawable/downloading_light</item> <item name="bookmark">@drawable/ic_menu_bookmark_light</item> <item name="share">@drawable/ic_menu_share_light</item> @@ -84,6 +85,7 @@ <item name="volume">@drawable/ic_action_volume_dark</item> <item name="toggle_list">@drawable/action_toggle_list_dark</item> <item name="select_server">@drawable/main_select_server_dark</item> + <item name="playing">@drawable/playing_dark</item> <item name="downloading">@drawable/downloading_dark</item> <item name="bookmark">@drawable/ic_menu_bookmark_dark</item> <item name="share">@drawable/ic_menu_share_dark</item> |
