From 06a52b1323d37e17dd3cff3f5bcb457be6c8a878 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Tue, 14 Jul 2020 19:16:16 +0530 Subject: [PATCH 01/10] Added suggestions --- .../retromusic/activities/MainActivity.kt | 1 + .../monkey/retromusic/adapter/HomeAdapter.kt | 22 +++++++++---------- .../retromusic/fragments/LibraryViewModel.kt | 4 ++-- .../fragments/albums/AlbumsFragment.kt | 1 - .../retromusic/providers/RepositoryImpl.kt | 2 +- .../res/anim/item_animation_fall_down.xml | 22 +++++++++++++++++++ .../res/anim/layout_animation_fall_down.xml | 5 +++++ app/src/main/res/layout/fragment_folder.xml | 1 + .../fragment_main_activity_recycler_view.xml | 1 + app/src/main/res/layout/home_content.xml | 1 + 10 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/anim/item_animation_fall_down.xml create mode 100644 app/src/main/res/anim/layout_animation_fall_down.xml diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index f9560e3c3..dda066248 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -623,6 +623,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), fragment: Fragment, tag: String ) { + supportFragmentManager.commit { replace(R.id.fragment_container, fragment, tag) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index 0e0b79f43..e7a36f295 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -40,7 +40,7 @@ class HomeAdapter( .inflate(R.layout.section_recycler_view, parent, false) return when (viewType) { RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout) - PLAYLISTS -> PlaylistViewHolder(layout) + FAVOURITES -> PlaylistViewHolder(layout) SUGGESTIONS -> { SuggestionsViewHolder( LayoutInflater.from(activity).inflate( @@ -89,19 +89,19 @@ class HomeAdapter( val viewHolder = holder as ArtistViewHolder viewHolder.bindView(list[position].arrayList as List, R.string.top_artists) } - PLAYLISTS -> { - val viewHolder = holder as PlaylistViewHolder - viewHolder.bindView( - list[position].arrayList as List, - R.string.favorites - ) - } SUGGESTIONS -> { val viewHolder = holder as SuggestionsViewHolder viewHolder.bindView( list[position].arrayList as List ) } + FAVOURITES -> { + val viewHolder = holder as PlaylistViewHolder + viewHolder.bindView( + list[position].arrayList as List, + R.string.favorites + ) + } } } @@ -116,7 +116,7 @@ class HomeAdapter( companion object { - @IntDef(RECENT_ALBUMS, TOP_ALBUMS, RECENT_ARTISTS, TOP_ARTISTS, PLAYLISTS, SUGGESTIONS) + @IntDef(RECENT_ALBUMS, TOP_ALBUMS, RECENT_ARTISTS, TOP_ARTISTS, SUGGESTIONS, FAVOURITES) @Retention(AnnotationRetention.SOURCE) annotation class HomeSection @@ -124,8 +124,8 @@ class HomeAdapter( const val TOP_ALBUMS = 1 const val RECENT_ARTISTS = 2 const val TOP_ARTISTS = 0 - const val SUGGESTIONS = 4 - const val PLAYLISTS = 5 + const val SUGGESTIONS = 5 + const val FAVOURITES = 4 } private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt index 1e8424025..1e85bfe3d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt @@ -55,8 +55,8 @@ class LibraryViewModel(application: Application) : _repository.topAlbums(), _repository.recentArtists(), _repository.recentAlbums(), - _repository.favoritePlaylist(), - _repository.suggestions() + _repository.suggestions(), + _repository.favoritePlaylist() ) for (r in result) { if (r != null) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt index 249e0fec6..47d3fd522 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt @@ -15,7 +15,6 @@ class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment(), MainActivityFragmentCallbacks { - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) mainActivity.libraryViewModel.allAlbums() diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt index 315b62bb2..eb6b2e156 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt @@ -110,7 +110,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { val playlists = PlaylistLoader.getFavoritePlaylist(context) return if (playlists.isNotEmpty()) Home( playlists, - HomeAdapter.PLAYLISTS, + HomeAdapter.FAVOURITES, R.drawable.ic_favorite_white_24dp ) else null } diff --git a/app/src/main/res/anim/item_animation_fall_down.xml b/app/src/main/res/anim/item_animation_fall_down.xml new file mode 100644 index 000000000..f486805c1 --- /dev/null +++ b/app/src/main/res/anim/item_animation_fall_down.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/layout_animation_fall_down.xml b/app/src/main/res/anim/layout_animation_fall_down.xml new file mode 100644 index 000000000..6736b9f7d --- /dev/null +++ b/app/src/main/res/anim/layout_animation_fall_down.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 0f7ff63a5..ffe3abd50 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -54,6 +54,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" + android:layoutAnimation="@anim/layout_animation_fall_down" android:overScrollMode="never" android:scrollbars="none" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml index d546767b5..9a925d898 100644 --- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml +++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml @@ -11,6 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipToPadding="false" + android:layoutAnimation="@anim/layout_animation_fall_down" android:overScrollMode="never" android:scrollbars="none" app:layout_dodgeInsetEdges="bottom" diff --git a/app/src/main/res/layout/home_content.xml b/app/src/main/res/layout/home_content.xml index f97294c12..31fa3b898 100644 --- a/app/src/main/res/layout/home_content.xml +++ b/app/src/main/res/layout/home_content.xml @@ -37,6 +37,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layoutAnimation="@anim/layout_animation_fall_down" android:nestedScrollingEnabled="false" android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" From 0e81e3cb4836714dae5717b9380fc98e355cfb25 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Wed, 15 Jul 2020 01:17:41 +0530 Subject: [PATCH 02/10] Replaced material progress with Materia Design components --- app/build.gradle | 3 - .../fragments/MiniPlayerFragment.kt | 15 --- .../name/monkey/retromusic/util/ViewUtil.kt | 5 + .../ic_play_arrow_sharp_white_64dp.xml | 12 +- .../layout-xlarge/fragment_mini_player.xml | 109 ------------------ .../main/res/layout/fragment_mini_player.xml | 23 ++-- appthemehelper/build.gradle | 2 +- 7 files changed, 26 insertions(+), 143 deletions(-) delete mode 100644 app/src/main/res/layout-xlarge/fragment_mini_player.xml diff --git a/app/build.gradle b/app/build.gradle index 528f9b575..bd18cc0ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,9 +149,6 @@ dependencies { implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') { transitive = true } - /*UI Library*/ - implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" def kotlin_coroutines_version = "1.3.3" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index 01f258937..b9cb0362e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -15,14 +15,12 @@ import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.extensions.textColorPrimary import code.name.monkey.retromusic.extensions.textColorSecondary import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment -import code.name.monkey.retromusic.glide.SongGlideRequest import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.ViewUtil -import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.fragment_mini_player.* import kotlin.math.abs @@ -97,19 +95,6 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda miniPlayerTitle.isSelected = true miniPlayerTitle.text = builder - - if (RetroUtil.isTablet()) { - image?.let { - SongGlideRequest.Builder.from( - Glide.with(requireContext()), - MusicPlayerRemote.currentSong - ).checkIgnoreMediaStore(requireContext()) - .ignoreMediaStore(PreferenceUtil.isAllowedToDownloadMetadata()) - .asBitmap() - .build() - .into(it) - } - } } override fun onServiceConnected() { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt index fd64db15c..fbd4cef32 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt @@ -27,6 +27,7 @@ import androidx.core.view.ViewCompat import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper +import com.google.android.material.progressindicator.ProgressIndicator object ViewUtil { @@ -76,6 +77,10 @@ object ViewUtil { ) } + fun setProgressDrawable(progressIndicator: ProgressIndicator, newColor: Int) { + progressIndicator.progressTintList = ColorStateList.valueOf(newColor) + } + fun hitTest(v: View, x: Int, y: Int): Boolean { val tx = (ViewCompat.getTranslationX(v) + 0.5f).toInt() val ty = (ViewCompat.getTranslationY(v) + 0.5f).toInt() diff --git a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml index 5b03f4832..0fe0360e0 100644 --- a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml +++ b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml @@ -17,8 +17,12 @@ android:height="64dp" android:viewportWidth="24" android:viewportHeight="24"> - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_mini_player.xml b/app/src/main/res/layout-xlarge/fragment_mini_player.xml deleted file mode 100644 index e51b2dde3..000000000 --- a/app/src/main/res/layout-xlarge/fragment_mini_player.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index a4c30349a..0f56c37bb 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -62,6 +62,16 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical"> + + - - + + \ No newline at end of file diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle index 3ca1e5969..d8380d679 100644 --- a/appthemehelper/build.gradle +++ b/appthemehelper/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha05' + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.cardview:cardview:1.0.0' // Used for the list preference classes From 768ab295b0b819ccbe902fdf8d19b40614450a2b Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Wed, 15 Jul 2020 01:49:12 +0530 Subject: [PATCH 03/10] Code refactor --- app/build.gradle | 15 ++------------- .../retromusic/fragments/MiniPlayerFragment.kt | 4 ++-- .../drawable/ic_play_arrow_sharp_white_64dp.xml | 11 +++-------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bd18cc0ef..f63a4e9a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 438 - versionName '3.5.650' + versionCode 10438 + versionName '3.5.650' + "_" + getDate() multiDexEnabled true @@ -53,17 +53,6 @@ android { } } - - flavorDimensions "default" - - productFlavors { - normal { - versionCode defaultConfig.versionCode + 10000 - versionName defaultConfig.versionName + "_" + getDate() - dimension "default" - } - } - packagingOptions { exclude 'META-INF/LICENSE' exclude 'META-INF/NOTICE' diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index b9cb0362e..8d5cdb1a9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -130,9 +130,9 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda protected fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_pause_white_24dp) + miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_24dp) + miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) } } diff --git a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml index 0fe0360e0..1cd7da06f 100644 --- a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml +++ b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml @@ -17,12 +17,7 @@ android:height="64dp" android:viewportWidth="24" android:viewportHeight="24"> - - - + \ No newline at end of file From 76331eae7d7d8e9814c33a18d295b1688b9222a8 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Sat, 18 Jul 2020 02:55:04 +0530 Subject: [PATCH 04/10] Code refactor 1. Chaning Home Album sections from MetalAdapter to Normal 2. Adding animation icons 3. Removed cardElevation 0dp --- app/build.gradle | 6 +- app/release/output.json | 20 ++ .../retromusic/PeekingLinearLayoutManager.kt | 46 ++++ .../monkey/retromusic/adapter/HomeAdapter.kt | 50 ++-- .../adapter/album/AlbumFullWidthAdapter.kt | 108 --------- .../fragments/MiniPlayerFragment.kt | 3 +- .../monkey/retromusic/model/CategoryInfo.java | 6 +- .../retromusic/providers/RepositoryImpl.kt | 4 +- .../monkey/retromusic/util/DensityUtil.java | 39 ---- .../monkey/retromusic/util/DensityUtil.kt | 49 ++++ .../name/monkey/retromusic/util/ViewUtil.kt | 3 +- .../views/MetalRecyclerViewPager.kt | 108 --------- .../name/monkey/retromusic/views/SeekArc.java | 2 +- .../drawable-v21/notification_selector.xml | 3 - .../main/res/drawable-v21/widget_selector.xml | 3 - .../drawable-v21/widget_selector_light.xml | 3 - app/src/main/res/drawable/asld_album.xml | 15 ++ app/src/main/res/drawable/asld_home.xml | 15 ++ app/src/main/res/drawable/asld_music_note.xml | 15 ++ app/src/main/res/drawable/avd_album.xml | 39 ++++ app/src/main/res/drawable/avd_home.xml | 96 ++++++++ app/src/main/res/drawable/avd_music_note.xml | 115 ++++++++++ .../res/drawable/notification_selector.xml | 10 +- .../saf_guide_1.webp | Bin .../saf_guide_2.webp | Bin .../saf_guide_3.webp | Bin app/src/main/res/drawable/widget_selector.xml | 10 +- .../res/drawable/widget_selector_light.xml | 10 +- .../main/res/layout-land/activity_album.xml | 2 +- .../layout-land/activity_artist_details.xml | 2 +- app/src/main/res/layout-land/pager_item.xml | 2 +- .../layout-xlarge-land/fragment_player.xml | 65 ------ .../fragment_player_playback_controls.xml | 216 ------------------ .../res/layout-xlarge-land/pager_item.xml | 2 +- .../main/res/layout-xlarge/fragment_blur.xml | 86 ------- .../res/layout-xlarge/fragment_player.xml | 75 ------ app/src/main/res/layout/activity_album.xml | 1 - .../res/layout/activity_artist_details.xml | 1 - .../main/res/layout/fragment_mini_player.xml | 1 + .../fragment_player_playback_controls.xml | 18 +- app/src/main/res/layout/item_album_card.xml | 1 - app/src/main/res/layout/item_artist_card.xml | 3 +- .../main/res/layout/item_artist_square.xml | 3 +- .../main/res/layout/item_donation_option.xml | 2 +- app/src/main/res/layout/item_grid.xml | 1 - app/src/main/res/layout/item_image.xml | 1 - .../main/res/layout/item_image_gradient.xml | 1 - app/src/main/res/layout/item_list.xml | 3 +- app/src/main/res/layout/item_suggestions.xml | 3 +- .../main/res/layout/list_item_color_view.xml | 18 +- .../layout/metal_section_recycler_view.xml | 7 +- app/src/main/res/layout/pager_item.xml | 1 - .../main/res/layout/section_recycler_view.xml | 2 +- .../res/values/metal_recycler_view_attrs.xml | 6 - app/src/main/res/values/seekarc_attrs.xml | 4 +- 55 files changed, 490 insertions(+), 815 deletions(-) create mode 100644 app/release/output.json create mode 100644 app/src/main/java/code/name/monkey/retromusic/PeekingLinearLayoutManager.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java create mode 100644 app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt delete mode 100644 app/src/main/res/drawable-v21/notification_selector.xml delete mode 100644 app/src/main/res/drawable-v21/widget_selector.xml delete mode 100644 app/src/main/res/drawable-v21/widget_selector_light.xml create mode 100644 app/src/main/res/drawable/asld_album.xml create mode 100644 app/src/main/res/drawable/asld_home.xml create mode 100644 app/src/main/res/drawable/asld_music_note.xml create mode 100644 app/src/main/res/drawable/avd_album.xml create mode 100644 app/src/main/res/drawable/avd_home.xml create mode 100644 app/src/main/res/drawable/avd_music_note.xml rename app/src/main/res/{drawable-v21 => drawable}/saf_guide_1.webp (100%) rename app/src/main/res/{drawable-v21 => drawable}/saf_guide_2.webp (100%) rename app/src/main/res/{drawable-v21 => drawable}/saf_guide_3.webp (100%) mode change 100755 => 100644 app/src/main/res/drawable/widget_selector.xml delete mode 100644 app/src/main/res/layout-xlarge-land/fragment_player.xml delete mode 100755 app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml delete mode 100644 app/src/main/res/layout-xlarge/fragment_blur.xml delete mode 100644 app/src/main/res/layout-xlarge/fragment_player.xml delete mode 100644 app/src/main/res/values/metal_recycler_view_attrs.xml diff --git a/app/build.gradle b/app/build.gradle index f63a4e9a8..c199db203 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -107,17 +107,15 @@ dependencies { implementation "androidx.gridlayout:gridlayout:1.0.0" implementation "androidx.cardview:cardview:1.0.0" - implementation "androidx.palette:palette:1.0.0" implementation "androidx.viewpager2:viewpager2:1.1.0-alpha01" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.preference:preference:1.1.1' - + implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.core:core-ktx:1.3.0' implementation 'androidx.fragment:fragment-ktx:1.2.5' implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.android.material:material:1.3.0-alpha01' diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 000000000..758f3ea4a --- /dev/null +++ b/app/release/output.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "code.name.monkey.retromusic", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 10438, + "versionName": "10438", + "enabled": true, + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/PeekingLinearLayoutManager.kt b/app/src/main/java/code/name/monkey/retromusic/PeekingLinearLayoutManager.kt new file mode 100644 index 000000000..a7961ffd3 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/PeekingLinearLayoutManager.kt @@ -0,0 +1,46 @@ +package code.name.monkey.retromusic + +import android.content.Context +import android.util.AttributeSet +import android.view.ViewGroup +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView + +class PeekingLinearLayoutManager : LinearLayoutManager { + @JvmOverloads + constructor( + context: Context?, + @RecyclerView.Orientation orientation: Int = RecyclerView.VERTICAL, + reverseLayout: Boolean = false + ) : super(context, orientation, reverseLayout) + + constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super( + context, + attrs, + defStyleAttr, + defStyleRes + ) + + override fun generateDefaultLayoutParams() = + scaledLayoutParams(super.generateDefaultLayoutParams()) + + override fun generateLayoutParams(lp: ViewGroup.LayoutParams?) = + scaledLayoutParams(super.generateLayoutParams(lp)) + + override fun generateLayoutParams(c: Context?, attrs: AttributeSet?) = + scaledLayoutParams(super.generateLayoutParams(c, attrs)) + + private fun scaledLayoutParams(layoutParams: RecyclerView.LayoutParams) = + layoutParams.apply { + when (orientation) { + HORIZONTAL -> width = (horizontalSpace * ratio).toInt() + VERTICAL -> height = (verticalSpace * ratio).toInt() + } + } + + private val horizontalSpace get() = width - paddingStart - paddingEnd + + private val verticalSpace get() = height - paddingTop - paddingBottom + + private val ratio = 0.8f // change to 0.7f for 70% +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index e7a36f295..681dadece 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -11,9 +11,12 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.HORIZONTAL import code.name.monkey.appthemehelper.ThemeStore +import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.retromusic.PeekingLinearLayoutManager import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter +import code.name.monkey.retromusic.adapter.album.AlbumAdapter import code.name.monkey.retromusic.adapter.artist.ArtistAdapter import code.name.monkey.retromusic.adapter.song.SongAdapter import code.name.monkey.retromusic.extensions.show @@ -23,6 +26,7 @@ import code.name.monkey.retromusic.loaders.PlaylistSongsLoader import code.name.monkey.retromusic.model.* import code.name.monkey.retromusic.util.PreferenceUtil import com.bumptech.glide.Glide +import com.google.android.material.card.MaterialCardView class HomeAdapter( private val activity: AppCompatActivity, @@ -40,8 +44,14 @@ class HomeAdapter( .inflate(R.layout.section_recycler_view, parent, false) return when (viewType) { RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout) + TOP_ALBUMS, RECENT_ALBUMS -> { + AlbumViewHolder( + LayoutInflater.from(activity) + .inflate(R.layout.metal_section_recycler_view, parent, false) + ) + } FAVOURITES -> PlaylistViewHolder(layout) - SUGGESTIONS -> { + else -> { SuggestionsViewHolder( LayoutInflater.from(activity).inflate( R.layout.item_suggestions, @@ -50,15 +60,6 @@ class HomeAdapter( ) ) } - else -> { - AlbumViewHolder( - LayoutInflater.from(activity).inflate( - R.layout.metal_section_recycler_view, - parent, - false - ) - ) - } } } @@ -133,7 +134,9 @@ class HomeAdapter( if (list.isNotEmpty()) { recyclerView.apply { show() - adapter = AlbumFullWidthAdapter(activity, list, displayMetrics) + adapter = AlbumAdapter(activity, list, R.layout.pager_item, null) + layoutManager = + PeekingLinearLayoutManager(activity, HORIZONTAL, false) } title.text = activity.getString(titleRes) } @@ -175,17 +178,20 @@ class HomeAdapter( fun bindView(arrayList: List) { val color = ThemeStore.accentColor(activity) itemView.findViewById(R.id.text).setTextColor(color) - - images.forEachIndexed { index, i -> - itemView.findViewById(i).setOnClickListener { - MusicPlayerRemote.playNext(arrayList[index]) - } - SongGlideRequest.Builder.from(Glide.with(activity), arrayList[index]) - .asBitmap() - .build() - .into(itemView.findViewById(i)) - + itemView.findViewById(R.id.card6).apply { + setCardBackgroundColor(ColorUtil.withAlpha(color, 0.2f)) } + if (arrayList.size > 9) + images.forEachIndexed { index, i -> + itemView.findViewById(i).setOnClickListener { + MusicPlayerRemote.playNext(arrayList[index]) + } + SongGlideRequest.Builder.from(Glide.with(activity), arrayList[index]) + .asBitmap() + .build() + .into(itemView.findViewById(i)) + + } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt deleted file mode 100644 index 5a774b20b..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2017. Alexander Bilchuk - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package code.name.monkey.retromusic.adapter.album - -import android.app.Activity -import android.app.ActivityOptions -import android.util.DisplayMetrics -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.glide.AlbumGlideRequest -import code.name.monkey.retromusic.glide.RetroMusicColoredTarget -import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.model.Album -import code.name.monkey.retromusic.util.NavigationUtil -import code.name.monkey.retromusic.util.color.MediaNotificationProcessor -import code.name.monkey.retromusic.views.MetalRecyclerViewPager -import com.bumptech.glide.Glide - -class AlbumFullWidthAdapter( - private val activity: Activity, - private val dataSet: List, - metrics: DisplayMetrics -) : MetalRecyclerViewPager.MetalAdapter(metrics) { - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FullMetalViewHolder { - return FullMetalViewHolder( - LayoutInflater.from(parent.context).inflate( - R.layout.pager_item, - parent, - false - ) - ) - } - - override fun onBindViewHolder(holder: FullMetalViewHolder, position: Int) { - // don't forget about calling supper.onBindViewHolder! - super.onBindViewHolder(holder, position) - val album = dataSet[position] - holder.title?.text = getAlbumTitle(album) - holder.text?.text = getAlbumText(album) - holder.playSongs?.setOnClickListener { - album.songs?.let { songs -> - MusicPlayerRemote.openQueue( - songs, - 0, - true - ) - } - } - loadAlbumCover(album, holder) - } - - private fun getAlbumTitle(album: Album): String? { - return album.title - } - - private fun getAlbumText(album: Album): String? { - return album.artistName - } - - private fun loadAlbumCover(album: Album, holder: FullMetalViewHolder) { - if (holder.image == null) { - return - } - - AlbumGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong()) - .checkIgnoreMediaStore(activity) - .generatePalette(activity) - .build() - .into(object : RetroMusicColoredTarget(holder.image!!) { - override fun onColorReady(colors: MediaNotificationProcessor) { - - } - }) - } - - override fun getItemCount(): Int { - return dataSet.size - } - - inner class FullMetalViewHolder(itemView: View) : - MetalRecyclerViewPager.MetalViewHolder(itemView) { - - override fun onClick(v: View?) { - val activityOptions = ActivityOptions.makeSceneTransitionAnimation( - activity, - imageContainerCard ?: image, - activity.getString(R.string.transition_album_art) - ) - NavigationUtil.goToAlbumOptions(activity, dataSet[layoutPosition].id, activityOptions) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index 8d5cdb1a9..342536489 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -61,8 +61,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda actionPrevious?.show() } else { - actionNext.visibility = - if (PreferenceUtil.isExtraControls) View.VISIBLE else View.GONE + actionNext.visibility = if (PreferenceUtil.isExtraControls) View.VISIBLE else View.GONE actionPrevious.visibility = if (PreferenceUtil.isExtraControls) View.VISIBLE else View.GONE } diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java index 6fdb6f85b..867bc409e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java @@ -59,9 +59,9 @@ public class CategoryInfo implements Parcelable { } public enum Category { - Home(R.id.action_home, R.string.home, R.drawable.ic_home_white_24dp), - Songs(R.id.action_song, R.string.songs, R.drawable.ic_audiotrack_white_24dp), - Albums(R.id.action_album, R.string.albums, R.drawable.ic_album_white_24dp), + Home(R.id.action_home, R.string.home, R.drawable.asld_home), + Songs(R.id.action_song, R.string.songs, R.drawable.asld_music_note), + Albums(R.id.action_album, R.string.albums, R.drawable.asld_album), Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist_white_24dp), Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play_white_24dp), Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar_white_24dp), diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt index eb6b2e156..87d1dc6b3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt @@ -43,7 +43,9 @@ class RepositoryImpl constructor(private val context: Context) : Repository { ArtistLoader.getArtist(context, artistId) override suspend fun suggestions(): Home? { - val songs = NotRecentlyPlayedPlaylist(context).getSongs(context).shuffled().subList(0, 9) + val songs = NotRecentlyPlayedPlaylist(context).getSongs(context).shuffled().apply { + if (size > 9) subList(0, 9) + } if (songs.isNotEmpty()) { return Home( songs, diff --git a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java deleted file mode 100644 index 6c5c650c2..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - */ - -package code.name.monkey.retromusic.util; - -import android.app.Activity; -import android.content.Context; -import android.util.DisplayMetrics; - -import androidx.annotation.NonNull; - -/** - * Created by hefuyi on 16/7/30. - */ -public class DensityUtil { - - public static int getScreenHeight(@NonNull Context context) { - DisplayMetrics displayMetrics = new DisplayMetrics(); - ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - return displayMetrics.heightPixels; - } - - public static int dip2px(@NonNull Context context, float dpVale) { - final float scale = context.getResources().getDisplayMetrics().density; - return (int) (dpVale * scale + 0.5f); - } - -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt new file mode 100644 index 000000000..2e36de9a7 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ +package code.name.monkey.retromusic.util + +import android.app.Activity +import android.content.Context +import android.util.DisplayMetrics +import android.util.TypedValue + +/** + * Created by hefuyi on 16/7/30. + */ +object DensityUtil { + fun getScreenHeight(context: Context): Int { + val displayMetrics = DisplayMetrics() + (context as Activity).windowManager.defaultDisplay.getMetrics(displayMetrics) + return displayMetrics.heightPixels + } + + fun getScreenWidth(context: Context): Int { + val displayMetrics = DisplayMetrics() + (context as Activity).windowManager.defaultDisplay.getMetrics(displayMetrics) + return displayMetrics.widthPixels + } + + private fun toDP(context: Context, value: Int): Int { + return TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, + value.toFloat(), context.resources.displayMetrics + ).toInt() + } + + @JvmStatic + fun dip2px(context: Context, dpVale: Float): Int { + val scale = context.resources.displayMetrics.density + return (dpVale * scale + 0.5f).toInt() + } +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt index fbd4cef32..591c67d94 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt @@ -78,7 +78,8 @@ object ViewUtil { } fun setProgressDrawable(progressIndicator: ProgressIndicator, newColor: Int) { - progressIndicator.progressTintList = ColorStateList.valueOf(newColor) + progressIndicator.indicatorColors = intArrayOf(newColor) + progressIndicator.trackColor = ColorUtil.withAlpha(newColor, 0.2f) } fun hitTest(v: View, x: Int, y: Int): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt deleted file mode 100644 index 29bab7ba8..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - */ - -package code.name.monkey.retromusic.views - -import android.content.Context -import android.util.AttributeSet -import android.util.DisplayMetrics -import android.view.View -import android.view.ViewGroup -import androidx.annotation.NonNull -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.PagerSnapHelper -import androidx.recyclerview.widget.RecyclerView -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.util.RetroUtil - -class MetalRecyclerViewPager : RecyclerView { - constructor(context: Context) : super(context) { - init(context, null) - } - - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - init(context, attrs) - } - - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) { - init(context, attrs) - } - - private var itemMargin: Int = 0 - - fun init(context: Context, attrs: AttributeSet?) { - val typedArray = - context.obtainStyledAttributes(attrs, R.styleable.MetalRecyclerViewPager, 0, 0) - itemMargin = - typedArray.getDimension(R.styleable.MetalRecyclerViewPager_itemMargin, 0f).toInt() - typedArray.recycle() - - layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) - val snapHelper = PagerSnapHelper() - snapHelper.attachToRecyclerView(this) - } - - override fun setAdapter(adapter: Adapter<*>?) { - if (adapter is MetalAdapter) { - adapter.setItemMargin(itemMargin) - adapter.updateDisplayMetrics() - } else { - throw IllegalArgumentException("Only MetalAdapter is allowed here") - } - super.setAdapter(adapter) - } - - abstract class MetalAdapter(@NonNull val displayMetrics: DisplayMetrics) : - RecyclerView.Adapter() { - private var itemMargin: Int = 0 - private var itemWidth: Int = 0 - - fun setItemMargin(itemMargin: Int) { - this.itemMargin = itemMargin - } - - fun updateDisplayMetrics() { - itemWidth = if (RetroUtil.isTablet()) { - displayMetrics.widthPixels / 2 - itemMargin * 3 - } else if (RetroUtil.isLandscape()) { - ((displayMetrics.widthPixels / 2.5f) - itemMargin).toInt() - } else { - displayMetrics.widthPixels - itemMargin - } - } - - override fun onBindViewHolder(holder: VH, position: Int) { - val currentItemWidth = itemWidth - if (position == 0) { - //currentItemWidth += itemMargin; - holder.rootLayout.setPadding(0, 0, 0, 0); - } else if (position == itemCount - 1) { - //currentItemWidth += itemMargin; - holder.rootLayout.setPadding(0, 0, 0, 0); - } - - val height = holder.rootLayout.layoutParams.height - holder.rootLayout.layoutParams = ViewGroup.LayoutParams(currentItemWidth, height) - } - } - - abstract class MetalViewHolder(itemView: View) : MediaEntryViewHolder(itemView) { - var rootLayout: ViewGroup = itemView.findViewById(R.id.root_layout) - } -} diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SeekArc.java b/app/src/main/java/code/name/monkey/retromusic/views/SeekArc.java index 726a5f73e..684410fc3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/SeekArc.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/SeekArc.java @@ -405,7 +405,7 @@ public class SeekArc extends View { thumbHalfheight); mMax = a.getInteger(R.styleable.SeekArc_max, mMax); - mProgress = a.getInteger(R.styleable.SeekArc_progress, mProgress); + mProgress = a.getInteger(R.styleable.SeekArc_seekProgress, mProgress); mProgressWidth = (int) a.getDimension( R.styleable.SeekArc_progressWidth, mProgressWidth); mArcWidth = (int) a.getDimension(R.styleable.SeekArc_arcWidth, diff --git a/app/src/main/res/drawable-v21/notification_selector.xml b/app/src/main/res/drawable-v21/notification_selector.xml deleted file mode 100644 index 83aed83c3..000000000 --- a/app/src/main/res/drawable-v21/notification_selector.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/widget_selector.xml b/app/src/main/res/drawable-v21/widget_selector.xml deleted file mode 100644 index f03604195..000000000 --- a/app/src/main/res/drawable-v21/widget_selector.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/widget_selector_light.xml b/app/src/main/res/drawable-v21/widget_selector_light.xml deleted file mode 100644 index 83aed83c3..000000000 --- a/app/src/main/res/drawable-v21/widget_selector_light.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/drawable/asld_album.xml b/app/src/main/res/drawable/asld_album.xml new file mode 100644 index 000000000..0b8fd84ea --- /dev/null +++ b/app/src/main/res/drawable/asld_album.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/asld_home.xml b/app/src/main/res/drawable/asld_home.xml new file mode 100644 index 000000000..1b4da255a --- /dev/null +++ b/app/src/main/res/drawable/asld_home.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/asld_music_note.xml b/app/src/main/res/drawable/asld_music_note.xml new file mode 100644 index 000000000..b6086e4fc --- /dev/null +++ b/app/src/main/res/drawable/asld_music_note.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/avd_album.xml b/app/src/main/res/drawable/avd_album.xml new file mode 100644 index 000000000..696cae4ba --- /dev/null +++ b/app/src/main/res/drawable/avd_album.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/avd_home.xml b/app/src/main/res/drawable/avd_home.xml new file mode 100644 index 000000000..ec4056468 --- /dev/null +++ b/app/src/main/res/drawable/avd_home.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/avd_music_note.xml b/app/src/main/res/drawable/avd_music_note.xml new file mode 100644 index 000000000..1db16c7e5 --- /dev/null +++ b/app/src/main/res/drawable/avd_music_note.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/notification_selector.xml b/app/src/main/res/drawable/notification_selector.xml index d7867f86c..83aed83c3 100644 --- a/app/src/main/res/drawable/notification_selector.xml +++ b/app/src/main/res/drawable/notification_selector.xml @@ -1,9 +1,3 @@ - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/saf_guide_1.webp b/app/src/main/res/drawable/saf_guide_1.webp similarity index 100% rename from app/src/main/res/drawable-v21/saf_guide_1.webp rename to app/src/main/res/drawable/saf_guide_1.webp diff --git a/app/src/main/res/drawable-v21/saf_guide_2.webp b/app/src/main/res/drawable/saf_guide_2.webp similarity index 100% rename from app/src/main/res/drawable-v21/saf_guide_2.webp rename to app/src/main/res/drawable/saf_guide_2.webp diff --git a/app/src/main/res/drawable-v21/saf_guide_3.webp b/app/src/main/res/drawable/saf_guide_3.webp similarity index 100% rename from app/src/main/res/drawable-v21/saf_guide_3.webp rename to app/src/main/res/drawable/saf_guide_3.webp diff --git a/app/src/main/res/drawable/widget_selector.xml b/app/src/main/res/drawable/widget_selector.xml old mode 100755 new mode 100644 index d7867f86c..f03604195 --- a/app/src/main/res/drawable/widget_selector.xml +++ b/app/src/main/res/drawable/widget_selector.xml @@ -1,9 +1,3 @@ - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable/widget_selector_light.xml b/app/src/main/res/drawable/widget_selector_light.xml index 75e988c0b..83aed83c3 100644 --- a/app/src/main/res/drawable/widget_selector_light.xml +++ b/app/src/main/res/drawable/widget_selector_light.xml @@ -1,9 +1,3 @@ - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index 7402e4522..47d9002f2 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -48,7 +48,7 @@ android:layout_marginEnd="16dp" android:transitionName="@string/transition_album_art" app:cardCornerRadius="24dp" - app:cardElevation="0dp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/container" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index 3f62c2eef..85e50dda6 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -48,7 +48,7 @@ android:layout_marginEnd="16dp" android:transitionName="@string/transition_artist_image" app:cardCornerRadius="24dp" - app:cardElevation="0dp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/container" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml index 9dac9266c..d4c26e0e5 100644 --- a/app/src/main/res/layout-land/pager_item.xml +++ b/app/src/main/res/layout-land/pager_item.xml @@ -14,7 +14,7 @@ android:layout_height="156dp" android:layout_margin="8dp" app:cardCornerRadius="16dp" - app:cardElevation="0dp"> + > - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml deleted file mode 100755 index 0d859ef2b..000000000 --- a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml index 9e3d13f76..627037df6 100644 --- a/app/src/main/res/layout-xlarge-land/pager_item.xml +++ b/app/src/main/res/layout-xlarge-land/pager_item.xml @@ -14,7 +14,7 @@ android:layout_height="256dp" android:layout_margin="8dp" app:cardCornerRadius="16dp" - app:cardElevation="0dp"> + > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml deleted file mode 100644 index 720ab992c..000000000 --- a/app/src/main/res/layout-xlarge/fragment_player.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index cacb70676..71302b6b3 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -64,7 +64,6 @@ android:layout_marginEnd="16dp" android:transitionName="@string/transition_album_art" app:cardCornerRadius="24dp" - app:cardElevation="0dp" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index fdbad70ce..b65a3bfef 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -63,7 +63,6 @@ android:layout_marginEnd="16dp" android:transitionName="@string/transition_artist_image" app:cardCornerRadius="24dp" - app:cardElevation="0dp" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index 0f56c37bb..3f5161b6a 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -67,6 +67,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:circularRadius="16dp" + app:indicatorColor="@android:color/black" app:indicatorType="circular" app:indicatorWidth="2dp" app:linearSeamless="true" diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index 5ba61f149..c181fbaaa 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -27,9 +27,9 @@ + tools:text="@tools:sample/full_names" /> + tools:text="@tools:sample/full_names" /> diff --git a/app/src/main/res/layout/item_artist_card.xml b/app/src/main/res/layout/item_artist_card.xml index 69d61f442..f0558b04b 100644 --- a/app/src/main/res/layout/item_artist_card.xml +++ b/app/src/main/res/layout/item_artist_card.xml @@ -17,8 +17,7 @@ android:layout_width="128dp" android:layout_height="128dp" android:layout_margin="4dp" - app:cardCornerRadius="16dp" - app:cardElevation="0dp"> + app:cardCornerRadius="16dp"> + app:cardCornerRadius="8dp"> + app:cardCornerRadius="6dp"> @@ -69,13 +69,11 @@ android:orientation="vertical" app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" /> - diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml index 19d67030b..06d45eb90 100644 --- a/app/src/main/res/layout/metal_section_recycler_view.xml +++ b/app/src/main/res/layout/metal_section_recycler_view.xml @@ -12,7 +12,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:paddingHorizontal="16dp" - android:paddingVertical="12dp" + android:paddingVertical="14dp" android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -21,14 +21,13 @@ app:layout_constraintTop_toTopOf="parent" tools:text="@tools:sample/full_names" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/seekarc_attrs.xml b/app/src/main/res/values/seekarc_attrs.xml index d8e6e3515..22e021aca 100644 --- a/app/src/main/res/values/seekarc_attrs.xml +++ b/app/src/main/res/values/seekarc_attrs.xml @@ -29,7 +29,7 @@ - + @@ -42,7 +42,7 @@ - + \ No newline at end of file From f85c55cf493f84c2cabd2d7ffbf314fb6de33e33 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Sun, 19 Jul 2020 16:51:15 +0530 Subject: [PATCH 05/10] All Dialog are with color buttons now --- .../tageditor/WriteTagsAsyncTask.java | 3 +-- .../retromusic/adapter/song/SongAdapter.kt | 11 +------- .../retromusic/dialogs/AddToPlaylistDialog.kt | 3 ++- .../dialogs/CreatePlaylistDialog.kt | 2 ++ .../dialogs/DeletePlaylistDialog.kt | 2 ++ .../retromusic/dialogs/DeleteSongsDialog.kt | 2 ++ .../dialogs/RemoveFromPlaylistDialog.kt | 2 ++ .../dialogs/RenamePlaylistDialog.kt | 2 ++ .../retromusic/dialogs/SleepTimerDialog.kt | 2 ++ .../retromusic/dialogs/SongDetailDialog.kt | 2 ++ .../retromusic/dialogs/SongShareDialog.kt | 2 ++ .../monkey/retromusic/extensions/ColorExt.kt | 12 +++++++++ .../mvp/presenter/AlbumPresenter.kt | 26 ------------------- .../mvp/presenter/GenreDetailsPresenter.kt | 8 +++--- .../mvp/presenter/PlaylistSongsPresenter.kt | 9 ++++--- .../AlbumCoverStylePreferenceDialog.kt | 2 ++ .../preferences/BlacklistPreferenceDialog.kt | 10 ++++--- .../preferences/LibraryPreference.kt | 2 ++ .../NowPlayingScreenPreferenceDialog.kt | 19 ++------------ 19 files changed, 52 insertions(+), 69 deletions(-) delete mode 100644 app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java index 81a8a7a59..7dfa6f7ab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java @@ -34,8 +34,7 @@ import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListene import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.SAFUtil; -public class WriteTagsAsyncTask extends - DialogAsyncTask { +public class WriteTagsAsyncTask extends DialogAsyncTask { private WeakReference activity; diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index 2c0caa401..1fa9f52c9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -3,7 +3,6 @@ package code.name.monkey.retromusic.adapter.song import android.app.ActivityOptions import android.content.res.ColorStateList import android.content.res.Resources -import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -25,12 +24,10 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil - import code.name.monkey.retromusic.util.color.MediaNotificationProcessor import com.afollestad.materialcab.MaterialCab import com.bumptech.glide.Glide import me.zhanghai.android.fastscroll.PopupTextProvider -import java.util.* /** * Created by hemanths on 13/08/17. @@ -56,7 +53,7 @@ open class SongAdapter( } open fun swapDataSet(dataSet: List) { - this.dataSet = dataSet.toMutableList() + this.dataSet = ArrayList(dataSet) notifyDataSetChanged() } @@ -109,11 +106,6 @@ open class SongAdapter( .checkIgnoreMediaStore(activity) .generatePalette(activity).build() .into(object : RetroMusicColoredTarget(holder.image!!) { - override fun onLoadCleared(placeholder: Drawable?) { - super.onLoadCleared(placeholder) - - } - override fun onColorReady(colors: MediaNotificationProcessor) { setColors(colors, holder) } @@ -210,7 +202,6 @@ open class SongAdapter( } companion object { - val TAG: String = SongAdapter::class.java.simpleName } } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt index 009cd5b38..346d5e315 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt @@ -19,6 +19,7 @@ import android.os.Bundle import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.loaders.PlaylistLoader import code.name.monkey.retromusic.model.Song @@ -57,7 +58,7 @@ class AddToPlaylistDialog : DialogFragment() { } dismiss() } - .create() + .create().colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt index 4b232c4c4..917095050 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt @@ -23,6 +23,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PlaylistsUtil @@ -65,6 +66,7 @@ class CreatePlaylistDialog : DialogFragment() { } } .create() + .colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt index a3026e810..a3f01f58f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt @@ -20,6 +20,7 @@ import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_PLAYLIST import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.util.PlaylistsUtil @@ -57,6 +58,7 @@ class DeletePlaylistDialog : DialogFragment() { PlaylistsUtil.deletePlaylists(requireContext(), playlists) } .create() + .colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt index 2151104b6..6c751b978 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt @@ -23,6 +23,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.saf.SAFGuideActivity +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song @@ -74,6 +75,7 @@ class DeleteSongsDialog : DialogFragment() { deleteSongsAsyncTask?.execute(DeleteSongsAsyncTask.LoadingInfo(songs, null)) } .create() + .colorButtons() } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt index 206a89e7d..742792843 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt @@ -21,6 +21,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.R.string +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.model.PlaylistSong import code.name.monkey.retromusic.util.PlaylistsUtil import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -65,6 +66,7 @@ class RemoveFromPlaylistDialog : DialogFragment() { } .setNegativeButton(android.R.string.cancel, null) .create() + .colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt index ba11e6ef5..91951fa6d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt @@ -22,6 +22,7 @@ import android.view.LayoutInflater import androidx.fragment.app.DialogFragment import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.util.PlaylistsUtil import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -60,6 +61,7 @@ class RenamePlaylistDialog : DialogFragment() { } } .create() + .colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt index 70e69ae51..5f7e72b19 100755 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt @@ -31,6 +31,7 @@ import android.widget.Toast import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.addAccentColor +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.ACTION_PENDING_QUIT @@ -132,6 +133,7 @@ class SleepTimerDialog : DialogFragment() { } } .create() + .colorButtons() } private fun updateTimeDisplayTime() { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt index 5bc2aba36..2ac82aff1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt @@ -29,6 +29,7 @@ import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -157,6 +158,7 @@ class SongDetailDialog : DialogFragment() { .setPositiveButton(android.R.string.ok, null) .setView(dialogView) .create() + .colorButtons() } companion object { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt index 2f039e635..c85d74495 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt @@ -21,6 +21,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.ShareInstagramStory +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -48,6 +49,7 @@ class SongShareDialog : DialogFragment() { withAction(which, song, listening) } .create() + .colorButtons() } private fun withAction( diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt index b5d379209..00a55240d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt @@ -21,11 +21,13 @@ import android.graphics.Color import android.widget.CheckBox import android.widget.SeekBar import androidx.annotation.AttrRes +import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R fun Int.ripAlpha(): Int { @@ -77,4 +79,14 @@ fun SeekBar.addAccentColor() { val colorState = ColorStateList.valueOf(ThemeStore.accentColor(context)) progressTintList = colorState thumbTintList = colorState +} + +fun AlertDialog.colorButtons(): AlertDialog { + setOnShowListener { + getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ThemeStore.accentColor(App.getContext())) + getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(ThemeStore.accentColor(App.getContext())) + getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(ThemeStore.accentColor(App.getContext())) + + } + return this } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt deleted file mode 100644 index d574a3b30..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - */ - -package code.name.monkey.retromusic.mvp.presenter - -import code.name.monkey.retromusic.model.Album -import code.name.monkey.retromusic.mvp.BaseView - -/** - * Created by hemanths on 12/08/17. - */ -interface AlbumsView : BaseView { - - fun albums(albums: List) -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt index 9775a11fa..a3782fd19 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt @@ -19,10 +19,8 @@ import code.name.monkey.retromusic.mvp.BaseView import code.name.monkey.retromusic.mvp.Presenter import code.name.monkey.retromusic.mvp.PresenterImpl import code.name.monkey.retromusic.providers.interfaces.Repository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.launch +import kotlinx.coroutines.* +import kotlinx.coroutines.Dispatchers.Main import kotlin.coroutines.CoroutineContext /** @@ -54,7 +52,7 @@ interface GenreDetailsPresenter : Presenter { override fun loadGenreSongs(genreId: Int) { launch { val result = repository.getGenre(genreId) - view?.songs(result) + withContext(Main) { view?.songs(result) } } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt index 7c66df1d3..df7d2e52a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt @@ -21,10 +21,11 @@ import code.name.monkey.retromusic.mvp.Presenter import code.name.monkey.retromusic.mvp.PresenterImpl import code.name.monkey.retromusic.providers.interfaces.Repository import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Dispatchers.IO +import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job import kotlinx.coroutines.launch - +import kotlinx.coroutines.withContext import kotlin.coroutines.CoroutineContext /** @@ -45,12 +46,12 @@ interface PlaylistSongsPresenter : Presenter { private var job: Job = Job() override val coroutineContext: CoroutineContext - get() = Dispatchers.IO + job + get() = IO + job override fun loadPlaylistSongs(playlist: Playlist) { launch { val songs = repository.getPlaylistSongs(playlist) - view?.songs(songs) + withContext(Main) { view?.songs(songs) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt index a605b17bc..51f70e068 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt @@ -33,6 +33,7 @@ import androidx.viewpager.widget.ViewPager import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.colorControlNormal import code.name.monkey.retromusic.fragments.AlbumCoverStyle import code.name.monkey.retromusic.fragments.AlbumCoverStyle.* @@ -94,6 +95,7 @@ class AlbumCoverStylePreferenceDialog : DialogFragment(), } .setView(view) .create() + .colorButtons() } override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt index e43b778db..df7a9a641 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt @@ -25,6 +25,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference import code.name.monkey.retromusic.R import code.name.monkey.retromusic.dialogs.BlacklistFolderChooserDialog +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.colorControlNormal import code.name.monkey.retromusic.providers.BlacklistStore import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -80,6 +81,8 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog ).clear() } .setNegativeButton(android.R.string.cancel, null) + .create() + .colorButtons() .show() } .setNegativeButton(R.string.add_action) { _, _ -> @@ -91,8 +94,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog MaterialAlertDialogBuilder( requireActivity(), R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(R.string.remove_from_blacklist) + ).setTitle(R.string.remove_from_blacklist) .setMessage( HtmlCompat.fromHtml( String.format( @@ -110,9 +112,9 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog refreshBlacklistData() } .setNegativeButton(android.R.string.cancel, null) - .show() + .show().colorButtons() } - .create() + .create().colorButtons() } private lateinit var paths: ArrayList diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt index 814528277..f0ed957e3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt @@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.CategoryInfoAdapter +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.colorControlNormal import code.name.monkey.retromusic.model.CategoryInfo import code.name.monkey.retromusic.util.PreferenceUtil @@ -80,6 +81,7 @@ class LibraryPreferenceDialog : DialogFragment() { ) { _, _ -> updateCategories(categoryAdapter.categoryInfos) } .setView(view) .create() + .colorButtons() } private fun updateCategories(categories: List) { diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt index e7f071a07..fe078aa71 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt @@ -32,6 +32,7 @@ import androidx.viewpager.widget.ViewPager import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.colorControlNormal import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.NowPlayingScreen.* @@ -105,23 +106,7 @@ class NowPlayingScreenPreferenceDialog : DialogFragment(), ViewPager.OnPageChang } .setView(view) .create() - /*.show { - title(R.string.pref_title_now_playing_screen_appearance) - positiveButton(R.string.set) { - val nowPlayingScreen = values()[viewPagerPosition] - if (isNowPlayingThemes(nowPlayingScreen)) { - val result = - getString(nowPlayingScreen.titleRes) + " theme is Pro version feature." - Toast.makeText(context, result, Toast.LENGTH_SHORT).show() - NavigationUtil.goToProVersion(requireContext()) - } else { - PreferenceUtilKT.nowPlayingScreen = nowPlayingScreen - } - } - - negativeButton(android.R.string.cancel) - customView(view = view, scrollable = false, noVerticalPadding = false) - }*/ + .colorButtons() } companion object { From e68258a2fd6b351f9cdcd9676227f850c5566049 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Sun, 19 Jul 2020 20:09:04 +0530 Subject: [PATCH 06/10] Dialog code refactor with extensions --- .../retromusic/dialogs/AddToPlaylistDialog.kt | 41 +++++++++++++++---- .../dialogs/BlacklistFolderChooserDialog.java | 6 +-- .../dialogs/CreatePlaylistDialog.kt | 8 +--- .../dialogs/DeletePlaylistDialog.kt | 7 +--- .../retromusic/dialogs/DeleteSongsDialog.kt | 8 +--- .../dialogs/RemoveFromPlaylistDialog.kt | 8 +--- .../dialogs/RenamePlaylistDialog.kt | 8 +--- .../dialogs/RetroSingleCheckedListAdapter.kt | 13 ++++++ .../retromusic/dialogs/SleepTimerDialog.kt | 17 ++++---- .../retromusic/dialogs/SongDetailDialog.kt | 7 +--- .../retromusic/dialogs/SongShareDialog.kt | 7 +--- .../monkey/retromusic/extensions/ColorExt.kt | 13 ++---- .../retromusic/extensions/DialogExtension.kt | 22 ++++++++++ .../layout-land/activity_artist_details.xml | 1 - .../main/res/layout/dialog_file_details.xml | 1 + app/src/main/res/layout/dialog_list_item.xml | 13 ++++++ 16 files changed, 110 insertions(+), 70 deletions(-) create mode 100644 app/src/main/java/code/name/monkey/retromusic/dialogs/RetroSingleCheckedListAdapter.kt create mode 100644 app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt create mode 100644 app/src/main/res/layout/dialog_list_item.xml diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt index 346d5e315..c23f299cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt @@ -15,16 +15,22 @@ package code.name.monkey.retromusic.dialogs import android.app.Dialog +import android.graphics.Color import android.os.Bundle +import android.view.View +import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.TextView import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.loaders.PlaylistLoader import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PlaylistsUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder + class AddToPlaylistDialog : DialogFragment() { @@ -32,17 +38,38 @@ class AddToPlaylistDialog : DialogFragment() { savedInstanceState: Bundle? ): Dialog { val playlists = PlaylistLoader.getAllPlaylists(requireContext()) - val playlistNames = mutableListOf() + val playlistNames = mutableListOf() playlistNames.add(requireContext().resources.getString(R.string.action_new_playlist)) for (p in playlists) { playlistNames.add(p.name) } - - return MaterialAlertDialogBuilder( + val adapter: ArrayAdapter = object : ArrayAdapter( requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(R.string.add_playlist_title) + R.layout.dialog_list_item, + playlistNames + ) { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val view = super.getView(position, convertView, parent) + view.findViewById(android.R.id.text1).setTextColor(Color.RED) + return view + } + } + return materialDialog(R.string.add_playlist_title) + /*.setAdapter(adapter) { _, which -> + val songs = extraNotNull>(EXTRA_SONG).value + if (which == 0) { + CreatePlaylistDialog.create(songs) + .show(requireActivity().supportFragmentManager, "ADD_TO_PLAYLIST") + } else { + PlaylistsUtil.addToPlaylist( + requireContext(), + songs, + playlists[which - 1].id, + true + ) + } + dismiss() + }*/ .setItems(playlistNames.toTypedArray()) { _, which -> val songs = extraNotNull>(EXTRA_SONG).value if (which == 0) { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java index a276db9c3..49cc1e0e5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java @@ -71,9 +71,9 @@ public class BlacklistFolderChooserDialog extends DialogFragment implements Mate public Dialog onCreateDialog(Bundle savedInstanceState) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ActivityCompat.checkSelfPermission( - getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) + requireActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.md_error_label) .content(R.string.md_storage_perm_error) .positiveText(android.R.string.ok) @@ -89,7 +89,7 @@ public class BlacklistFolderChooserDialog extends DialogFragment implements Mate checkIfCanGoUp(); parentContents = listFiles(); MaterialDialog.Builder builder = - new MaterialDialog.Builder(getActivity()) + new MaterialDialog.Builder(requireActivity()) .title(parentFolder.getAbsolutePath()) .items((CharSequence[]) getContentsArray()) .itemsCallback(this) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt index 917095050..d4eeb9eb3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt @@ -25,9 +25,9 @@ import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PlaylistsUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import kotlinx.android.synthetic.main.dialog_playlist.view.* @@ -43,11 +43,7 @@ class CreatePlaylistDialog : DialogFragment() { val playlistContainer: TextInputLayout = view.actionNewPlaylistContainer MaterialUtil.setTint(playlistContainer, false) - return MaterialAlertDialogBuilder( - requireActivity(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(R.string.new_playlist_title) + return materialDialog(R.string.new_playlist_title) .setView(view) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton( diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt index a3f01f58f..7a548de43 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt @@ -22,9 +22,9 @@ import code.name.monkey.retromusic.EXTRA_PLAYLIST import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.util.PlaylistsUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder class DeletePlaylistDialog : DialogFragment() { @@ -47,10 +47,7 @@ class DeletePlaylistDialog : DialogFragment() { ) } - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) + return materialDialog(title) .setTitle(title) .setMessage(message) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt index 6c751b978..c67605f64 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt @@ -25,11 +25,11 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.saf.SAFGuideActivity import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.SAFUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder class DeleteSongsDialog : DialogFragment() { @JvmField @@ -58,11 +58,7 @@ class DeleteSongsDialog : DialogFragment() { ) } - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(title) + return materialDialog(title) .setMessage(message) .setCancelable(false) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt index 742792843..dc1933984 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt @@ -22,9 +22,9 @@ import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.R.string import code.name.monkey.retromusic.extensions.colorButtons +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.model.PlaylistSong import code.name.monkey.retromusic.util.PlaylistsUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder class RemoveFromPlaylistDialog : DialogFragment() { @@ -52,11 +52,7 @@ class RemoveFromPlaylistDialog : DialogFragment() { } } - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(title) + return materialDialog(title) .setMessage(message) .setPositiveButton(R.string.remove_action) { _, _ -> PlaylistsUtil.removeFromPlaylist( diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt index 91951fa6d..78912d2aa 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt @@ -24,8 +24,8 @@ import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.util.PlaylistsUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout @@ -43,11 +43,7 @@ class RenamePlaylistDialog : DialogFragment() { layout.findViewById(R.id.actionNewPlaylistContainer) MaterialUtil.setTint(nameContainer, false) - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(R.string.rename_playlist_title) + return materialDialog(R.string.rename_playlist_title) .setView(layout) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.action_rename) { _, _ -> diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RetroSingleCheckedListAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RetroSingleCheckedListAdapter.kt new file mode 100644 index 000000000..c8fa03cdd --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RetroSingleCheckedListAdapter.kt @@ -0,0 +1,13 @@ +package code.name.monkey.retromusic.dialogs + +import android.content.Context +import android.widget.ArrayAdapter +import code.name.monkey.retromusic.R + +class RetroSingleCheckedListAdapter( + context: Context, + resource: Int = R.layout.dialog_list_item, + objects: MutableList +) : ArrayAdapter(context, resource, objects) { + +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt index 5f7e72b19..466ec5320 100755 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt @@ -32,6 +32,7 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.addAccentColor import code.name.monkey.retromusic.extensions.colorButtons +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.ACTION_PENDING_QUIT @@ -39,13 +40,12 @@ import code.name.monkey.retromusic.service.MusicService.ACTION_QUIT import code.name.monkey.retromusic.util.PreferenceUtil import com.afollestad.materialdialogs.DialogAction import com.afollestad.materialdialogs.MaterialDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder class SleepTimerDialog : DialogFragment() { private var seekArcProgress: Int = 0 private lateinit var timerUpdater: TimerUpdater - private lateinit var materialDialog: MaterialDialog + private lateinit var dialog: MaterialDialog private lateinit var shouldFinishLastSong: CheckBox private lateinit var seekBar: SeekBar private lateinit var timerDisplay: TextView @@ -88,11 +88,7 @@ class SleepTimerDialog : DialogFragment() { PreferenceUtil.lastSleepTimerValue = seekArcProgress } }) - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ) - .setTitle(R.string.action_sleep_timer) + return materialDialog(R.string.action_sleep_timer) .setView(layout) .setPositiveButton(R.string.action_set) { _, _ -> PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked @@ -134,6 +130,7 @@ class SleepTimerDialog : DialogFragment() { } .create() .colorButtons() + } private fun updateTimeDisplayTime() { @@ -154,10 +151,10 @@ class SleepTimerDialog : DialogFragment() { private fun updateCancelButton() { val musicService = MusicPlayerRemote.musicService if (musicService != null && musicService.pendingQuit) { - materialDialog.getActionButton(DialogAction.NEUTRAL).text = - materialDialog.context.getString(R.string.cancel_current_timer) + dialog.getActionButton(DialogAction.NEUTRAL).text = + dialog.context.getString(R.string.cancel_current_timer) } else { - materialDialog.getActionButton(DialogAction.NEUTRAL).text = null + dialog.getActionButton(DialogAction.NEUTRAL).text = null } } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt index 2ac82aff1..d6228dc00 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt @@ -30,9 +30,9 @@ import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.jaudiotagger.audio.AudioFileIO import org.jaudiotagger.audio.exceptions.CannotReadException import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException @@ -151,10 +151,7 @@ class SongDetailDialog : DialogFragment() { ) } } - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ).setTitle(R.string.action_details) + return materialDialog(R.string.action_details) .setPositiveButton(android.R.string.ok, null) .setView(dialogView) .create() diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt index c85d74495..f3ee3d6c0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt @@ -22,9 +22,9 @@ import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.ShareInstagramStory import code.name.monkey.retromusic.extensions.colorButtons +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder class SongShareDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { @@ -35,10 +35,7 @@ class SongShareDialog : DialogFragment() { song?.title, song?.artistName ) - return MaterialAlertDialogBuilder( - requireContext(), - R.style.ThemeOverlay_MaterialComponents_Dialog_Alert - ).setTitle(R.string.what_do_you_want_to_share) + return materialDialog(R.string.what_do_you_want_to_share) .setItems( arrayOf( getString(R.string.the_audio_file), diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt index 00a55240d..cf43e7d5c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt @@ -18,16 +18,15 @@ import android.app.Dialog import android.content.Context import android.content.res.ColorStateList import android.graphics.Color +import android.widget.Button import android.widget.CheckBox import android.widget.SeekBar import androidx.annotation.AttrRes -import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil -import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R fun Int.ripAlpha(): Int { @@ -81,12 +80,6 @@ fun SeekBar.addAccentColor() { thumbTintList = colorState } -fun AlertDialog.colorButtons(): AlertDialog { - setOnShowListener { - getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ThemeStore.accentColor(App.getContext())) - getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(ThemeStore.accentColor(App.getContext())) - getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(ThemeStore.accentColor(App.getContext())) - - } - return this +fun Button.accentTextColor() { + setTextColor(ThemeStore.accentColor(context)) } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt new file mode 100644 index 000000000..d2c383101 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt @@ -0,0 +1,22 @@ +package code.name.monkey.retromusic.extensions + +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment +import code.name.monkey.retromusic.R +import com.google.android.material.dialog.MaterialAlertDialogBuilder + +fun DialogFragment.materialDialog(title: Int): MaterialAlertDialogBuilder { + return MaterialAlertDialogBuilder( + requireContext(), + R.style.ThemeOverlay_MaterialComponents_Dialog_Alert + ).setTitle(title) +} + +fun AlertDialog.colorButtons(): AlertDialog { + setOnShowListener { + getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor() + getButton(AlertDialog.BUTTON_NEGATIVE).accentTextColor() + getButton(AlertDialog.BUTTON_NEUTRAL).accentTextColor() + } + return this +} \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index 85e50dda6..df5bbd0d8 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -48,7 +48,6 @@ android:layout_marginEnd="16dp" android:transitionName="@string/transition_artist_image" app:cardCornerRadius="24dp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/container" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml index a64ad9eb3..c31152fef 100644 --- a/app/src/main/res/layout/dialog_file_details.xml +++ b/app/src/main/res/layout/dialog_file_details.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" + android:paddingTop="16dp" android:textAppearance="@style/TextViewNormal" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/dialog_list_item.xml b/app/src/main/res/layout/dialog_list_item.xml new file mode 100644 index 000000000..d85a3eaee --- /dev/null +++ b/app/src/main/res/layout/dialog_list_item.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file From e0f1bde6062fd7bb9d9eb4a0caa3c9625c90b49d Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Mon, 20 Jul 2020 02:30:30 +0530 Subject: [PATCH 07/10] Rename icons --- app/build.gradle | 3 +-- .../activities/DriveModeActivity.kt | 12 +++++----- .../activities/GenreDetailsActivity.kt | 2 +- .../retromusic/activities/MainActivity.kt | 14 +++++------ .../activities/PlaylistDetailActivity.kt | 2 +- .../activities/SupportDevelopmentActivity.kt | 18 +++++++-------- .../activities/albums/AlbumDetailsActivity.kt | 2 +- .../artists/ArtistDetailActivity.kt | 2 +- .../activities/bugreport/BugReportActivity.kt | 4 ++-- .../retromusic/adapter/ContributorAdapter.kt | 4 ++-- .../retromusic/adapter/SongFileAdapter.kt | 4 ++-- .../adapter/playlist/PlaylistAdapter.kt | 4 ++-- .../retromusic/appwidgets/AppWidgetBig.kt | 10 ++++---- .../retromusic/appwidgets/AppWidgetCard.kt | 14 +++++------ .../retromusic/appwidgets/AppWidgetClassic.kt | 10 ++++---- .../retromusic/appwidgets/AppWidgetSmall.kt | 10 ++++---- .../retromusic/appwidgets/AppWidgetText.kt | 10 ++++---- .../monkey/retromusic/extensions/ColorExt.kt | 3 ++- .../retromusic/fragments/LibraryViewModel.kt | 13 ++++++++--- .../fragments/MiniPlayerFragment.kt | 4 ++-- .../retromusic/fragments/VolumeFragment.kt | 4 ++-- .../fragments/base/AbsPlayerFragment.kt | 4 ++-- .../mainactivity/FoldersFragment.java | 2 +- .../AdaptivePlaybackControlsFragment.kt | 8 +++---- .../blur/BlurPlaybackControlsFragment.kt | 8 +++---- .../card/CardPlaybackControlsFragment.kt | 8 +++---- .../CardBlurPlaybackControlsFragment.kt | 8 +++---- .../player/circle/CirclePlayerFragment.kt | 4 ++-- .../player/classic/ClassicPlayerFragment.kt | 10 ++++---- .../color/ColorPlaybackControlsFragment.kt | 10 ++++---- .../player/fit/FitPlaybackControlsFragment.kt | 8 +++---- .../flat/FlatPlaybackControlsFragment.kt | 8 +++---- .../full/FullPlaybackControlsFragment.kt | 12 +++++----- .../player/gradient/GradientPlayerFragment.kt | 10 ++++---- .../LockScreenPlayerControlsFragment.kt | 8 +++---- .../material/MaterialControlsFragment.kt | 6 ++--- .../normal/PlayerPlaybackControlsFragment.kt | 10 ++++---- .../player/peak/PeakPlayerControlFragment.kt | 8 +++---- .../plain/PlainPlaybackControlsFragment.kt | 8 +++---- .../simple/SimplePlaybackControlsFragment.kt | 8 +++---- .../tiny/TinyPlaybackControlsFragment.kt | 6 ++--- .../glide/RetroMusicColoredTarget.kt | 3 --- .../glide/UserProfileGlideRequest.java | 4 ++-- .../monkey/retromusic/lyrics/LrcView.java | 2 +- .../monkey/retromusic/model/CategoryInfo.java | 10 ++++---- .../model/smartplaylist/AbsSmartPlaylist.java | 2 +- .../model/smartplaylist/HistoryPlaylist.java | 2 +- .../smartplaylist/LastAddedPlaylist.java | 2 +- .../smartplaylist/MyTopTracksPlaylist.java | 2 +- .../NotRecentlyPlayedPlaylist.java | 2 +- .../smartplaylist/ShuffleAllPlaylist.java | 2 +- .../retromusic/providers/RepositoryImpl.kt | 12 +++++----- .../retromusic/service/MusicService.java | 8 +++---- .../notification/PlayingNotificationImpl.kt | 2 +- .../notification/PlayingNotificationOreo.kt | 2 +- .../retromusic/views/NetworkImageView.java | 4 ++-- app/src/main/res/drawable/asld_album.xml | 4 ++-- app/src/main/res/drawable/asld_home.xml | 4 ++-- app/src/main/res/drawable/asld_music_note.xml | 4 ++-- .../drawable/ic_access_time_white_24dp.xml | 23 ------------------- ..._account_white_24dp.xml => ic_account.xml} | 0 .../drawable/ic_account_group_white_24dp.xml | 10 -------- ..._photo_white_24dp.xml => ic_add_photo.xml} | 0 .../{ic_album_white_24dp.xml => ic_album.xml} | 0 ...rd_white_24dp.xml => ic_arrow_forward.xml} | 0 ...ic_artist_white_24dp.xml => ic_artist.xml} | 0 ..._white_24dp.xml => ic_artist_selected.xml} | 0 ...track_white_24dp.xml => ic_audiotrack.xml} | 0 .../{ic_beer_white_24dp.xml => ic_beer.xml} | 0 ..._blur_on_white_24dp.xml => ic_blur_on.xml} | 0 ...c_white_24dp.xml => ic_bookmark_music.xml} | 1 - ...eport_white_24dp.xml => ic_bug_report.xml} | 0 ...rd_white_24dp.xml => ic_card_giftcard.xml} | 0 ...lphone_white_24dp.xml => ic_cellphone.xml} | 0 ...k_white_24dp.xml => ic_cellphone_lock.xml} | 0 ...cle_white_24dp.xml => ic_check_circle.xml} | 0 ...ar_all_black_24dp.xml => ic_clear_all.xml} | 0 .../{ic_close_white_24dp.xml => ic_close.xml} | 0 ..._lens_white_24dp.xml => ic_color_lens.xml} | 0 ...olorize_white_24dp.xml => ic_colorize.xml} | 0 ...ic_cookie_white_24dp.xml => ic_cookie.xml} | 0 ...inr_white_24dp.xml => ic_currency_inr.xml} | 0 ...hboard_white_24dp.xml => ic_dashboard.xml} | 0 ...ic_delete_white_24dp.xml => ic_delete.xml} | 0 ...ne_white_24dp.xml => ic_diamond_stone.xml} | 0 ...al_white_24dp.xml => ic_drag_vertical.xml} | 0 ...ve_eta_white_24dp.xml => ic_drive_eta.xml} | 0 .../{ic_edit_white_24dp.xml => ic_edit.xml} | 0 ...alizer_white_24dp.xml => ic_equalizer.xml} | 0 ...less_white_24dp.xml => ic_expand_less.xml} | 0 ...l_white_24dp.xml => ic_fast_food_meal.xml} | 0 ...avorite_white_24dp.xml => ic_favorite.xml} | 0 ..._white_24dp.xml => ic_favorite_border.xml} | 0 ...e_edit_white_24dp.xml => ic_file_edit.xml} | 1 - ...music_white_24dp.xml => ic_file_music.xml} | 0 ...song_white_24dp.xml => ic_filter_song.xml} | 0 .../{ic_flag_white_24dp.xml => ic_flag.xml} | 0 ...ic_folder_white_24dp.xml => ic_folder.xml} | 0 ...t_white_24dp.xml => ic_food_croissant.xml} | 0 ...le_white_24dp.xml => ic_github_circle.xml} | 0 ...d_size_white_24dp.xml => ic_grid_size.xml} | 0 ...ic_guitar_white_24dp.xml => ic_guitar.xml} | 0 ...trong_white_24dp.xml => ic_hdr_strong.xml} | 0 .../{ic_help_white_24dp.xml => ic_help.xml} | 0 app/src/main/res/drawable/ic_history.xml | 5 ++++ .../{ic_home_white_24dp.xml => ic_home.xml} | 0 .../{ic_image_white_24dp.xml => ic_image.xml} | 0 ...ine_white_24dp.xml => ic_info_outline.xml} | 0 ...tagram_white_24dp.xml => ic_instagram.xml} | 0 ...rs_white_24dp.xml => ic_invert_colors.xml} | 0 ...eyboard_white_24dp.xml => ic_keyboard.xml} | 0 ...p.xml => ic_keyboard_arrow_down_black.xml} | 0 ...e_24dp.xml => ic_keyboard_arrow_right.xml} | 2 +- ...w_up_24dp.xml => ic_keyboard_arrow_up.xml} | 2 +- ...dp.xml => ic_keyboard_backspace_black.xml} | 0 ...anguage_white_24dp.xml => ic_language.xml} | 0 ..._add_white_24dp.xml => ic_library_add.xml} | 0 ...ic_white_24dp.xml => ic_library_music.xml} | 0 ..._license_white_24dp.xml => ic_license.xml} | 0 .../{ic_menu_white_24dp.xml => ic_menu.xml} | 0 .../{ic_mic_white_24dp.xml => ic_mic.xml} | 0 ...e_vert_white_24dp.xml => ic_more_vert.xml} | 0 ...f_white_24dp.xml => ic_music_note_off.xml} | 0 ...e_24dp.xml => ic_notifications_active.xml} | 0 ..._white_24dp.xml => ic_open_in_browser.xml} | 0 .../{ic_pause_white_24dp.xml => ic_pause.xml} | 0 ...terest_white_24dp.xml => ic_pinterest.xml} | 0 ...arrow_white_24dp.xml => ic_play_arrow.xml} | 0 ...ite_24dp.xml => ic_play_circle_filled.xml} | 0 ...add_white_24dp.xml => ic_playlist_add.xml} | 0 ...ay_white_24dp.xml => ic_playlist_play.xml} | 0 ..._popcorn_white_24dp.xml => ic_popcorn.xml} | 0 ...usic_white_24dp.xml => ic_queue_music.xml} | 0 .../{ic_redo_white_24dp.xml => ic_redo.xml} | 0 ...ic_repeat_white_24dp.xml => ic_repeat.xml} | 0 ...t_one_white_24dp.xml => ic_repeat_one.xml} | 0 ...white_24dp.xml => ic_repeat_one_sharp.xml} | 0 ...arp_white_24dp.xml => ic_repeat_sharp.xml} | 0 .../{ic_save_white_24dp.xml => ic_save.xml} | 0 ..._scanner_white_24dp.xml => ic_scanner.xml} | 0 ...ic_search_white_24dp.xml => ic_search.xml} | 0 ...t_all_white_24dp.xml => ic_select_all.xml} | 0 .../{ic_send_white_24dp.xml => ic_send.xml} | 0 ...ettings_white_24dp.xml => ic_settings.xml} | 0 ...te_24dp.xml => ic_settings_brigntness.xml} | 0 .../{ic_share_white_24dp.xml => ic_share.xml} | 0 ..._shuffle_white_24dp.xml => ic_shuffle.xml} | 0 ...rp_white_24dp.xml => ic_shuffle_sharp.xml} | 0 ...p_next_white_24dp.xml => ic_skip_next.xml} | 0 ..._white_24dp.xml => ic_skip_next_sharp.xml} | 0 ...us_white_24dp.xml => ic_skip_previous.xml} | 0 ...te_24dp.xml => ic_skip_previous_sharp.xml} | 0 .../{ic_sort_white_24dp.xml => ic_sort.xml} | 0 .../{ic_star_white_24dp.xml => ic_star.xml} | 0 ...e_away_white_24dp.xml => ic_take_away.xml} | 0 ..._white_24dp.xml => ic_take_away_coffe.xml} | 0 ..._testing_white_24dp.xml => ic_testing.xml} | 0 ...te_white_24dp.xml => ic_theme_palette.xml} | 0 ...g_up_white_24dp.xml => ic_trending_up.xml} | 0 ..._twitter_white_24dp.xml => ic_twitter.xml} | 0 ...el_black_24dp.xml => ic_view_carousel.xml} | 0 ...down_white_24dp.xml => ic_volume_down.xml} | 0 ...e_off_white_24dp.xml => ic_volume_off.xml} | 0 ...ume_up_white_24dp.xml => ic_volume_up.xml} | 0 ...ater_white_24dp.xml => ic_watch_later.xml} | 0 .../main/res/layout-land/activity_album.xml | 2 +- .../layout-land/activity_album_tag_editor.xml | 4 ++-- .../layout-land/activity_artist_details.xml | 2 +- .../res/layout-land/activity_drive_mode.xml | 14 +++++------ .../main/res/layout-land/fragment_blur.xml | 4 ++-- .../layout-land/fragment_card_blur_player.xml | 4 ++-- .../res/layout-land/fragment_card_player.xml | 2 +- .../layout-land/fragment_circle_player.xml | 4 ++-- .../res/layout-land/fragment_color_player.xml | 4 ++-- .../res/layout-land/fragment_flat_player.xml | 4 ++-- .../res/layout-land/fragment_material.xml | 4 ++-- .../res/layout-land/fragment_plain_player.xml | 4 ++-- .../main/res/layout-land/fragment_player.xml | 4 ++-- .../layout-land/fragment_simple_player.xml | 4 ++-- .../res/layout-xlarge-land/fragment_blur.xml | 4 ++-- app/src/main/res/layout/abs_playlists.xml | 8 +++---- app/src/main/res/layout/activity_about.xml | 2 +- app/src/main/res/layout/activity_album.xml | 2 +- .../res/layout/activity_album_content.xml | 4 ++-- .../res/layout/activity_album_tag_editor.xml | 4 ++-- .../res/layout/activity_artist_content.xml | 4 ++-- .../res/layout/activity_artist_details.xml | 2 +- .../main/res/layout/activity_bug_report.xml | 4 ++-- app/src/main/res/layout/activity_donation.xml | 2 +- .../main/res/layout/activity_drive_mode.xml | 14 +++++------ app/src/main/res/layout/activity_license.xml | 2 +- app/src/main/res/layout/activity_lyrics.xml | 4 ++-- .../res/layout/activity_playing_queue.xml | 4 ++-- .../res/layout/activity_playlist_detail.xml | 2 +- .../main/res/layout/activity_pro_version.xml | 12 +++++----- app/src/main/res/layout/activity_search.xml | 8 +++---- app/src/main/res/layout/activity_settings.xml | 2 +- .../res/layout/activity_share_instagram.xml | 2 +- .../res/layout/activity_song_tag_editor.xml | 4 ++-- .../main/res/layout/activity_user_info.xml | 8 +++---- .../main/res/layout/activity_whats_new.xml | 2 +- app/src/main/res/layout/app_widget_big.xml | 4 ++-- app/src/main/res/layout/app_widget_card.xml | 6 ++--- .../main/res/layout/app_widget_classic.xml | 4 ++-- app/src/main/res/layout/app_widget_small.xml | 6 ++--- app/src/main/res/layout/app_widget_text.xml | 4 ++-- app/src/main/res/layout/bread_crumb.xml | 2 +- app/src/main/res/layout/card_other.xml | 6 ++--- app/src/main/res/layout/card_retro_info.xml | 14 +++++------ app/src/main/res/layout/card_social.xml | 6 ++--- .../res/layout/fragment_adaptive_player.xml | 4 ++-- ...ment_adaptive_player_playback_controls.xml | 8 +++---- app/src/main/res/layout/fragment_blur.xml | 4 ++-- ...fragment_blur_player_playback_controls.xml | 8 +++---- .../res/layout/fragment_card_blur_player.xml | 4 ++-- .../main/res/layout/fragment_card_player.xml | 2 +- ...fragment_card_player_playback_controls.xml | 2 +- .../res/layout/fragment_circle_player.xml | 4 ++-- .../res/layout/fragment_classic_controls.xml | 10 ++++---- .../res/layout/fragment_classic_player.xml | 4 ++-- .../main/res/layout/fragment_color_player.xml | 4 ++-- ...ragment_color_player_playback_controls.xml | 8 +++---- app/src/main/res/layout/fragment_fit.xml | 4 ++-- .../layout/fragment_fit_playback_controls.xml | 8 +++---- .../main/res/layout/fragment_flat_player.xml | 4 ++-- ...fragment_flat_player_playback_controls.xml | 6 ++--- app/src/main/res/layout/fragment_full.xml | 4 ++-- .../layout/fragment_full_player_controls.xml | 12 +++++----- .../res/layout/fragment_gradient_controls.xml | 8 +++---- .../res/layout/fragment_gradient_player.xml | 6 ++--- .../main/res/layout/fragment_home_player.xml | 4 ++-- ...fragment_lock_screen_playback_controls.xml | 8 +++---- .../res/layout/fragment_main_settings.xml | 18 +++++++-------- app/src/main/res/layout/fragment_material.xml | 4 ++-- .../fragment_material_playback_controls.xml | 8 +++---- .../main/res/layout/fragment_mini_player.xml | 8 +++---- .../layout/fragment_peak_control_player.xml | 10 ++++---- .../main/res/layout/fragment_peak_player.xml | 4 ++-- .../fragment_plain_controls_fragment.xml | 8 +++---- .../main/res/layout/fragment_plain_player.xml | 4 ++-- app/src/main/res/layout/fragment_player.xml | 4 ++-- .../fragment_player_playback_controls.xml | 10 ++++---- .../fragment_simple_controls_fragment.xml | 8 +++---- .../res/layout/fragment_simple_player.xml | 4 ++-- .../fragment_tiny_controls_fragment.xml | 4 ++-- .../main/res/layout/fragment_tiny_player.xml | 4 ++-- app/src/main/res/layout/fragment_volume.xml | 4 ++-- app/src/main/res/layout/item_contributor.xml | 2 +- .../res/layout/item_contributor_header.xml | 2 +- .../main/res/layout/item_donation_option.xml | 2 +- app/src/main/res/layout/item_list.xml | 2 +- .../res/layout/item_list_quick_actions.xml | 4 ++-- app/src/main/res/layout/item_option_menu.xml | 2 +- app/src/main/res/layout/item_queue.xml | 2 +- .../layout/layout_notification_collapsed.xml | 2 +- .../layout/layout_notification_expanded.xml | 2 +- .../res/layout/list_setting_item_view.xml | 2 +- app/src/main/res/layout/media_button.xml | 8 +++---- ...nce_dialog_library_categories_listitem.xml | 2 +- .../main/res/menu/bottom_navigation_main.xml | 10 ++++---- app/src/main/res/menu/menu_album_detail.xml | 4 ++-- ..._single_songs_playlist_songs_selection.xml | 8 +++---- app/src/main/res/menu/menu_folders.xml | 4 ++-- app/src/main/res/menu/menu_main.xml | 6 ++--- .../main/res/menu/menu_media_selection.xml | 10 ++++---- app/src/main/res/menu/menu_player.xml | 8 +++---- .../main/res/menu/menu_playlist_detail.xml | 2 +- .../res/menu/menu_playlists_selection.xml | 12 +++++----- .../menu/menu_playlists_songs_selection.xml | 8 +++---- app/src/main/res/menu/menu_search.xml | 2 +- .../res/menu/menu_smart_playlist_detail.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/pref_advanced.xml | 12 +++++----- app/src/main/res/xml/pref_audio.xml | 6 ++--- app/src/main/res/xml/pref_general.xml | 4 ++-- app/src/main/res/xml/pref_images.xml | 2 +- app/src/main/res/xml/pref_notification.xml | 2 +- .../main/res/xml/pref_now_playing_screen.xml | 12 +++++----- app/src/main/res/xml/pref_ui.xml | 6 ++--- 279 files changed, 493 insertions(+), 519 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_access_time_white_24dp.xml rename app/src/main/res/drawable/{ic_account_white_24dp.xml => ic_account.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_account_group_white_24dp.xml rename app/src/main/res/drawable/{ic_add_photo_white_24dp.xml => ic_add_photo.xml} (100%) rename app/src/main/res/drawable/{ic_album_white_24dp.xml => ic_album.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_forward_white_24dp.xml => ic_arrow_forward.xml} (100%) rename app/src/main/res/drawable/{ic_artist_white_24dp.xml => ic_artist.xml} (100%) rename app/src/main/res/drawable/{ic_artist_selected_white_24dp.xml => ic_artist_selected.xml} (100%) rename app/src/main/res/drawable/{ic_audiotrack_white_24dp.xml => ic_audiotrack.xml} (100%) rename app/src/main/res/drawable/{ic_beer_white_24dp.xml => ic_beer.xml} (100%) rename app/src/main/res/drawable/{ic_blur_on_white_24dp.xml => ic_blur_on.xml} (100%) rename app/src/main/res/drawable/{ic_bookmark_music_white_24dp.xml => ic_bookmark_music.xml} (86%) rename app/src/main/res/drawable/{ic_bug_report_white_24dp.xml => ic_bug_report.xml} (100%) rename app/src/main/res/drawable/{ic_card_giftcard_white_24dp.xml => ic_card_giftcard.xml} (100%) rename app/src/main/res/drawable/{ic_cellphone_white_24dp.xml => ic_cellphone.xml} (100%) rename app/src/main/res/drawable/{ic_cellphone_lock_white_24dp.xml => ic_cellphone_lock.xml} (100%) rename app/src/main/res/drawable/{ic_check_circle_white_24dp.xml => ic_check_circle.xml} (100%) rename app/src/main/res/drawable/{ic_clear_all_black_24dp.xml => ic_clear_all.xml} (100%) rename app/src/main/res/drawable/{ic_close_white_24dp.xml => ic_close.xml} (100%) rename app/src/main/res/drawable/{ic_color_lens_white_24dp.xml => ic_color_lens.xml} (100%) rename app/src/main/res/drawable/{ic_colorize_white_24dp.xml => ic_colorize.xml} (100%) rename app/src/main/res/drawable/{ic_cookie_white_24dp.xml => ic_cookie.xml} (100%) rename app/src/main/res/drawable/{ic_currency_inr_white_24dp.xml => ic_currency_inr.xml} (100%) rename app/src/main/res/drawable/{ic_dashboard_white_24dp.xml => ic_dashboard.xml} (100%) rename app/src/main/res/drawable/{ic_delete_white_24dp.xml => ic_delete.xml} (100%) rename app/src/main/res/drawable/{ic_diamond_stone_white_24dp.xml => ic_diamond_stone.xml} (100%) rename app/src/main/res/drawable/{ic_drag_vertical_white_24dp.xml => ic_drag_vertical.xml} (100%) rename app/src/main/res/drawable/{ic_drive_eta_white_24dp.xml => ic_drive_eta.xml} (100%) rename app/src/main/res/drawable/{ic_edit_white_24dp.xml => ic_edit.xml} (100%) rename app/src/main/res/drawable/{ic_equalizer_white_24dp.xml => ic_equalizer.xml} (100%) rename app/src/main/res/drawable/{ic_expand_less_white_24dp.xml => ic_expand_less.xml} (100%) rename app/src/main/res/drawable/{ic_fast_food_meal_white_24dp.xml => ic_fast_food_meal.xml} (100%) rename app/src/main/res/drawable/{ic_favorite_white_24dp.xml => ic_favorite.xml} (100%) rename app/src/main/res/drawable/{ic_favorite_border_white_24dp.xml => ic_favorite_border.xml} (100%) rename app/src/main/res/drawable/{ic_file_edit_white_24dp.xml => ic_file_edit.xml} (88%) rename app/src/main/res/drawable/{ic_file_music_white_24dp.xml => ic_file_music.xml} (100%) rename app/src/main/res/drawable/{ic_filter_song_white_24dp.xml => ic_filter_song.xml} (100%) rename app/src/main/res/drawable/{ic_flag_white_24dp.xml => ic_flag.xml} (100%) rename app/src/main/res/drawable/{ic_folder_white_24dp.xml => ic_folder.xml} (100%) rename app/src/main/res/drawable/{ic_food_croissant_white_24dp.xml => ic_food_croissant.xml} (100%) rename app/src/main/res/drawable/{ic_github_circle_white_24dp.xml => ic_github_circle.xml} (100%) rename app/src/main/res/drawable/{ic_grid_size_white_24dp.xml => ic_grid_size.xml} (100%) rename app/src/main/res/drawable/{ic_guitar_white_24dp.xml => ic_guitar.xml} (100%) rename app/src/main/res/drawable/{ic_hdr_strong_white_24dp.xml => ic_hdr_strong.xml} (100%) rename app/src/main/res/drawable/{ic_help_white_24dp.xml => ic_help.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_history.xml rename app/src/main/res/drawable/{ic_home_white_24dp.xml => ic_home.xml} (100%) rename app/src/main/res/drawable/{ic_image_white_24dp.xml => ic_image.xml} (100%) rename app/src/main/res/drawable/{ic_info_outline_white_24dp.xml => ic_info_outline.xml} (100%) rename app/src/main/res/drawable/{ic_instagram_white_24dp.xml => ic_instagram.xml} (100%) rename app/src/main/res/drawable/{ic_invert_colors_white_24dp.xml => ic_invert_colors.xml} (100%) rename app/src/main/res/drawable/{ic_keyboard_white_24dp.xml => ic_keyboard.xml} (100%) rename app/src/main/res/drawable/{ic_keyboard_arrow_down_black_24dp.xml => ic_keyboard_arrow_down_black.xml} (100%) rename app/src/main/res/drawable/{ic_keyboard_arrow_right_white_24dp.xml => ic_keyboard_arrow_right.xml} (67%) rename app/src/main/res/drawable/{ic_keyboard_arrow_up_24dp.xml => ic_keyboard_arrow_up.xml} (67%) rename app/src/main/res/drawable/{ic_keyboard_backspace_black_24dp.xml => ic_keyboard_backspace_black.xml} (100%) rename app/src/main/res/drawable/{ic_language_white_24dp.xml => ic_language.xml} (100%) rename app/src/main/res/drawable/{ic_library_add_white_24dp.xml => ic_library_add.xml} (100%) rename app/src/main/res/drawable/{ic_library_music_white_24dp.xml => ic_library_music.xml} (100%) rename app/src/main/res/drawable/{ic_license_white_24dp.xml => ic_license.xml} (100%) rename app/src/main/res/drawable/{ic_menu_white_24dp.xml => ic_menu.xml} (100%) rename app/src/main/res/drawable/{ic_mic_white_24dp.xml => ic_mic.xml} (100%) rename app/src/main/res/drawable/{ic_more_vert_white_24dp.xml => ic_more_vert.xml} (100%) rename app/src/main/res/drawable/{ic_music_note_off_white_24dp.xml => ic_music_note_off.xml} (100%) rename app/src/main/res/drawable/{ic_notifications_active_white_24dp.xml => ic_notifications_active.xml} (100%) rename app/src/main/res/drawable/{ic_open_in_browser_white_24dp.xml => ic_open_in_browser.xml} (100%) rename app/src/main/res/drawable/{ic_pause_white_24dp.xml => ic_pause.xml} (100%) rename app/src/main/res/drawable/{ic_pinterest_white_24dp.xml => ic_pinterest.xml} (100%) rename app/src/main/res/drawable/{ic_play_arrow_white_24dp.xml => ic_play_arrow.xml} (100%) rename app/src/main/res/drawable/{ic_play_circle_filled_white_24dp.xml => ic_play_circle_filled.xml} (100%) rename app/src/main/res/drawable/{ic_playlist_add_white_24dp.xml => ic_playlist_add.xml} (100%) rename app/src/main/res/drawable/{ic_playlist_play_white_24dp.xml => ic_playlist_play.xml} (100%) rename app/src/main/res/drawable/{ic_popcorn_white_24dp.xml => ic_popcorn.xml} (100%) rename app/src/main/res/drawable/{ic_queue_music_white_24dp.xml => ic_queue_music.xml} (100%) rename app/src/main/res/drawable/{ic_redo_white_24dp.xml => ic_redo.xml} (100%) rename app/src/main/res/drawable/{ic_repeat_white_24dp.xml => ic_repeat.xml} (100%) rename app/src/main/res/drawable/{ic_repeat_one_white_24dp.xml => ic_repeat_one.xml} (100%) rename app/src/main/res/drawable/{ic_repeat_one_sharp_white_24dp.xml => ic_repeat_one_sharp.xml} (100%) rename app/src/main/res/drawable/{ic_repeat_sharp_white_24dp.xml => ic_repeat_sharp.xml} (100%) rename app/src/main/res/drawable/{ic_save_white_24dp.xml => ic_save.xml} (100%) rename app/src/main/res/drawable/{ic_scanner_white_24dp.xml => ic_scanner.xml} (100%) rename app/src/main/res/drawable/{ic_search_white_24dp.xml => ic_search.xml} (100%) rename app/src/main/res/drawable/{ic_select_all_white_24dp.xml => ic_select_all.xml} (100%) rename app/src/main/res/drawable/{ic_send_white_24dp.xml => ic_send.xml} (100%) rename app/src/main/res/drawable/{ic_settings_white_24dp.xml => ic_settings.xml} (100%) rename app/src/main/res/drawable/{ic_settings_brigntness_white_24dp.xml => ic_settings_brigntness.xml} (100%) rename app/src/main/res/drawable/{ic_share_white_24dp.xml => ic_share.xml} (100%) rename app/src/main/res/drawable/{ic_shuffle_white_24dp.xml => ic_shuffle.xml} (100%) rename app/src/main/res/drawable/{ic_shuffle_sharp_white_24dp.xml => ic_shuffle_sharp.xml} (100%) rename app/src/main/res/drawable/{ic_skip_next_white_24dp.xml => ic_skip_next.xml} (100%) rename app/src/main/res/drawable/{ic_skip_next_sharp_white_24dp.xml => ic_skip_next_sharp.xml} (100%) rename app/src/main/res/drawable/{ic_skip_previous_white_24dp.xml => ic_skip_previous.xml} (100%) rename app/src/main/res/drawable/{ic_skip_previous_sharp_white_24dp.xml => ic_skip_previous_sharp.xml} (100%) rename app/src/main/res/drawable/{ic_sort_white_24dp.xml => ic_sort.xml} (100%) rename app/src/main/res/drawable/{ic_star_white_24dp.xml => ic_star.xml} (100%) rename app/src/main/res/drawable/{ic_take_away_white_24dp.xml => ic_take_away.xml} (100%) rename app/src/main/res/drawable/{ic_take_away_coffe_white_24dp.xml => ic_take_away_coffe.xml} (100%) rename app/src/main/res/drawable/{ic_testing_white_24dp.xml => ic_testing.xml} (100%) rename app/src/main/res/drawable/{ic_theme_palette_white_24dp.xml => ic_theme_palette.xml} (100%) rename app/src/main/res/drawable/{ic_trending_up_white_24dp.xml => ic_trending_up.xml} (100%) rename app/src/main/res/drawable/{ic_twitter_white_24dp.xml => ic_twitter.xml} (100%) rename app/src/main/res/drawable/{ic_view_carousel_black_24dp.xml => ic_view_carousel.xml} (100%) rename app/src/main/res/drawable/{ic_volume_down_white_24dp.xml => ic_volume_down.xml} (100%) rename app/src/main/res/drawable/{ic_volume_off_white_24dp.xml => ic_volume_off.xml} (100%) rename app/src/main/res/drawable/{ic_volume_up_white_24dp.xml => ic_volume_up.xml} (100%) rename app/src/main/res/drawable/{ic_watch_later_white_24dp.xml => ic_watch_later.xml} (100%) diff --git a/app/build.gradle b/app/build.gradle index c199db203..a4ed083d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -137,8 +137,8 @@ dependencies { transitive = true } + def kotlin_coroutines_version = "1.3.8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - def kotlin_coroutines_version = "1.3.3" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" @@ -158,7 +158,6 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" - kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" implementation 'com.google.android.play:core:1.7.3' implementation 'me.jorgecastillo:androidcolorx:0.2.0' diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt index 3602d86f4..4d6cef1fd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt @@ -88,7 +88,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { val isFavourite = MusicUtil.isFavorite(this@DriveModeActivity, MusicPlayerRemote.currentSong) withContext(Dispatchers.Main) { - songFavourite.setImageResource(if (isFavourite) R.drawable.ic_favorite_white_24dp else R.drawable.ic_favorite_border_white_24dp) + songFavourite.setImageResource(if (isFavourite) R.drawable.ic_favorite else R.drawable.ic_favorite_border) } } } @@ -161,9 +161,9 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } @@ -183,18 +183,18 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { private fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt index 019646ac6..d410f45d9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt @@ -129,7 +129,7 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab { if (cab != null && cab!!.isActive) cab?.finish() cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor( RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.resolveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index dda066248..c58330ab1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -192,20 +192,20 @@ class MainActivity : AbsSlidingMusicPanelActivity(), menu ?: return super.onCreateOptionsMenu(menu) if (isPlaylistPage()) { menu.add(0, R.id.action_new_playlist, 1, R.string.new_playlist_title) - .setIcon(R.drawable.ic_playlist_add_white_24dp) + .setIcon(R.drawable.ic_playlist_add) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) } if (isHomePage()) { menu.add(0, R.id.action_mic, 1, getString(R.string.action_search)) - .setIcon(R.drawable.ic_mic_white_24dp) + .setIcon(R.drawable.ic_mic) .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM) } if (isFolderPage()) { menu.add(0, R.id.action_scan, 0, R.string.scan_media) - .setIcon(R.drawable.ic_scanner_white_24dp) + .setIcon(R.drawable.ic_scanner) .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM) menu.add(0, R.id.action_go_to_start_directory, 1, R.string.action_go_to_start_directory) - .setIcon(R.drawable.ic_bookmark_music_white_24dp) + .setIcon(R.drawable.ic_bookmark_music) .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM) } val fragment: Fragment? = getCurrentFragment() @@ -223,10 +223,10 @@ class MainActivity : AbsSlidingMusicPanelActivity(), menu.removeItem(R.id.action_sort_order) } menu.add(0, R.id.action_settings, 6, getString(R.string.action_settings)) - .setIcon(R.drawable.ic_settings_white_24dp) + .setIcon(R.drawable.ic_settings) .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM) menu.add(0, R.id.action_search, 0, getString(R.string.action_search)) - .setIcon(R.drawable.ic_search_white_24dp) + .setIcon(R.drawable.ic_search) .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS) ToolbarContentTintHelper.handleOnCreateOptionsMenu( this, @@ -772,7 +772,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), } cab = MaterialCab(this, R.id.cab_stub) .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor( RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.resolveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index 099817f0b..ee92f74d4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt @@ -141,7 +141,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli cab!!.finish() } cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor( RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.resolveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 7cea20faf..56cbe177e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -177,15 +177,15 @@ class SkuDetailsAdapter( private fun getIcon(position: Int): Int { return when (position) { - 0 -> R.drawable.ic_cookie_white_24dp - 1 -> R.drawable.ic_take_away_white_24dp - 2 -> R.drawable.ic_take_away_coffe_white_24dp - 3 -> R.drawable.ic_beer_white_24dp - 4 -> R.drawable.ic_fast_food_meal_white_24dp - 5 -> R.drawable.ic_popcorn_white_24dp - 6 -> R.drawable.ic_card_giftcard_white_24dp - 7 -> R.drawable.ic_food_croissant_white_24dp - else -> R.drawable.ic_card_giftcard_white_24dp + 0 -> R.drawable.ic_cookie + 1 -> R.drawable.ic_take_away + 2 -> R.drawable.ic_take_away_coffe + 3 -> R.drawable.ic_beer + 4 -> R.drawable.ic_fast_food_meal + 5 -> R.drawable.ic_popcorn + 6 -> R.drawable.ic_card_giftcard + 7 -> R.drawable.ic_food_croissant + else -> R.drawable.ic_card_giftcard } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt index bd668c01e..2f3c819e2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt @@ -55,7 +55,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C } cab = MaterialCab(this, R.id.cab_stub) .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor( RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.resolveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt index 7cf4e79b8..a4422ffab 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt @@ -49,7 +49,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, } cab = MaterialCab(this, R.id.cab_stub) .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor( RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.resolveColor( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index 9e1bd13c0..418ded1dd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -94,7 +94,7 @@ open class BugReportActivity : AbsThemeActivity() { sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() { override fun onHidden(fab: FloatingActionButton?) { super.onHidden(fab) - sendFab.setImageResource(R.drawable.ic_send_white_24dp) + sendFab.setImageResource(R.drawable.ic_send) sendFab.show() } }) @@ -110,7 +110,7 @@ open class BugReportActivity : AbsThemeActivity() { sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() { override fun onHidden(fab: FloatingActionButton?) { super.onHidden(fab) - sendFab.setImageResource(R.drawable.ic_open_in_browser_white_24dp) + sendFab.setImageResource(R.drawable.ic_open_in_browser) sendFab.show() } }) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt index dcd0f7bd0..ca7d604a4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt @@ -69,8 +69,8 @@ class ContributorAdapter( text.text = contributor.summary Glide.with(image.context) .load(contributor.profileImage) - .error(R.drawable.ic_account_white_24dp) - .placeholder(R.drawable.ic_account_white_24dp) + .error(R.drawable.ic_account) + .placeholder(R.drawable.ic_account) .dontAnimate() .into(image) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index daaba32dc..2f6e7f38e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt @@ -100,7 +100,7 @@ class SongFileAdapter( if (file.isDirectory) { holder.image?.let { it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN) - it.setImageResource(R.drawable.ic_folder_white_24dp) + it.setImageResource(R.drawable.ic_folder) } holder.imageTextContainer?.setCardBackgroundColor( ATHUtil.resolveColor( @@ -110,7 +110,7 @@ class SongFileAdapter( ) } else { val error = RetroUtil.getTintedVectorDrawable( - activity, R.drawable.ic_file_music_white_24dp, iconColor + activity, R.drawable.ic_file_music, iconColor ) Glide.with(activity) .load(AudioFileCover(file.path)) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index f5bf2b7e7..ab6cb02fb 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -94,12 +94,12 @@ class PlaylistAdapter( return if (MusicUtil.isFavoritePlaylist(activity, playlist)) TintHelper.createTintedDrawable( activity, - R.drawable.ic_favorite_white_24dp, + R.drawable.ic_favorite, ThemeStore.accentColor(activity) ) else TintHelper.createTintedDrawable( activity, - R.drawable.ic_playlist_play_white_24dp, + R.drawable.ic_playlist_play, ATHUtil.resolveColor(activity, R.attr.colorControlNormal) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index 4a55376fb..0a3b3c2c6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt @@ -57,7 +57,7 @@ class AppWidgetBig : BaseAppWidget() { R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, MaterialValueHelper.getPrimaryTextColor(context, false) )!!, 1f ) @@ -66,7 +66,7 @@ class AppWidgetBig : BaseAppWidget() { R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, MaterialValueHelper.getPrimaryTextColor(context, false) )!!, 1f ) @@ -117,7 +117,7 @@ class AppWidgetBig : BaseAppWidget() { val primaryColor = MaterialValueHelper.getPrimaryTextColor(service, false) // Set correct drawable for pause state val playPauseRes = - if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp + if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap( R.id.button_toggle_play_pause, createBitmap( RetroUtil.getTintedVectorDrawable( @@ -133,7 +133,7 @@ class AppWidgetBig : BaseAppWidget() { R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, primaryColor )!!, 1f ) @@ -142,7 +142,7 @@ class AppWidgetBig : BaseAppWidget() { R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, primaryColor )!!, 1f ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt index 1d2d2377a..e4702eb5d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt @@ -55,7 +55,7 @@ class AppWidgetCard : BaseAppWidget() { R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, secondaryColor )!!, 1f ) @@ -64,7 +64,7 @@ class AppWidgetCard : BaseAppWidget() { R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, secondaryColor )!!, 1f ) @@ -103,7 +103,7 @@ class AppWidgetCard : BaseAppWidget() { // Set correct drawable for pause state val playPauseRes = - if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp + if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap( R.id.button_toggle_play_pause, createBitmap( RetroUtil.getTintedVectorDrawable( @@ -119,7 +119,7 @@ class AppWidgetCard : BaseAppWidget() { R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, MaterialValueHelper.getSecondaryTextColor(service, true) )!!, 1f ) @@ -128,7 +128,7 @@ class AppWidgetCard : BaseAppWidget() { R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, MaterialValueHelper.getSecondaryTextColor(service, true) )!!, 1f ) @@ -189,14 +189,14 @@ class AppWidgetCard : BaseAppWidget() { appWidgetView.setImageViewBitmap( R.id.button_next, ImageUtil.createBitmap( ImageUtil.getTintedVectorDrawable( - service, R.drawable.ic_skip_next_white_24dp, color + service, R.drawable.ic_skip_next, color ) ) ) appWidgetView.setImageViewBitmap( R.id.button_prev, ImageUtil.createBitmap( ImageUtil.getTintedVectorDrawable( - service, R.drawable.ic_skip_previous_white_24dp, color + service, R.drawable.ic_skip_previous, color ) ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt index a85815010..0cbff1cbb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt @@ -57,7 +57,7 @@ class AppWidgetClassic : BaseAppWidget() { createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, MaterialValueHelper.getSecondaryTextColor(context, true) )!!, 1f ) @@ -67,7 +67,7 @@ class AppWidgetClassic : BaseAppWidget() { createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, MaterialValueHelper.getSecondaryTextColor(context, true) )!!, 1f ) @@ -151,7 +151,7 @@ class AppWidgetClassic : BaseAppWidget() { private fun update(bitmap: Bitmap?, color: Int) { // Set correct drawable for pause state val playPauseRes = - if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_24dp + if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow appWidgetView.setImageViewBitmap( R.id.button_toggle_play_pause, ImageUtil.createBitmap( @@ -169,7 +169,7 @@ class AppWidgetClassic : BaseAppWidget() { ImageUtil.createBitmap( ImageUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, color ) ) @@ -179,7 +179,7 @@ class AppWidgetClassic : BaseAppWidget() { ImageUtil.createBitmap( ImageUtil.getTintedVectorDrawable( service, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, color ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt index 0eae1a4e1..70c1026d8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt @@ -54,7 +54,7 @@ class AppWidgetSmall : BaseAppWidget() { createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, MaterialValueHelper.getSecondaryTextColor(context, true) )!!, 1f ) @@ -64,7 +64,7 @@ class AppWidgetSmall : BaseAppWidget() { createBitmap( RetroUtil.getTintedVectorDrawable( context, - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, MaterialValueHelper.getSecondaryTextColor(context, true) )!!, 1f ) @@ -150,7 +150,7 @@ class AppWidgetSmall : BaseAppWidget() { private fun update(bitmap: Bitmap?, color: Int) { // Set correct drawable for pause state - val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp + val playPauseRes = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap( R.id.button_toggle_play_pause, createBitmap( @@ -164,14 +164,14 @@ class AppWidgetSmall : BaseAppWidget() { appWidgetView.setImageViewBitmap( R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( - service, R.drawable.ic_skip_next_white_24dp, color + service, R.drawable.ic_skip_next, color )!!, 1f ) ) appWidgetView.setImageViewBitmap( R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( - service, R.drawable.ic_skip_previous_white_24dp, color + service, R.drawable.ic_skip_previous, color )!!, 1f ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt index c47136e60..777606ad7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt @@ -37,7 +37,7 @@ class AppWidgetText : BaseAppWidget() { appWidgetView.setImageViewBitmap( R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( - context, R.drawable.ic_skip_next_white_24dp, ContextCompat.getColor( + context, R.drawable.ic_skip_next, ContextCompat.getColor( context, R.color.md_white_1000 ) )!!, 1f @@ -46,7 +46,7 @@ class AppWidgetText : BaseAppWidget() { appWidgetView.setImageViewBitmap( R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( - context, R.drawable.ic_skip_previous_white_24dp, ContextCompat.getColor( + context, R.drawable.ic_skip_previous, ContextCompat.getColor( context, R.color.md_white_1000 ) )!!, 1f @@ -119,7 +119,7 @@ class AppWidgetText : BaseAppWidget() { linkButtons(service, appWidgetView) // Set correct drawable for pause state - val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp + val playPauseRes = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap( R.id.button_toggle_play_pause, createBitmap( @@ -134,7 +134,7 @@ class AppWidgetText : BaseAppWidget() { R.id.button_next, createBitmap( RetroUtil.getTintedVectorDrawable( App.getContext(), - R.drawable.ic_skip_next_white_24dp, + R.drawable.ic_skip_next, ContextCompat.getColor( App.getContext(), R.color.md_white_1000 ) @@ -145,7 +145,7 @@ class AppWidgetText : BaseAppWidget() { R.id.button_prev, createBitmap( RetroUtil.getTintedVectorDrawable( App.getContext(), - R.drawable.ic_skip_previous_white_24dp, + R.drawable.ic_skip_previous, ContextCompat.getColor( App.getContext(), R.color.md_white_1000 ) diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt index cf43e7d5c..d89a2ca6d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt @@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R fun Int.ripAlpha(): Int { @@ -81,5 +82,5 @@ fun SeekBar.addAccentColor() { } fun Button.accentTextColor() { - setTextColor(ThemeStore.accentColor(context)) + setTextColor(ThemeStore.accentColor(App.getContext())) } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt index 1e85bfe3d..256c91ae0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope +import code.name.monkey.retromusic.adapter.HomeAdapter import code.name.monkey.retromusic.fragments.ReloadType.* import code.name.monkey.retromusic.interfaces.MusicServiceEventListener import code.name.monkey.retromusic.model.* @@ -58,9 +59,15 @@ class LibraryViewModel(application: Application) : _repository.suggestions(), _repository.favoritePlaylist() ) - for (r in result) { - if (r != null) { - list.add(r) + result.forEach { + if (it != null && it.arrayList.isNotEmpty()) { + if (it.homeSection == HomeAdapter.SUGGESTIONS) { + if (it.arrayList.size > 9) { + list.add(it) + } + } else { + list.add(it) + } } } _homeSections.value = list diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index 342536489..abfd4ba00 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -129,9 +129,9 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda protected fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause) } else { - miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index 0e1228f4f..a6783bc01 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -62,7 +62,7 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum volumeSeekBar.max = maxVolume volumeSeekBar.progress = currentVolume - volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp) + volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down) } override fun onDestroyView() { @@ -74,7 +74,7 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum val audioManager = audioManager audioManager?.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0) setPauseWhenZeroVolume(i < 1) - volumeDown?.setImageResource(if (i == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp) + volumeDown?.setImageResource(if (i == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down) } override fun onStartTrackingTouch(seekBar: SeekBar) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index cba672fcf..9c055f937 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -197,9 +197,9 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(), override fun onPostExecute(isFavorite: Boolean) { val res = if (isFavorite) - R.drawable.ic_favorite_white_24dp + R.drawable.ic_favorite else - R.drawable.ic_favorite_border_white_24dp + R.drawable.ic_favorite_border val drawable = RetroUtil.getTintedVectorDrawable(requireContext(), res, toolbarIconColor()) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java index 7895f70d6..a430edd1d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java @@ -375,7 +375,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements } cab = new MaterialCab(getMainActivity(), R.id.cab_stub) .setMenu(menuRes) - .setCloseDrawableRes(R.drawable.ic_close_white_24dp) + .setCloseDrawableRes(R.drawable.ic_close) .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText( ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface))) .start(callback); diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt index 87f839752..ded0daf8c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt @@ -157,7 +157,7 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -214,18 +214,18 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index 1093e005a..d15a6d61b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt @@ -148,7 +148,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -197,18 +197,18 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt index 80db27d70..3a433ce06 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt @@ -155,7 +155,7 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -204,18 +204,18 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index 16d0e8733..c52dc3c5a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -79,7 +79,7 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { when { - MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause) else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } @@ -177,18 +177,18 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt index 4056c4abd..451076c67 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt @@ -206,8 +206,8 @@ class CirclePlayerFragment : AbsPlayerFragment(), Callback, OnAudioVolumeChanged private fun updatePlayPauseDrawableState() { when { - MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index 9285f0201..bdfedfde0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -415,9 +415,9 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener, private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } @@ -466,18 +466,18 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener, fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index ec5290a68..f8ccbdb81 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt @@ -129,8 +129,8 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { when { - MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } @@ -177,18 +177,18 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt index 76ab358fb..e7a5cb9b1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt @@ -156,7 +156,7 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -205,18 +205,18 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt index 2ab3ee452..3c689e55e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt @@ -149,7 +149,7 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -189,18 +189,18 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index 9bf283928..882a4d02b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -148,7 +148,7 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -257,18 +257,18 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } @@ -309,9 +309,9 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), val activity = activity if (activity != null) { val res = if (isFavorite!!) - R.drawable.ic_favorite_white_24dp + R.drawable.ic_favorite else - R.drawable.ic_favorite_border_white_24dp + R.drawable.ic_favorite_border val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE) songFavourite?.setImageDrawable(drawable) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index 208bbafc5..edcf4dab0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt @@ -355,18 +355,18 @@ class GradientPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelpe fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } @@ -506,9 +506,9 @@ class GradientPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelpe val activity = activity if (activity != null) { val res = if (isFavorite!!) - R.drawable.ic_favorite_white_24dp + R.drawable.ic_favorite else - R.drawable.ic_favorite_border_white_24dp + R.drawable.ic_favorite_border val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE) songFavourite?.setImageDrawable(drawable) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt index e43703c71..f3f4d9e9a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt @@ -156,7 +156,7 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -205,18 +205,18 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt index dd8f20d0a..485b1e1d9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt @@ -190,18 +190,18 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_sharp_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_sharp) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_sharp_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_sharp) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_sharp_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one_sharp) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index 3f1ce6fa8..8173aa17e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -153,9 +153,9 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } @@ -202,18 +202,18 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt index ef7d29e17..c4df24725 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt @@ -118,7 +118,7 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } @@ -203,18 +203,18 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt index 34d2d3978..3b81446d8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt @@ -204,18 +204,18 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } @@ -265,7 +265,7 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt index c58eaf57f..06b9c5157 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt @@ -134,18 +134,18 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setImageResource(R.drawable.ic_repeat_one) repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } @@ -243,7 +243,7 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_pause) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt index 388b31299..b8158deab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt @@ -81,18 +81,18 @@ class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun updateRepeatState() { when (MusicPlayerRemote.repeatMode) { MusicService.REPEAT_MODE_NONE -> { - playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + playerRepeatButton.setImageResource(R.drawable.ic_repeat) playerRepeatButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) } MusicService.REPEAT_MODE_ALL -> { - playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + playerRepeatButton.setImageResource(R.drawable.ic_repeat) playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } MusicService.REPEAT_MODE_THIS -> { - playerRepeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + playerRepeatButton.setImageResource(R.drawable.ic_repeat_one) playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt index fb9ad3c98..c6f740974 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt @@ -36,9 +36,6 @@ abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(vi super.onLoadFailed(e, errorDrawable) val colors = MediaNotificationProcessor(App.getContext(), errorDrawable) onColorReady(colors) - /* MediaNotificationProcessor(App.getContext()).getPaletteAsync({ - onColorReady(it) - }, errorDrawable)*/ } override fun onResourceReady( diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java index 9742a1bde..29e9b1a70 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java +++ b/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java @@ -23,7 +23,7 @@ import static code.name.monkey.retromusic.Constants.USER_PROFILE; public class UserProfileGlideRequest { private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.NONE; - private static final int DEFAULT_ERROR_IMAGE = R.drawable.ic_account_white_24dp; + private static final int DEFAULT_ERROR_IMAGE = R.drawable.ic_account; private static final int DEFAULT_ANIMATION = android.R.anim.fade_in; public static File getUserModel() { @@ -47,7 +47,7 @@ public class UserProfileGlideRequest { private Builder(RequestManager requestManager, File profile) { this.requestManager = requestManager; this.profile = profile; - error = TintHelper.createTintedDrawable(App.Companion.getContext(), R.drawable.ic_account_white_24dp, ThemeStore.Companion.accentColor(App.Companion.getContext())); + error = TintHelper.createTintedDrawable(App.Companion.getContext(), R.drawable.ic_account, ThemeStore.Companion.accentColor(App.Companion.getContext())); } public static Builder from(@NonNull RequestManager requestManager, File profile) { diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java index 319512c1a..707ad20a7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java +++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java @@ -181,7 +181,7 @@ public class LrcView extends View { mTimelineColor = ta.getColor(R.styleable.LrcView_lrcTimelineColor, getResources().getColor(R.color.lrc_timeline_color)); float timelineHeight = ta.getDimension(R.styleable.LrcView_lrcTimelineHeight, getResources().getDimension(R.dimen.lrc_timeline_height)); mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable); - mPlayDrawable = (mPlayDrawable == null) ? getResources().getDrawable(R.drawable.ic_play_arrow_white_24dp) : mPlayDrawable; + mPlayDrawable = (mPlayDrawable == null) ? getResources().getDrawable(R.drawable.ic_play_arrow) : mPlayDrawable; mTimeTextColor = ta.getColor(R.styleable.LrcView_lrcTimeTextColor, getResources().getColor(R.color.lrc_time_text_color)); float timeTextSize = ta.getDimension(R.styleable.LrcView_lrcTimeTextSize, getResources().getDimension(R.dimen.lrc_time_text_size)); mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER); diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java index 867bc409e..80bdfc9e6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java @@ -62,11 +62,11 @@ public class CategoryInfo implements Parcelable { Home(R.id.action_home, R.string.home, R.drawable.asld_home), Songs(R.id.action_song, R.string.songs, R.drawable.asld_music_note), Albums(R.id.action_album, R.string.albums, R.drawable.asld_album), - Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist_white_24dp), - Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play_white_24dp), - Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar_white_24dp), - Queue(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music_white_24dp), - Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder_white_24dp); + Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist), + Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play), + Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar), + Queue(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music), + Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder); public final int icon; diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java index 0e7338cca..b99c9abf6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java @@ -36,7 +36,7 @@ public abstract class AbsSmartPlaylist extends AbsCustomPlaylist { public AbsSmartPlaylist() { super(); - this.iconRes = R.drawable.ic_queue_music_white_24dp; + this.iconRes = R.drawable.ic_queue_music; } protected AbsSmartPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java index 5e5cf7b12..cbcf95c7e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java @@ -44,7 +44,7 @@ public class HistoryPlaylist extends AbsSmartPlaylist { }; public HistoryPlaylist(@NonNull Context context) { - super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp); + super(context.getString(R.string.history), R.drawable.ic_history); } protected HistoryPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java index 08371a00c..7ff020605 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java @@ -41,7 +41,7 @@ public class LastAddedPlaylist extends AbsSmartPlaylist { }; public LastAddedPlaylist(@NonNull Context context) { - super(context.getString(R.string.last_added), R.drawable.ic_library_add_white_24dp); + super(context.getString(R.string.last_added), R.drawable.ic_library_add); } protected LastAddedPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java index 5bff552a6..c9f176d87 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java @@ -44,7 +44,7 @@ public class MyTopTracksPlaylist extends AbsSmartPlaylist { }; public MyTopTracksPlaylist(@NonNull Context context) { - super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp); + super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up); } protected MyTopTracksPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java index 3164907d1..b5804aa3f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java @@ -29,7 +29,7 @@ public class NotRecentlyPlayedPlaylist extends AbsSmartPlaylist { }; public NotRecentlyPlayedPlaylist(@NonNull Context context) { - super(context.getString(R.string.not_recently_played), R.drawable.ic_watch_later_white_24dp); + super(context.getString(R.string.not_recently_played), R.drawable.ic_watch_later); } protected NotRecentlyPlayedPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java index 8c26b7af8..68e968f18 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java @@ -40,7 +40,7 @@ public class ShuffleAllPlaylist extends AbsSmartPlaylist { }; public ShuffleAllPlaylist(@NonNull Context context) { - super(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle_white_24dp); + super(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle); } protected ShuffleAllPlaylist(Parcel in) { diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt index 87d1dc6b3..99b094c42 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt @@ -50,7 +50,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return Home( songs, HomeAdapter.SUGGESTIONS, - R.drawable.ic_audiotrack_white_24dp + R.drawable.ic_audiotrack ) } return null @@ -75,7 +75,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return if (artists.isNotEmpty()) Home( artists, HomeAdapter.RECENT_ARTISTS, - R.drawable.ic_artist_white_24dp + R.drawable.ic_artist ) else null } @@ -84,7 +84,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return if (albums.isNotEmpty()) Home( albums, HomeAdapter.RECENT_ALBUMS, - R.drawable.ic_album_white_24dp + R.drawable.ic_album ) else null } @@ -93,7 +93,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return if (albums.isNotEmpty()) Home( albums, HomeAdapter.TOP_ALBUMS, - R.drawable.ic_album_white_24dp + R.drawable.ic_album ) else null } @@ -103,7 +103,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return if (artists.isNotEmpty()) Home( artists, HomeAdapter.TOP_ARTISTS, - R.drawable.ic_artist_white_24dp + R.drawable.ic_artist ) else null } @@ -113,7 +113,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository { return if (playlists.isNotEmpty()) Home( playlists, HomeAdapter.FAVOURITES, - R.drawable.ic_favorite_white_24dp + R.drawable.ic_favorite ) else null } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index 0f17e55a6..cb676b219 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java @@ -1312,11 +1312,11 @@ public class MusicService extends Service implements } private void setCustomAction(PlaybackStateCompat.Builder stateBuilder) { - int repeatIcon = R.drawable.ic_repeat_white_24dp; // REPEAT_MODE_NONE + int repeatIcon = R.drawable.ic_repeat; // REPEAT_MODE_NONE if (getRepeatMode() == REPEAT_MODE_THIS) { - repeatIcon = R.drawable.ic_repeat_one_white_24dp; + repeatIcon = R.drawable.ic_repeat_one; } else if (getRepeatMode() == REPEAT_MODE_ALL) { - repeatIcon = R.drawable.ic_repeat_white_circle_24dp; + repeatIcon = R.drawable.ic_repeat_white_circledp; } stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder( CYCLE_REPEAT, getString(R.string.action_cycle_repeat), repeatIcon) @@ -1329,7 +1329,7 @@ public class MusicService extends Service implements .build()); final int favoriteIcon = MusicUtil.isFavorite(getApplicationContext(), getCurrentSong()) - ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp; + ? R.drawable.ic_favorite : R.drawable.ic_favorite_border; stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder( TOGGLE_FAVORITE, getString(R.string.action_toggle_favorite), favoriteIcon) .build()); diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt index cd4680382..1156418ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt @@ -52,7 +52,7 @@ class PlayingNotificationImpl : PlayingNotification() { val playButtonResId = if (isPlaying) R.drawable.ic_pause_white_48dp else R.drawable.ic_play_arrow_white_48dp val favoriteResId = - if (isFavorite) R.drawable.ic_favorite_white_24dp else R.drawable.ic_favorite_border_white_24dp + if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border val action = Intent(service, MainActivity::class.java) action.putExtra(MainActivity.EXPAND_PANEL, true) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt index 31872e22b..14243faa8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt @@ -167,7 +167,7 @@ class PlayingNotificationOreo : PlayingNotification() { val close = createBitmap( RetroUtil.getTintedVectorDrawable( service, - R.drawable.ic_close_white_24dp, + R.drawable.ic_close, primary )!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER ) diff --git a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java index 11f2f05d0..378550bda 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java @@ -52,8 +52,8 @@ public class NetworkImageView extends CircularImageView { public void setImageUrl(@NonNull Context context, @NonNull String imageUrl) { Glide.with(context) .load(imageUrl) - .error(R.drawable.ic_account_white_24dp) - .placeholder(R.drawable.ic_account_white_24dp) + .error(R.drawable.ic_account) + .placeholder(R.drawable.ic_account) .into(this); } diff --git a/app/src/main/res/drawable/asld_album.xml b/app/src/main/res/drawable/asld_album.xml index 0b8fd84ea..5102b289a 100644 --- a/app/src/main/res/drawable/asld_album.xml +++ b/app/src/main/res/drawable/asld_album.xml @@ -3,11 +3,11 @@ tools:ignore="NewApi"> + android:drawable="@drawable/ic_album" /> + android:drawable="@drawable/ic_home" /> + android:drawable="@drawable/ic_audiotrack" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_account_white_24dp.xml b/app/src/main/res/drawable/ic_account.xml similarity index 100% rename from app/src/main/res/drawable/ic_account_white_24dp.xml rename to app/src/main/res/drawable/ic_account.xml diff --git a/app/src/main/res/drawable/ic_account_group_white_24dp.xml b/app/src/main/res/drawable/ic_account_group_white_24dp.xml deleted file mode 100644 index 970a3aa9a..000000000 --- a/app/src/main/res/drawable/ic_account_group_white_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_photo_white_24dp.xml b/app/src/main/res/drawable/ic_add_photo.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_photo_white_24dp.xml rename to app/src/main/res/drawable/ic_add_photo.xml diff --git a/app/src/main/res/drawable/ic_album_white_24dp.xml b/app/src/main/res/drawable/ic_album.xml similarity index 100% rename from app/src/main/res/drawable/ic_album_white_24dp.xml rename to app/src/main/res/drawable/ic_album.xml diff --git a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_forward.xml diff --git a/app/src/main/res/drawable/ic_artist_white_24dp.xml b/app/src/main/res/drawable/ic_artist.xml similarity index 100% rename from app/src/main/res/drawable/ic_artist_white_24dp.xml rename to app/src/main/res/drawable/ic_artist.xml diff --git a/app/src/main/res/drawable/ic_artist_selected_white_24dp.xml b/app/src/main/res/drawable/ic_artist_selected.xml similarity index 100% rename from app/src/main/res/drawable/ic_artist_selected_white_24dp.xml rename to app/src/main/res/drawable/ic_artist_selected.xml diff --git a/app/src/main/res/drawable/ic_audiotrack_white_24dp.xml b/app/src/main/res/drawable/ic_audiotrack.xml similarity index 100% rename from app/src/main/res/drawable/ic_audiotrack_white_24dp.xml rename to app/src/main/res/drawable/ic_audiotrack.xml diff --git a/app/src/main/res/drawable/ic_beer_white_24dp.xml b/app/src/main/res/drawable/ic_beer.xml similarity index 100% rename from app/src/main/res/drawable/ic_beer_white_24dp.xml rename to app/src/main/res/drawable/ic_beer.xml diff --git a/app/src/main/res/drawable/ic_blur_on_white_24dp.xml b/app/src/main/res/drawable/ic_blur_on.xml similarity index 100% rename from app/src/main/res/drawable/ic_blur_on_white_24dp.xml rename to app/src/main/res/drawable/ic_blur_on.xml diff --git a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_music.xml similarity index 86% rename from app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml rename to app/src/main/res/drawable/ic_bookmark_music.xml index bcde9ac74..0674f00c8 100644 --- a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_music.xml @@ -1,4 +1,3 @@ - + + diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable/ic_home.xml similarity index 100% rename from app/src/main/res/drawable/ic_home_white_24dp.xml rename to app/src/main/res/drawable/ic_home.xml diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image.xml similarity index 100% rename from app/src/main/res/drawable/ic_image_white_24dp.xml rename to app/src/main/res/drawable/ic_image.xml diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline.xml similarity index 100% rename from app/src/main/res/drawable/ic_info_outline_white_24dp.xml rename to app/src/main/res/drawable/ic_info_outline.xml diff --git a/app/src/main/res/drawable/ic_instagram_white_24dp.xml b/app/src/main/res/drawable/ic_instagram.xml similarity index 100% rename from app/src/main/res/drawable/ic_instagram_white_24dp.xml rename to app/src/main/res/drawable/ic_instagram.xml diff --git a/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml b/app/src/main/res/drawable/ic_invert_colors.xml similarity index 100% rename from app/src/main/res/drawable/ic_invert_colors_white_24dp.xml rename to app/src/main/res/drawable/ic_invert_colors.xml diff --git a/app/src/main/res/drawable/ic_keyboard_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_white_24dp.xml rename to app/src/main/res/drawable/ic_keyboard.xml diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml similarity index 67% rename from app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_right.xml index 37733107b..b283c52dd 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml similarity index 67% rename from app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_up.xml index 712d88e34..a1d8ff1a9 100755 --- a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_backspace_black.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_backspace_black.xml diff --git a/app/src/main/res/drawable/ic_language_white_24dp.xml b/app/src/main/res/drawable/ic_language.xml similarity index 100% rename from app/src/main/res/drawable/ic_language_white_24dp.xml rename to app/src/main/res/drawable/ic_language.xml diff --git a/app/src/main/res/drawable/ic_library_add_white_24dp.xml b/app/src/main/res/drawable/ic_library_add.xml similarity index 100% rename from app/src/main/res/drawable/ic_library_add_white_24dp.xml rename to app/src/main/res/drawable/ic_library_add.xml diff --git a/app/src/main/res/drawable/ic_library_music_white_24dp.xml b/app/src/main/res/drawable/ic_library_music.xml similarity index 100% rename from app/src/main/res/drawable/ic_library_music_white_24dp.xml rename to app/src/main/res/drawable/ic_library_music.xml diff --git a/app/src/main/res/drawable/ic_license_white_24dp.xml b/app/src/main/res/drawable/ic_license.xml similarity index 100% rename from app/src/main/res/drawable/ic_license_white_24dp.xml rename to app/src/main/res/drawable/ic_license.xml diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu.xml similarity index 100% rename from app/src/main/res/drawable/ic_menu_white_24dp.xml rename to app/src/main/res/drawable/ic_menu.xml diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable/ic_mic.xml similarity index 100% rename from app/src/main/res/drawable/ic_mic_white_24dp.xml rename to app/src/main/res/drawable/ic_mic.xml diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert.xml similarity index 100% rename from app/src/main/res/drawable/ic_more_vert_white_24dp.xml rename to app/src/main/res/drawable/ic_more_vert.xml diff --git a/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml b/app/src/main/res/drawable/ic_music_note_off.xml similarity index 100% rename from app/src/main/res/drawable/ic_music_note_off_white_24dp.xml rename to app/src/main/res/drawable/ic_music_note_off.xml diff --git a/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml b/app/src/main/res/drawable/ic_notifications_active.xml similarity index 100% rename from app/src/main/res/drawable/ic_notifications_active_white_24dp.xml rename to app/src/main/res/drawable/ic_notifications_active.xml diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser.xml similarity index 100% rename from app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml rename to app/src/main/res/drawable/ic_open_in_browser.xml diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause.xml similarity index 100% rename from app/src/main/res/drawable/ic_pause_white_24dp.xml rename to app/src/main/res/drawable/ic_pause.xml diff --git a/app/src/main/res/drawable/ic_pinterest_white_24dp.xml b/app/src/main/res/drawable/ic_pinterest.xml similarity index 100% rename from app/src/main/res/drawable/ic_pinterest_white_24dp.xml rename to app/src/main/res/drawable/ic_pinterest.xml diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_arrow_white_24dp.xml rename to app/src/main/res/drawable/ic_play_arrow.xml diff --git a/app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml b/app/src/main/res/drawable/ic_play_circle_filled.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml rename to app/src/main/res/drawable/ic_play_circle_filled.xml diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_add.xml similarity index 100% rename from app/src/main/res/drawable/ic_playlist_add_white_24dp.xml rename to app/src/main/res/drawable/ic_playlist_add.xml diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play.xml similarity index 100% rename from app/src/main/res/drawable/ic_playlist_play_white_24dp.xml rename to app/src/main/res/drawable/ic_playlist_play.xml diff --git a/app/src/main/res/drawable/ic_popcorn_white_24dp.xml b/app/src/main/res/drawable/ic_popcorn.xml similarity index 100% rename from app/src/main/res/drawable/ic_popcorn_white_24dp.xml rename to app/src/main/res/drawable/ic_popcorn.xml diff --git a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml b/app/src/main/res/drawable/ic_queue_music.xml similarity index 100% rename from app/src/main/res/drawable/ic_queue_music_white_24dp.xml rename to app/src/main/res/drawable/ic_queue_music.xml diff --git a/app/src/main/res/drawable/ic_redo_white_24dp.xml b/app/src/main/res/drawable/ic_redo.xml similarity index 100% rename from app/src/main/res/drawable/ic_redo_white_24dp.xml rename to app/src/main/res/drawable/ic_redo.xml diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat.xml diff --git a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_one_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_one.xml diff --git a/app/src/main/res/drawable/ic_repeat_one_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_one_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_one_sharp.xml diff --git a/app/src/main/res/drawable/ic_repeat_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_sharp.xml diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save.xml similarity index 100% rename from app/src/main/res/drawable/ic_save_white_24dp.xml rename to app/src/main/res/drawable/ic_save.xml diff --git a/app/src/main/res/drawable/ic_scanner_white_24dp.xml b/app/src/main/res/drawable/ic_scanner.xml similarity index 100% rename from app/src/main/res/drawable/ic_scanner_white_24dp.xml rename to app/src/main/res/drawable/ic_scanner.xml diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search.xml similarity index 100% rename from app/src/main/res/drawable/ic_search_white_24dp.xml rename to app/src/main/res/drawable/ic_search.xml diff --git a/app/src/main/res/drawable/ic_select_all_white_24dp.xml b/app/src/main/res/drawable/ic_select_all.xml similarity index 100% rename from app/src/main/res/drawable/ic_select_all_white_24dp.xml rename to app/src/main/res/drawable/ic_select_all.xml diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send.xml similarity index 100% rename from app/src/main/res/drawable/ic_send_white_24dp.xml rename to app/src/main/res/drawable/ic_send.xml diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_white_24dp.xml rename to app/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml b/app/src/main/res/drawable/ic_settings_brigntness.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml rename to app/src/main/res/drawable/ic_settings_brigntness.xml diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_white_24dp.xml rename to app/src/main/res/drawable/ic_share.xml diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle.xml similarity index 100% rename from app/src/main/res/drawable/ic_shuffle_white_24dp.xml rename to app/src/main/res/drawable/ic_shuffle.xml diff --git a/app/src/main/res/drawable/ic_shuffle_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_shuffle_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_shuffle_sharp.xml diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_next_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_next.xml diff --git a/app/src/main/res/drawable/ic_skip_next_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_next_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_next_sharp.xml diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_previous_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_previous.xml diff --git a/app/src/main/res/drawable/ic_skip_previous_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_previous_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_previous_sharp.xml diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable/ic_sort.xml similarity index 100% rename from app/src/main/res/drawable/ic_sort_white_24dp.xml rename to app/src/main/res/drawable/ic_sort.xml diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star.xml similarity index 100% rename from app/src/main/res/drawable/ic_star_white_24dp.xml rename to app/src/main/res/drawable/ic_star.xml diff --git a/app/src/main/res/drawable/ic_take_away_white_24dp.xml b/app/src/main/res/drawable/ic_take_away.xml similarity index 100% rename from app/src/main/res/drawable/ic_take_away_white_24dp.xml rename to app/src/main/res/drawable/ic_take_away.xml diff --git a/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_coffe.xml similarity index 100% rename from app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml rename to app/src/main/res/drawable/ic_take_away_coffe.xml diff --git a/app/src/main/res/drawable/ic_testing_white_24dp.xml b/app/src/main/res/drawable/ic_testing.xml similarity index 100% rename from app/src/main/res/drawable/ic_testing_white_24dp.xml rename to app/src/main/res/drawable/ic_testing.xml diff --git a/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml b/app/src/main/res/drawable/ic_theme_palette.xml similarity index 100% rename from app/src/main/res/drawable/ic_theme_palette_white_24dp.xml rename to app/src/main/res/drawable/ic_theme_palette.xml diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_trending_up_white_24dp.xml rename to app/src/main/res/drawable/ic_trending_up.xml diff --git a/app/src/main/res/drawable/ic_twitter_white_24dp.xml b/app/src/main/res/drawable/ic_twitter.xml similarity index 100% rename from app/src/main/res/drawable/ic_twitter_white_24dp.xml rename to app/src/main/res/drawable/ic_twitter.xml diff --git a/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml b/app/src/main/res/drawable/ic_view_carousel.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_carousel_black_24dp.xml rename to app/src/main/res/drawable/ic_view_carousel.xml diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_down_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_down.xml diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable/ic_volume_off.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_off_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_off.xml diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_up_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_up.xml diff --git a/app/src/main/res/drawable/ic_watch_later_white_24dp.xml b/app/src/main/res/drawable/ic_watch_later.xml similarity index 100% rename from app/src/main/res/drawable/ic_watch_later_white_24dp.xml rename to app/src/main/res/drawable/ic_watch_later.xml diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index 47d9002f2..3376fb29b 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -30,7 +30,7 @@ + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index df5bbd0d8..c697c814c 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -30,7 +30,7 @@ + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> + app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/ic_favorite_border" /> + app:srcCompat="@drawable/ic_skip_next" /> + app:srcCompat="@drawable/ic_skip_previous" /> @@ -135,7 +135,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" /> + app:srcCompat="@drawable/ic_shuffle" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml index 640bad4b6..b9caaa7b6 100644 --- a/app/src/main/res/layout-land/fragment_card_blur_player.xml +++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml @@ -45,11 +45,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml index 601bf5d12..3c750a920 100644 --- a/app/src/main/res/layout-land/fragment_circle_player.xml +++ b/app/src/main/res/layout-land/fragment_circle_player.xml @@ -47,11 +47,11 @@ diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml index 5e5276bdc..2adee8509 100644 --- a/app/src/main/res/layout-land/fragment_color_player.xml +++ b/app/src/main/res/layout-land/fragment_color_player.xml @@ -70,8 +70,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml index 2067ef20c..d59f06a2b 100644 --- a/app/src/main/res/layout-land/fragment_flat_player.xml +++ b/app/src/main/res/layout-land/fragment_flat_player.xml @@ -64,8 +64,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index 9f27d9fc1..cdb5a459f 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -106,8 +106,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index cdd43d54d..327629b80 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -63,8 +63,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml index 7c76d87c8..a2185426d 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml @@ -70,10 +70,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index e970c7d70..a0b8d1d25 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -28,7 +28,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_access_time_white_24dp" /> + app:srcCompat="@drawable/ic_history" /> + app:srcCompat="@drawable/ic_library_add" /> + app:srcCompat="@drawable/ic_trending_up" /> + app:srcCompat="@drawable/ic_shuffle" /> diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index 71302b6b3..56bff8c38 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -33,7 +33,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" android:background="?attr/colorSurface" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> @@ -155,7 +155,7 @@ android:paddingBottom="12dp" android:text="@string/save" app:cornerRadius="25dp" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" tools:backgroundTint="@color/md_red_400" /> diff --git a/app/src/main/res/layout/activity_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml index 23ed6b5d2..9cb0f9eff 100644 --- a/app/src/main/res/layout/activity_artist_content.xml +++ b/app/src/main/res/layout/activity_artist_content.xml @@ -14,7 +14,7 @@ android:layout_marginEnd="4dp" android:text="@string/action_play_all" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_play_arrow_white_24dp" + app:icon="@drawable/ic_play_arrow" app:layout_constraintEnd_toStartOf="@+id/shuffleAction" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -28,7 +28,7 @@ android:layout_marginEnd="16dp" android:text="@string/shuffle" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_shuffle_white_24dp" + app:icon="@drawable/ic_shuffle" app:layout_constraintBottom_toBottomOf="@+id/playAction" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index b65a3bfef..a222a3360 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -32,7 +32,7 @@ @@ -69,6 +69,6 @@ style="@style/Fab" android:layout_gravity="bottom|end" android:layout_margin="16dp" - app:srcCompat="@drawable/ic_send_white_24dp" /> + app:srcCompat="@drawable/ic_send" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index fcb83a9ba..8e3455005 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -17,7 +17,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/support_development" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml index 846233b19..f90eac439 100644 --- a/app/src/main/res/layout/activity_drive_mode.xml +++ b/app/src/main/res/layout/activity_drive_mode.xml @@ -61,7 +61,7 @@ android:padding="8dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status_bar" - app:srcCompat="@drawable/ic_close_white_24dp" /> + app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/ic_favorite_border" /> + app:srcCompat="@drawable/ic_skip_next" /> + app:srcCompat="@drawable/ic_skip_previous" /> + app:srcCompat="@drawable/ic_repeat" /> + app:srcCompat="@drawable/ic_shuffle" /> diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml index 92398c240..d95ba4424 100644 --- a/app/src/main/res/layout/activity_lyrics.xml +++ b/app/src/main/res/layout/activity_lyrics.xml @@ -15,11 +15,11 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:contentInsetLeft="0dp" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="0dp" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:subtitleTextAppearance="@style/TextViewCaption" app:titleMargin="0dp" app:titleMarginStart="0dp" diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml index 38db7846d..cbc1378d6 100755 --- a/app/src/main/res/layout/activity_playing_queue.xml +++ b/app/src/main/res/layout/activity_playing_queue.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/queue" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:ignore="UnusedAttribute" /> @@ -66,7 +66,7 @@ android:layout_margin="16dp" android:text="@string/clear_playing_queue" android:textAppearance="@style/TextViewHeadline6" - app:icon="@drawable/ic_clear_all_black_24dp" /> + app:icon="@drawable/ic_clear_all" /> diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 67e46f537..af405033a 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -35,7 +35,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:background="?roundSelector" android:padding="12dp" - app:srcCompat="@drawable/ic_mic_white_24dp" + app:srcCompat="@drawable/ic_mic" app:tint="?attr/colorControlNormal" tools:visibility="visible" /> @@ -86,7 +86,7 @@ android:background="?roundSelector" android:padding="12dp" android:visibility="gone" - app:srcCompat="@drawable/ic_close_white_24dp" + app:srcCompat="@drawable/ic_close" app:tint="?attr/colorControlNormal" tools:visibility="visible" /> @@ -123,6 +123,6 @@ android:layout_margin="16dp" android:text="@string/keyboard" android:textAppearance="@style/TextViewHeadline6" - app:icon="@drawable/ic_keyboard_white_24dp" /> + app:icon="@drawable/ic_keyboard" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 0225787f7..ec83f3e5c 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -39,7 +39,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:title="@string/action_settings" /> diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml index e0c241def..fe53bb31c 100644 --- a/app/src/main/res/layout/activity_share_instagram.xml +++ b/app/src/main/res/layout/activity_share_instagram.xml @@ -145,7 +145,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/social_stories" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index baed30b16..1d62e3228 100755 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -16,7 +16,7 @@ @@ -240,7 +240,7 @@ android:paddingBottom="12dp" android:text="@string/save" app:cornerRadius="25dp" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" /> @@ -63,7 +63,7 @@ android:layout_gravity="end" android:background="?roundSelector" android:padding="16dp" - app:srcCompat="@drawable/ic_add_photo_white_24dp" /> + app:srcCompat="@drawable/ic_add_photo" /> @@ -97,7 +97,7 @@ android:layout_margin="16dp" android:gravity="center" android:padding="12dp" - android:src="@drawable/ic_add_photo_white_24dp" + android:src="@drawable/ic_add_photo" app:tint="?attr/colorControlNormal" /> @@ -138,6 +138,6 @@ android:layout_margin="16dp" android:gravity="center" android:text="@string/save" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml index 9686dbd7b..6420b1c13 100644 --- a/app/src/main/res/layout/activity_whats_new.xml +++ b/app/src/main/res/layout/activity_whats_new.xml @@ -32,7 +32,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/whats_new" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> diff --git a/app/src/main/res/layout/app_widget_big.xml b/app/src/main/res/layout/app_widget_big.xml index 75ba63e6c..173d81336 100755 --- a/app/src/main/res/layout/app_widget_big.xml +++ b/app/src/main/res/layout/app_widget_big.xml @@ -30,7 +30,7 @@ android:background="@drawable/widget_selector_dark" android:padding="22dp" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_primary_text_dark" /> diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml index 142524de0..4fe732f82 100755 --- a/app/src/main/res/layout/app_widget_card.xml +++ b/app/src/main/res/layout/app_widget_card.xml @@ -70,7 +70,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector_light" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_light" /> diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml index d4a3efd6e..b903a548b 100755 --- a/app/src/main/res/layout/app_widget_classic.xml +++ b/app/src/main/res/layout/app_widget_classic.xml @@ -36,7 +36,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/widget_selector" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_dark" /> diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml index b9b7b5ce9..2b54a0276 100755 --- a/app/src/main/res/layout/app_widget_small.xml +++ b/app/src/main/res/layout/app_widget_small.xml @@ -31,7 +31,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector_light" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_light" /> diff --git a/app/src/main/res/layout/app_widget_text.xml b/app/src/main/res/layout/app_widget_text.xml index f62a0eb62..d02bb7768 100644 --- a/app/src/main/res/layout/app_widget_text.xml +++ b/app/src/main/res/layout/app_widget_text.xml @@ -64,7 +64,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_dark" /> diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml index 30aa25a32..345a4ed7f 100644 --- a/app/src/main/res/layout/bread_crumb.xml +++ b/app/src/main/res/layout/bread_crumb.xml @@ -26,7 +26,7 @@ android:layout_height="24dp" android:scaleType="fitXY" android:visibility="gone" - app:srcCompat="@drawable/ic_keyboard_arrow_right_white_24dp" + app:srcCompat="@drawable/ic_keyboard_arrow_right" tools:tint="?android:attr/colorControlNormal" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml index 2900a941a..fb7b89e4d 100644 --- a/app/src/main/res/layout/card_other.xml +++ b/app/src/main/res/layout/card_other.xml @@ -38,7 +38,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb4" - app:listItemIcon="@drawable/ic_file_edit_white_24dp" + app:listItemIcon="@drawable/ic_file_edit" app:listItemSummary="@string/changelog_summary" app:listItemTitle="@string/changelog" /> @@ -51,7 +51,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/changelog" - app:listItemIcon="@drawable/ic_license_white_24dp" + app:listItemIcon="@drawable/ic_license" app:listItemSummary="@string/pref_summary_open_source_licences" app:listItemTitle="@string/pref_title_open_source_licences" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/openSource" - app:listItemIcon="@drawable/ic_info_outline_white_24dp" + app:listItemIcon="@drawable/ic_info_outline" app:listItemSummary="@string/pref_summary_open_source_licences" app:listItemTitle="@string/version" /> diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml index b297a3a1c..15a0de810 100644 --- a/app/src/main/res/layout/card_retro_info.xml +++ b/app/src/main/res/layout/card_retro_info.xml @@ -37,7 +37,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb2" - app:listItemIcon="@drawable/ic_github_circle_white_24dp" + app:listItemIcon="@drawable/ic_github_circle" app:listItemSummary="@string/git_hub_summary" app:listItemTitle="@string/git_hub" /> @@ -50,7 +50,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appGithub" - app:listItemIcon="@drawable/ic_flag_white_24dp" + app:listItemIcon="@drawable/ic_flag" app:listItemSummary="@string/translate_community" app:listItemTitle="@string/translate" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appTranslation" - app:listItemIcon="@drawable/ic_star_white_24dp" + app:listItemIcon="@drawable/ic_star" app:listItemSummary="@string/rate_on_google_play_summary" app:listItemTitle="@string/rate_app" /> @@ -77,7 +77,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appRate" - app:listItemIcon="@drawable/ic_card_giftcard_white_24dp" + app:listItemIcon="@drawable/ic_card_giftcard" app:listItemSummary="@string/donate_summary" app:listItemTitle="@string/donate" /> @@ -91,7 +91,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/donateLink" - app:listItemIcon="@drawable/ic_bug_report_white_24dp" + app:listItemIcon="@drawable/ic_bug_report" app:listItemSummary="@string/bug_report_summary" app:listItemTitle="@string/report_bug" /> @@ -105,7 +105,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/bugReportLink" - app:listItemIcon="@drawable/ic_share_white_24dp" + app:listItemIcon="@drawable/ic_share" app:listItemSummary="@string/share_summary" app:listItemTitle="@string/action_share" /> @@ -118,7 +118,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appShare" - app:listItemIcon="@drawable/ic_help_white_24dp" + app:listItemIcon="@drawable/ic_help" app:listItemSummary="@string/help_summary" app:listItemTitle="@string/faq" /> diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index 8e678226c..1b6a6c97f 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -37,7 +37,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb3" - app:listItemIcon="@drawable/ic_pinterest_white_24dp" + app:listItemIcon="@drawable/ic_pinterest" app:listItemSummary="@string/pinterest_page_summary" app:listItemTitle="@string/pinterest_page" /> @@ -50,7 +50,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/pinterestLink" - app:listItemIcon="@drawable/ic_instagram_white_24dp" + app:listItemIcon="@drawable/ic_instagram" app:listItemSummary="@string/instagram_page_summary" app:listItemTitle="@string/instagram_page" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/instagramLink" - app:listItemIcon="@drawable/ic_twitter_white_24dp" + app:listItemIcon="@drawable/ic_twitter" app:listItemSummary="@string/twitter_page_summary" app:listItemTitle="@string/twitter_page" /> diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 6d3fb00bb..09d45e162 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -33,11 +33,11 @@ @@ -75,7 +75,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -120,7 +120,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index 96a470d3d..23b8b3e8c 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -68,11 +68,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 1f7791424..a273cffce 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -153,7 +153,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -168,7 +168,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -196,7 +196,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -211,7 +211,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml index a7861d17a..3f09f24c6 100644 --- a/app/src/main/res/layout/fragment_card_blur_player.xml +++ b/app/src/main/res/layout/fragment_card_blur_player.xml @@ -49,11 +49,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index dd9d9a577..6b617b925 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -78,7 +78,7 @@ android:layout_gravity="center_vertical" android:padding="16dp" android:scaleType="centerCrop" - app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" + app:srcCompat="@drawable/ic_play_circle_filled" app:tint="?colorAccent" /> @@ -89,7 +89,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/progressContainer" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -134,7 +134,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index 88fbeae0a..9cf134913 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -50,8 +50,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index 0d3c596f0..8bb06719e 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -57,11 +57,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml index 7acc1ac77..244a753cc 100644 --- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml @@ -126,7 +126,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -141,7 +141,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -169,7 +169,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml index 9134e5f8c..b9b42ea01 100644 --- a/app/src/main/res/layout/fragment_fit.xml +++ b/app/src/main/res/layout/fragment_fit.xml @@ -54,8 +54,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index 5d702b37d..68a179c20 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -140,7 +140,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -155,7 +155,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -199,7 +199,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index 390b788bb..64294137f 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -36,11 +36,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + tools:src="@drawable/ic_pause" /> diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index c3c951163..f1382aa4c 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -67,7 +67,7 @@ android:id="@+id/playerToolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" android:paddingBottom="24dp" app:contentInsetEndWithActions="0dp" app:contentInsetStart="0dp" @@ -75,7 +75,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/statusBarContainer" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:titleMargin="0dp" app:titleMargins="0dp"> diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml index f56dfd024..98199dc84 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -17,7 +17,7 @@ app:layout_constraintBottom_toBottomOf="@+id/titleContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/titleContainer" - app:srcCompat="@drawable/ic_more_vert_white_24dp" /> + app:srcCompat="@drawable/ic_more_vert" /> + app:srcCompat="@drawable/ic_favorite_border" /> @@ -147,7 +147,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -179,7 +179,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -195,7 +195,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_gradient_controls.xml b/app/src/main/res/layout/fragment_gradient_controls.xml index a69f23821..10f4deace 100644 --- a/app/src/main/res/layout/fragment_gradient_controls.xml +++ b/app/src/main/res/layout/fragment_gradient_controls.xml @@ -16,7 +16,7 @@ app:layout_constraintBottom_toBottomOf="@+id/titleContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/titleContainer" - app:srcCompat="@drawable/ic_more_vert_white_24dp" + app:srcCompat="@drawable/ic_more_vert" tools:tint="@color/md_black_1000" /> @@ -130,7 +130,7 @@ app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -157,7 +157,7 @@ app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml index f0690de3d..5e8898b9e 100644 --- a/app/src/main/res/layout/fragment_gradient_player.xml +++ b/app/src/main/res/layout/fragment_gradient_player.xml @@ -85,7 +85,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/nextSongLabel" app:layout_constraintStart_toStartOf="parent" - app:srcCompat="@drawable/ic_queue_music_white_24dp" /> + app:srcCompat="@drawable/ic_queue_music" /> @@ -131,7 +131,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml index d99613cc1..653b005ee 100644 --- a/app/src/main/res/layout/fragment_home_player.xml +++ b/app/src/main/res/layout/fragment_home_player.xml @@ -94,7 +94,7 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index 75d08c2c8..191b61ec0 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -113,7 +113,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -128,7 +128,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -157,7 +157,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -172,7 +172,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index feaddb5ce..cd2f3c295 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -35,7 +35,7 @@ android:paddingBottom="12dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_diamond_stone_white_24dp" + app:srcCompat="@drawable/ic_diamond_stone" app:tint="?colorOnSecondary" /> @@ -100,7 +100,7 @@ android:id="@+id/nowPlayingSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_play_circle_filled_white_24dp" + app:settingListItemIcon="@drawable/ic_play_circle_filled" app:settingListItemIconColor="@color/md_red_A400" app:settingListItemText="@string/now_playing_summary" app:settingListItemTitle="@string/now_playing" /> @@ -109,7 +109,7 @@ android:id="@+id/audioSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_volume_up_white_24dp" + app:settingListItemIcon="@drawable/ic_volume_up" app:settingListItemIconColor="@color/md_deep_purple_A400" app:settingListItemText="@string/audio_settings_summary" app:settingListItemTitle="@string/pref_header_audio" /> @@ -118,7 +118,7 @@ android:id="@+id/personalizeSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_hdr_strong_white_24dp" + app:settingListItemIcon="@drawable/ic_hdr_strong" app:settingListItemIconColor="@color/md_teal_A400" app:settingListItemText="@string/personalize_settings_summary" app:settingListItemTitle="@string/personalize" /> @@ -128,7 +128,7 @@ android:id="@+id/imageSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_image_white_24dp" + app:settingListItemIcon="@drawable/ic_image" app:settingListItemIconColor="@color/md_deep_orange_A400" app:settingListItemText="@string/image_settings_summary" app:settingListItemTitle="@string/pref_header_images" /> @@ -137,7 +137,7 @@ android:id="@+id/notificationSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp" + app:settingListItemIcon="@drawable/ic_notifications_active" app:settingListItemIconColor="@color/md_yellow_A400" app:settingListItemText="@string/notification_settings_summary" app:settingListItemTitle="@string/notification" /> @@ -146,7 +146,7 @@ android:id="@+id/otherSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_testing_white_24dp" + app:settingListItemIcon="@drawable/ic_testing" app:settingListItemIconColor="@color/md_indigo_A400" app:settingListItemText="@string/other_settings_summary" app:settingListItemTitle="@string/others" /> @@ -156,7 +156,7 @@ android:id="@+id/aboutSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_info_outline_white_24dp" + app:settingListItemIcon="@drawable/ic_info_outline" app:settingListItemIconColor="@color/md_light_green_A400" app:settingListItemText="@string/about_settings_summary" app:settingListItemTitle="@string/action_about" /> diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml index a07ce51e6..c0e66bb12 100644 --- a/app/src/main/res/layout/fragment_material.xml +++ b/app/src/main/res/layout/fragment_material.xml @@ -48,10 +48,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml index 0c4e53a83..1b3cd50c6 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -129,7 +129,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -145,7 +145,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_sharp_white_24dp" + app:srcCompat="@drawable/ic_skip_previous_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -174,7 +174,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_sharp_white_24dp" + app:srcCompat="@drawable/ic_skip_next_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -189,7 +189,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_sharp_white_24dp" + app:srcCompat="@drawable/ic_shuffle_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index 3f5161b6a..7bbef52f9 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -25,7 +25,7 @@ android:layout_gravity="center_vertical" android:layout_margin="16dp" android:scaleType="centerCrop" - app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp" + app:srcCompat="@drawable/ic_keyboard_arrow_up" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> @@ -54,7 +54,7 @@ android:layout_gravity="center_vertical" android:background="?roundSelector" android:padding="6dp" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" app:tint="?attr/colorControlNormal" /> @@ -92,7 +92,7 @@ android:layout_gravity="center_vertical" android:background="?roundSelector" android:padding="6dp" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" app:tint="?attr/colorControlNormal" /> diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml index d106822bb..39205a29d 100644 --- a/app/src/main/res/layout/fragment_peak_control_player.xml +++ b/app/src/main/res/layout/fragment_peak_control_player.xml @@ -74,7 +74,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/progressSlider" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -123,7 +123,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -140,7 +140,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml index f063fd2db..7c1148a11 100644 --- a/app/src/main/res/layout/fragment_peak_player.xml +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -42,8 +42,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index ffcde7a44..538e7018d 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -61,7 +61,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -76,7 +76,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -104,7 +104,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -119,7 +119,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 64b442686..d9ff2a218 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -86,10 +86,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 5a4142e89..2e20ee3c1 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -59,11 +59,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index c181fbaaa..566deedc3 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -126,7 +126,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -141,7 +141,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -155,7 +155,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/songInfo" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml index 6e8d1f4d4..36f369d0e 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -93,7 +93,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -108,7 +108,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -136,7 +136,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -151,7 +151,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index 1eabf24b2..ff6892a2b 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -51,10 +51,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml index 4296f2478..99fbc3e8a 100644 --- a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml @@ -23,7 +23,7 @@ android:background="?attr/roundSelector" android:padding="16dp" android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -34,7 +34,7 @@ android:background="?attr/roundSelector" android:padding="16dp" android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index 62a4d437f..d3de24334 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -92,8 +92,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml index ad429bba0..ef73b468b 100644 --- a/app/src/main/res/layout/item_contributor.xml +++ b/app/src/main/res/layout/item_contributor.xml @@ -35,7 +35,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:retroCornerSize="21dp" - app:srcCompat="@drawable/ic_account_white_24dp" + app:srcCompat="@drawable/ic_account" tools:srcCompat="@tools:sample/backgrounds/scenic" /> diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 136ad6c98..1d27814f8 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical|start" android:visibility="gone" - app:srcCompat="@drawable/ic_drag_vertical_white_24dp" + app:srcCompat="@drawable/ic_drag_vertical" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml index 70fd399f3..3c601d3d9 100644 --- a/app/src/main/res/layout/item_list_quick_actions.xml +++ b/app/src/main/res/layout/item_list_quick_actions.xml @@ -28,7 +28,7 @@ android:layout_weight="1" android:text="@string/action_play_all" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_play_arrow_white_24dp" /> + app:icon="@drawable/ic_play_arrow" /> + app:icon="@drawable/ic_shuffle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_option_menu.xml b/app/src/main/res/layout/item_option_menu.xml index 4c5c175b0..b2dfaea2a 100644 --- a/app/src/main/res/layout/item_option_menu.xml +++ b/app/src/main/res/layout/item_option_menu.xml @@ -33,7 +33,7 @@ android:layout_weight="0" android:padding="12dp" app:tint="?attr/colorControlNormal" - tools:srcCompat="@drawable/ic_folder_white_24dp" /> + tools:srcCompat="@drawable/ic_folder" /> diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml index 7c021635b..4e565045a 100644 --- a/app/src/main/res/layout/layout_notification_collapsed.xml +++ b/app/src/main/res/layout/layout_notification_collapsed.xml @@ -117,7 +117,7 @@ android:layout_height="38dp" android:background="@drawable/notification_selector" android:scaleType="centerInside" - android:src="@drawable/ic_pause_white_24dp" + android:src="@drawable/ic_pause" tools:tint="?colorOnPrimary" /> diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml index 96ea3f172..c6518651d 100644 --- a/app/src/main/res/layout/list_setting_item_view.xml +++ b/app/src/main/res/layout/list_setting_item_view.xml @@ -33,7 +33,7 @@ app:iconBackgroundColor="@color/md_blue_A400" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" - app:srcCompat="@drawable/ic_theme_palette_white_24dp" /> + app:srcCompat="@drawable/ic_theme_palette" /> @@ -37,7 +37,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -67,7 +67,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -82,7 +82,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml index 6952d8baf..22b376fc4 100644 --- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml +++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml @@ -61,7 +61,7 @@ android:focusable="false" android:padding="16dp" android:tintMode="src_in" - app:srcCompat="@drawable/ic_drag_vertical_white_24dp" + app:srcCompat="@drawable/ic_drag_vertical" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml index 104e0340e..8288aae47 100644 --- a/app/src/main/res/menu/bottom_navigation_main.xml +++ b/app/src/main/res/menu/bottom_navigation_main.xml @@ -4,28 +4,28 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml index 622c2cdec..bd97edc06 100644 --- a/app/src/main/res/menu/menu_album_detail.xml +++ b/app/src/main/res/menu/menu_album_detail.xml @@ -3,7 +3,7 @@ @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml index e6d0f67d6..7288b1dd8 100644 --- a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml +++ b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml @@ -4,24 +4,24 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml index e2e50174c..67c5e76b7 100644 --- a/app/src/main/res/menu/menu_folders.xml +++ b/app/src/main/res/menu/menu_folders.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 84252a010..5c5f80afb 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -20,7 +20,7 @@ @@ -57,7 +57,7 @@ @@ -89,7 +89,7 @@ diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml index 59e0dc5d4..d914cf26f 100644 --- a/app/src/main/res/menu/menu_media_selection.xml +++ b/app/src/main/res/menu/menu_media_selection.xml @@ -4,31 +4,31 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml index d1919c1f7..d07419988 100755 --- a/app/src/main/res/menu/menu_player.xml +++ b/app/src/main/res/menu/menu_player.xml @@ -4,24 +4,24 @@ diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_playlists_selection.xml index fde5452b4..f2e6baf61 100644 --- a/app/src/main/res/menu/menu_playlists_selection.xml +++ b/app/src/main/res/menu/menu_playlists_selection.xml @@ -4,37 +4,37 @@ diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_playlists_songs_selection.xml index 20e6c8738..b89710bf5 100644 --- a/app/src/main/res/menu/menu_playlists_songs_selection.xml +++ b/app/src/main/res/menu/menu_playlists_songs_selection.xml @@ -4,25 +4,25 @@ diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml index 2c415de9c..683dbb511 100644 --- a/app/src/main/res/menu/menu_search.xml +++ b/app/src/main/res/menu/menu_search.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_smart_playlist_detail.xml b/app/src/main/res/menu/menu_smart_playlist_detail.xml index 896e26bed..8aeb1315a 100644 --- a/app/src/main/res/menu/menu_smart_playlist_detail.xml +++ b/app/src/main/res/menu/menu_smart_playlist_detail.xml @@ -3,7 +3,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3dba19e69..e85ac13da 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,7 +25,7 @@