diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index 31e697e5c..4f278e5e2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -73,7 +73,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { override fun onCreate(savedInstanceState: Bundle?) { setDrawUnderStatusBar() - setupWindowTransition() + //setupWindowTransition() super.onCreate(savedInstanceState) toggleBottomNavigationView(true) setStatusbarColor(Color.TRANSPARENT) @@ -165,6 +165,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { ArtistGlideRequest.Builder.from(Glide.with(this), artist) .generatePalette(this).build() .dontAnimate() + .dontTransform() .into(object : RetroMusicColoredTarget(artistImage) { override fun onColorReady(color: Int) { @@ -177,7 +178,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { SongGlideRequest.Builder.from(Glide.with(this), album.safeGetFirstSong()) .checkIgnoreMediaStore(this) .generatePalette(this).build() - .dontAnimate() + .dontAnimate().dontTransform() .into(object : RetroMusicColoredTarget(image) { override fun onColorReady(color: Int) { setColors(color) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt index 8fb33851d..60dbebee6 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt @@ -69,7 +69,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView { override fun onCreate(savedInstanceState: Bundle?) { setDrawUnderStatusBar() - setupWindowTransitions() + // setupWindowTransitions() super.onCreate(savedInstanceState) toggleBottomNavigationView(true) setStatusbarColor(Color.TRANSPARENT) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt index 5cab5db54..7fa55da70 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt @@ -9,6 +9,7 @@ import androidx.annotation.StringRes import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.util.DensityUtil import code.name.monkey.retromusic.util.ViewUtil import com.google.android.material.appbar.AppBarLayout @@ -63,8 +64,15 @@ abstract class AbsLibraryPagerRecyclerViewFragment, } private fun checkForPadding() { - val height = DensityUtil.dip2px(requireContext(), 52f) - recyclerView.setPadding(0, 0, 0, (height * 2.3).toInt()) + val itemCount: Int = adapter?.itemCount ?: 0 + val params = container.layoutParams as ViewGroup.MarginLayoutParams + if (itemCount > 0 && MusicPlayerRemote.playingQueue.isNotEmpty()) { + val height = DensityUtil.dip2px(requireContext(), 104f) + params.bottomMargin = height + } else { + val height = DensityUtil.dip2px(requireContext(), 52f) + params.bottomMargin = height + } } private fun initLayoutManager() { 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 03112a172..aa957d063 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 @@ -9,10 +9,11 @@ + android:scrollbars="none" + app:layout_dodgeInsetEdges="bottom" /> + android:visibility="gone" + tools:progress="20" /> \ No newline at end of file diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index 386918ee7..c8d7ce6a9 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -25,10 +25,12 @@ android:layout_height="wrap_content" app:behavior_hideable="false" app:behavior_peekHeight="0dp" - app:cardCornerRadius="0dp" - app:cardElevation="0dp" + app:cardElevation="8dp" + app:cardBackgroundColor="?colorSecondary" + app:cardPreventCornerOverlap="true" app:cardUseCompatPadding="false" - app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" + app:shapeAppearanceOverlay="@style/TopCornerCardView"> - - - - - - + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 2362f8e14..ab8f24af2 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -35,11 +35,6 @@ @style/PreferenceThemeOverlay.v14.Material true - @transition/grid_exit - @transition/grid_exit - - @transition/grid_exit - @transition/grid_exit @font/circular false @@ -71,11 +66,6 @@ @color/black_color true - @transition/grid_exit - @transition/grid_exit - - @transition/grid_exit - @transition/grid_exit @font/circular false @@ -131,11 +121,6 @@ @style/PreferenceThemeOverlay.v14.Material true - @transition/grid_exit - @transition/grid_exit - - @transition/grid_exit - @transition/grid_exit @font/circular false diff --git a/gradle.properties b/gradle.properties index 66eab58ff..959ebc9ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,6 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048M org.gradle.daemon=true org.gradle.parallel=true -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true jvmArgs='-Xmx2048m' android.useAndroidX=true android.enabelR8=true