Fix last items

2019-11-09 23:03:28 +05:30 · 2019-11-09 23:03:28 +05:30 · 531c783d1a
commit 531c783d1a
parent 3481ff4179
9 changed files with 29 additions and 44 deletions
--- 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)
--- 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)
--- 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<A : RecyclerView.Adapter<*>,
    }

    private fun checkForPadding() {
+        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)
-        recyclerView.setPadding(0, 0, 0, (height * 2.3).toInt())
+            params.bottomMargin = height
+        }
    }

    private fun initLayoutManager() {
--- 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 @@
    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
        android:id="@+id/recyclerView"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
        android:clipToPadding="false"
        android:layoutAnimation="@anim/layout_animation_fall_down"
-        android:scrollbars="none" />
+        android:scrollbars="none"
+        app:layout_dodgeInsetEdges="bottom" />

    <LinearLayout
        android:id="@android:id/empty"
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@ -100,5 +100,6 @@
        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
        android:layout_width="match_parent"
        android:layout_height="3dp"
-        android:progress="20" />
+        android:visibility="gone"
+        tools:progress="20" />
 </FrameLayout>
--- 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">


        <FrameLayout
--- a/app/src/main/res/transition/grid_exit.xml
+++ b/app/src/main/res/transition/grid_exit.xml
@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-    <changeBounds>
-        <arcMotion />
-    </changeBounds>
-    <changeTransform />
-    <changeClipBounds />
-    <changeImageTransform />
+
+    <changeImageTransform/>
+    <changeBounds/>
+    <changeTransform/>
    <targets>
        <target android:excludeId="@android:id/statusBarBackground" />
        <target android:excludeId="@android:id/navigationBarBackground" />
        <target android:excludeId="@id/toolbar" />
+        <target android:excludeId="@android:id/background" />
    </targets>
 </transitionSet>
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@ -35,11 +35,6 @@
        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>

        <item name="android:windowActivityTransitions">true</item>
-        <item name="android:windowExitTransition">@transition/grid_exit</item>
-        <item name="android:windowEnterTransition">@transition/grid_exit</item>
-
-        <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
-        <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
        <item name="android:fontFamily">@font/circular</item>

        <item name="windowActionBar">false</item>
@ -71,11 +66,6 @@
        <item name="android:windowBackground">@color/black_color</item>

        <item name="android:windowActivityTransitions">true</item>
-        <item name="android:windowExitTransition">@transition/grid_exit</item>
-        <item name="android:windowEnterTransition">@transition/grid_exit</item>
-
-        <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
-        <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
        <item name="android:fontFamily">@font/circular</item>

        <item name="windowActionBar">false</item>
@ -131,11 +121,6 @@
        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>

        <item name="android:windowActivityTransitions">true</item>
-        <item name="android:windowExitTransition">@transition/grid_exit</item>
-        <item name="android:windowEnterTransition">@transition/grid_exit</item>
-
-        <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
-        <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
        <item name="android:fontFamily">@font/circular</item>

        <item name="windowActionBar">false</item>
--- 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