Fixed overlapping navbar with all themes

app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt

@@ -33,10 +33,7 @@ import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.FragmentCirclePlayerBinding
-import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.base.goToAlbum
@@ -96,6 +93,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
         binding.text.setOnClickListener {
             goToArtist(requireActivity())
         }
+        binding.songInfo.drawAboveNavBar()
     }
 
     private fun setUpPlayerToolbar() {

app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt

@@ -22,6 +22,7 @@ import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.FragmentFullBinding
+import code.name.monkey.retromusic.extensions.drawAboveNavBar
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.extensions.whichFragment
@@ -62,6 +63,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
         setUpPlayerToolbar()
         setupArtist()
         binding.nextSong.isSelected = true
+        binding.playbackControlsFragment.drawAboveNavBar()
     }
 
     private fun setupArtist() {

app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt

@@ -40,9 +40,7 @@ import code.name.monkey.retromusic.databinding.FragmentGradientPlayerBinding
 import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.SongEntity
 import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.extensions.ripAlpha
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.base.goToAlbum
@@ -157,6 +155,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         binding.playbackControlsFragment.text.setOnClickListener {
             goToArtist(requireActivity())
         }
+        binding.container.drawAboveNavBarWithPadding()
     }
 
     @SuppressLint("ClickableViewAccessibility")

app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt

@@ -21,6 +21,7 @@ import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.FragmentPeakPlayerBinding
+import code.name.monkey.retromusic.extensions.drawAboveNavBar
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
@@ -55,6 +56,7 @@ class PeakPlayerFragment : AbsPlayerFragment(R.layout.fragment_peak_player) {
         binding.text.setOnClickListener {
             goToArtist(requireActivity())
         }
+        binding.root.drawAboveNavBar()
     }
 
     private fun setUpSubFragments() {

app/src/main/res/layout/fragment_classic_player.xml

@@ -78,6 +78,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="bottom"
+        style="@style/BottomSheetStyle"
         android:theme="@style/TopCornerCardView"
         app:behavior_hideable="false"
         app:cardElevation="24dp"
@@ -87,7 +88,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/colorSurface"
             android:clickable="false"
             android:orientation="vertical">
 

app/src/main/res/layout/fragment_peak_player.xml

@@ -17,18 +17,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorSurface"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
     <FrameLayout
         android:id="@+id/toolbarContainer"
         android:layout_width="match_parent"
@@ -117,5 +110,4 @@
         app:layout_constraintTop_toBottomOf="@+id/songInfo"
         tools:layout="@layout/fragment_peak_control_player" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>