From bd05de53d8a5525eaa03f4a26ff4603a7ed30d7e Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 20 Sep 2021 15:03:47 +0530 Subject: [PATCH] Changed artist and album details page a bit --- .../adapter/base/AbsMultiSelectAdapter.kt | 4 ---- .../fragments/albums/AlbumDetailsFragment.kt | 4 ++-- .../fragments/albums/AlbumsFragment.kt | 4 ++-- .../artists/AbsArtistDetailsFragment.kt | 4 ++-- .../fragments/artists/ArtistsFragment.kt | 4 ++-- .../fragments/base/AbsRecyclerViewFragment.kt | 3 ++- .../fragments/folder/FoldersFragment.kt | 4 ++-- .../playlists/PlaylistDetailsFragment.kt | 4 ++-- .../retromusic/fragments/songs/SongsFragment.kt | 4 ++-- .../res/layout-land/fragment_album_details.xml | 16 ++++++---------- .../res/layout-land/fragment_artist_details.xml | 16 ++++++---------- .../main/res/layout/fragment_album_details.xml | 6 +----- .../main/res/layout/fragment_artist_details.xml | 6 +----- app/src/main/res/layout/fragment_folder.xml | 6 +----- .../main/res/layout/fragment_main_recycler.xml | 6 +----- .../main/res/layout/fragment_playlist_detail.xml | 7 +------ app/src/main/res/values/styles.xml | 2 +- build.gradle | 2 +- 18 files changed, 35 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt index 486a8b974..8030d4845 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt @@ -7,11 +7,8 @@ import androidx.annotation.MenuRes import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.extensions.surfaceColor import code.name.monkey.retromusic.interfaces.ICabCallback import code.name.monkey.retromusic.interfaces.ICabHolder -import code.name.monkey.retromusic.util.ColorAnimUtil -import code.name.monkey.retromusic.util.RetroColorUtil import com.afollestad.materialcab.attached.AttachedCab import com.afollestad.materialcab.attached.destroy import com.afollestad.materialcab.attached.isActive @@ -24,7 +21,6 @@ abstract class AbsMultiSelectAdapter( private val checked: MutableList private var menuRes: Int override fun onCabCreated(cab: AttachedCab, menu: Menu): Boolean { - return true } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt index 7956880c6..46457b89e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt @@ -470,10 +470,10 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det it.destroy() } } - cab = createCab(R.id.cab_stub) { + cab = createCab(R.id.toolbar_container) { menu(menuRes) closeDrawable(R.drawable.ic_close) - backgroundColor(literal = RetroColorUtil.shiftBackgroundColorForLightText(surfaceColor())) + backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor())) slideDown() onCreate { cab, menu -> callback.onCabCreated(cab, menu) } onSelection { 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 cd7b1baa5..11f779713 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 @@ -346,10 +346,10 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index fc8e398cd..691f9d132 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -326,10 +326,10 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm it.destroy() } } - cab = createCab(R.id.cab_stub) { + cab = createCab(R.id.toolbar_container) { menu(menuRes) closeDrawable(R.drawable.ic_close) - backgroundColor(literal = RetroColorUtil.shiftBackgroundColorForLightText(surfaceColor())) + backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor())) slideDown() onCreate { cab, menu -> callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt index 9bec93f4b..c96d9c2fd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt @@ -344,10 +344,10 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt index f42811c9a..066dad981 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt @@ -58,7 +58,8 @@ abstract class AbsRecyclerViewFragment, LM : Recycle initAdapter() setUpRecyclerView() setupToolbar() - binding.appBarLayout.statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(requireContext()); + binding.appBarLayout.statusBarForeground = + MaterialShapeDrawable.createWithElevationOverlay(requireContext()) } fun toolbar(): Toolbar { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt index 620432c16..312b2f4f4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt @@ -432,10 +432,10 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), if (cab != null && cab!!.isActive()) { cab?.destroy() } - cab = createCab(R.id.cab_stub) { + cab = createCab(R.id.toolbar_container) { menu(menuRes) closeDrawable(R.drawable.ic_close) - backgroundColor(literal = RetroColorUtil.shiftBackgroundColorForLightText(surfaceColor())) + backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor())) slideDown() onCreate { cab, menu -> callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt index a251757eb..8edc235fd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt @@ -179,10 +179,10 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli it.destroy() } } - cab = createCab(R.id.cab_stub) { + cab = createCab(R.id.toolbar_container) { menu(menuRes) closeDrawable(R.drawable.ic_close) - backgroundColor(literal = RetroColorUtil.shiftBackgroundColorForLightText(surfaceColor())) + backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor())) slideDown() onCreate { cab, menu -> callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt index afab7103d..3d6d98714 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt @@ -371,10 +371,10 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment callback.onCabCreated(cab, menu) } onSelection { diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml index 82f84575e..c43b95898 100644 --- a/app/src/main/res/layout-land/fragment_album_details.xml +++ b/app/src/main/res/layout-land/fragment_album_details.xml @@ -11,7 +11,7 @@ tools:ignore="UnusedAttribute"> - - + app:layout_constraintTop_toBottomOf="@id/toolbar_container"> + app:layout_constraintTop_toBottomOf="@id/toolbar_container"> - - @@ -35,13 +30,13 @@ android:layout_height="0dp" android:layout_marginStart="16dp" android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" + android:layout_marginBottom="@dimen/mini_player_height" android:transitionName="@string/transition_artist_image" app:cardCornerRadius="24dp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" - app:layout_constraintEnd_toStartOf="@+id/content" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/toolbarContainer"> + app:layout_constraintTop_toBottomOf="@id/toolbar_container"> + app:layout_constraintTop_toBottomOf="@id/toolbar_container"> @@ -21,11 +22,6 @@ style="@style/Toolbar" android:background="?attr/colorSurface" app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> - - diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml index 4b0a4902b..9191649ca 100644 --- a/app/src/main/res/layout/fragment_artist_details.xml +++ b/app/src/main/res/layout/fragment_artist_details.xml @@ -13,6 +13,7 @@ app:liftOnScroll="true"> @@ -21,11 +22,6 @@ style="@style/Toolbar" android:background="?attr/colorSurface" app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> - - diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 2cda67541..f2f7c9d82 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -14,6 +14,7 @@ app:liftOnScroll="true"> @@ -36,11 +37,6 @@ android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" /> - - diff --git a/app/src/main/res/layout/fragment_main_recycler.xml b/app/src/main/res/layout/fragment_main_recycler.xml index d4af55c90..c7fecfdbd 100644 --- a/app/src/main/res/layout/fragment_main_recycler.xml +++ b/app/src/main/res/layout/fragment_main_recycler.xml @@ -13,6 +13,7 @@ android:fitsSystemWindows="true"> @@ -34,11 +35,6 @@ android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" /> - - diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml index dc1d92be5..18f981bdf 100644 --- a/app/src/main/res/layout/fragment_playlist_detail.xml +++ b/app/src/main/res/layout/fragment_playlist_detail.xml @@ -15,6 +15,7 @@ app:liftOnScroll="true"> @@ -26,12 +27,6 @@ android:background="?attr/colorSurface" app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> - - - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f7efe626f..c67d2a4c4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,7 +43,7 @@