diff --git a/app/build.gradle b/app/build.gradle index 8c46f284..6007a2b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ repositories { android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion "21.1.2" defaultConfig { applicationId "com.kabouzeid.materialmusic" diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java index 649a414f..647b2b3f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java @@ -180,7 +180,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements OnMusicRemote private void setUpObservableListViewParams() { albumArtViewHeight = getResources().getDimensionPixelSize(R.dimen.header_image_height); - toolbarColor = Util.resolveColor(this, R.attr.colorPrimary); + toolbarColor = getResources().getColor(R.color.materialmusic_default_bar_color); toolbarHeight = Util.getActionBarSize(this); titleViewHeight = getResources().getDimensionPixelSize(R.dimen.title_view_height); headerOffset = toolbarHeight; diff --git a/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..f42a0e2d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100755 index 00000000..571275f7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png new file mode 100644 index 00000000..b4bdbb55 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_48dp.png new file mode 100644 index 00000000..72dfa9fa Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pause_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png new file mode 100644 index 00000000..164385d0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png new file mode 100644 index 00000000..043acd80 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_grey600_48dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_grey600_48dp.png new file mode 100644 index 00000000..6a890612 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_repeat_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png new file mode 100644 index 00000000..36ea5321 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png new file mode 100644 index 00000000..63f8de50 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shuffle_grey600_48dp.png b/app/src/main/res/drawable-hdpi/ic_shuffle_grey600_48dp.png new file mode 100644 index 00000000..a079e10d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shuffle_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shuffle_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_shuffle_white_48dp.png new file mode 100644 index 00000000..5b3d814a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shuffle_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png new file mode 100644 index 00000000..4fe60888 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png new file mode 100644 index 00000000..2c9310af Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png new file mode 100644 index 00000000..006d4939 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..e91f9048 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100755 index 00000000..9a3e2c91 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png new file mode 100644 index 00000000..026f3885 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_48dp.png new file mode 100644 index 00000000..14b6d17d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pause_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png new file mode 100644 index 00000000..8d1e433a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png new file mode 100644 index 00000000..a55d1992 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_grey600_48dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_grey600_48dp.png new file mode 100644 index 00000000..3d0e2754 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_repeat_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png new file mode 100644 index 00000000..e4dfdbeb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png new file mode 100644 index 00000000..72922006 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shuffle_grey600_48dp.png b/app/src/main/res/drawable-mdpi/ic_shuffle_grey600_48dp.png new file mode 100644 index 00000000..4da2fee0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shuffle_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shuffle_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_shuffle_white_48dp.png new file mode 100644 index 00000000..b1f6d8d9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shuffle_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png new file mode 100644 index 00000000..f282b924 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png new file mode 100644 index 00000000..2522877d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png new file mode 100644 index 00000000..5466f071 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..e5024472 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100755 index 00000000..49f9c2c0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png new file mode 100644 index 00000000..14b6d17d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_48dp.png new file mode 100644 index 00000000..dd4bfdba Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pause_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png new file mode 100644 index 00000000..a55d1992 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png new file mode 100644 index 00000000..7cc00847 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_grey600_48dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_grey600_48dp.png new file mode 100644 index 00000000..bf33f287 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_repeat_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png new file mode 100644 index 00000000..5143bf81 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png new file mode 100644 index 00000000..f3c28433 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shuffle_grey600_48dp.png b/app/src/main/res/drawable-xhdpi/ic_shuffle_grey600_48dp.png new file mode 100644 index 00000000..1c17d675 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shuffle_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shuffle_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_shuffle_white_48dp.png new file mode 100644 index 00000000..02ea7875 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shuffle_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png new file mode 100644 index 00000000..126b88c3 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png new file mode 100644 index 00000000..fcf2d0cf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png new file mode 100644 index 00000000..886301c6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..f801e7ab Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100755 index 00000000..dc33568d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png new file mode 100644 index 00000000..72dfa9fa Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_48dp.png new file mode 100644 index 00000000..6365bd74 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pause_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png new file mode 100644 index 00000000..043acd80 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png new file mode 100644 index 00000000..de7f9bdb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_grey600_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_grey600_48dp.png new file mode 100644 index 00000000..f0935d06 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_repeat_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png new file mode 100644 index 00000000..875414e5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png new file mode 100644 index 00000000..773e6a60 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shuffle_grey600_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_shuffle_grey600_48dp.png new file mode 100644 index 00000000..de8e0c3a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shuffle_grey600_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_48dp.png new file mode 100644 index 00000000..aaea4dc0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png new file mode 100644 index 00000000..84df4f5e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png new file mode 100644 index 00000000..b39b486c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png new file mode 100644 index 00000000..0ffad667 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png differ diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml deleted file mode 100644 index 9d885abd..00000000 --- a/app/src/main/res/drawable/seekbar_thumb.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/seekbar_thumb_normal.xml b/app/src/main/res/drawable/seekbar_thumb_normal.xml deleted file mode 100644 index a249417f..00000000 --- a/app/src/main/res/drawable/seekbar_thumb_normal.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/seekbar_progress.xml b/app/src/main/res/drawable/slider_progress.xml similarity index 100% rename from app/src/main/res/drawable/seekbar_progress.xml rename to app/src/main/res/drawable/slider_progress.xml diff --git a/app/src/main/res/drawable/seekbar_thumb_pressed.xml b/app/src/main/res/drawable/slider_thumb.xml similarity index 77% rename from app/src/main/res/drawable/seekbar_thumb_pressed.xml rename to app/src/main/res/drawable/slider_thumb.xml index c12e65c1..c7cbd433 100644 --- a/app/src/main/res/drawable/seekbar_thumb_pressed.xml +++ b/app/src/main/res/drawable/slider_thumb.xml @@ -1,8 +1,8 @@ + android:height="16dp" + android:width="16dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml index 2b36c135..76c52ad2 100644 --- a/app/src/main/res/layout/activity_music_controller.xml +++ b/app/src/main/res/layout/activity_music_controller.xml @@ -100,12 +100,6 @@ android:background="?attr/music_controller_container_color" android:elevation="2dp"> - - + android:src="@drawable/ic_skip_previous_white_48dp" + android:layout_marginRight="-8dp"/> + android:src="@drawable/ic_skip_next_white_48dp" + android:layout_marginLeft="-8dp"/> + + We were not able to gain audio focus. TagEditorActivity Hello world! - Tag Editor [beta] + Tag Editor Song Album Artist diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 82eb911d..a919185b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,8 +39,8 @@