From 6dc152b911e1b52ada93c1af8f7844aff90f147b Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 9 Dec 2021 22:25:39 +0530
Subject: [PATCH] [Now Playing] Moved toolbar of Flat theme to bottom

---
 .../player/flat/FlatPlayerFragment.kt         |  2 +-
 .../main/res/layout/fragment_flat_player.xml  | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
index 1d5642b12..c654882f1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
@@ -91,7 +91,7 @@ class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) {
         _binding = FragmentFlatPlayerBinding.bind(view)
         setUpPlayerToolbar()
         setUpSubFragments()
-        binding.playbackControlsFragment.drawAboveSystemBars()
+        binding.playerToolbar.drawAboveSystemBars()
     }
 
     override fun onShow() {
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 64294137f..e7c9a4601 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -18,8 +18,9 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
+    <include
+        android:id="@+id/include"
+        layout="@layout/shadow_statusbar_toolbar" />
 
     <FrameLayout
         android:id="@+id/statusBarContainer"
@@ -32,17 +33,6 @@
         <include layout="@layout/status_bar" />
     </FrameLayout>
 
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
-
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
@@ -51,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerToolbar"
+        app:layout_constraintTop_toBottomOf="@+id/statusBarContainer"
         tools:layout="@layout/fragment_album_flat_cover" />
 
 
@@ -60,10 +50,20 @@
         android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_flat_player_playback_controls" />
 
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/playerToolbar"
+        style="@style/Toolbar"
+        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" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file