v2.2.00

2018-11-23 22:00:46 +05:30 · 2018-11-23 22:00:46 +05:30 · 05b41fa07a
commit 05b41fa07a
parent 62b12da2ad
42 changed files with 1046 additions and 874 deletions
--- a/app/app.iml
+++ b/app/app.iml
@ -141,7 +141,6 @@
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
@ -158,7 +157,6 @@
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
@ -169,7 +167,6 @@
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
--- a/app/build.gradle
+++ b/app/build.gradle
@ -11,7 +11,7 @@ android {
        vectorDrawables.useSupportLibrary = true

        applicationId "code.name.monkey.retromusic"
-        versionCode 252
+        versionCode 253
        versionName '2.2.100'

        multiDexEnabled true
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@ -1 +1 @@
-<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }



    </style>
</head>
<body>
<h1 style="text-align:center;">Are you subscribe to <a
        href="https://www.youtube.com/user/PewDiePie">PewDiePie</a></h1>
<p style="line-height:150%">You can view the changelog dialog again at any time from the
    <i>about</i> section.</p>

<h3>Version 2.2.100</h3>
<ul style="line-height:150%">
    <li>On library click on toolbar for accessing main menu
    </li>
    <li>On home click on toolbar for accessing search
    </li>
    <li>BottomSheetDialogue is now adaptable to screens, background colour and text size
        consistency.
    </li>
    <li>Removed coloured navigation bar option to making app adapt the primary colour</li>
    <li>Swipe up gesture for now playing removed, replaced with "tap to open", To achieve
        transparent navigation bar for desired themes.
    </li>
    <li>Improved tablet UI and home screen by adding suggestions toggle banner issues.</li>
    <li>Improving lyrics page</li>
</ul>

<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
+<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }



    </style>
</head>
<body>
<h1 style="text-align:center;">Are you subscribed to <a
        href="https://www.youtube.com/user/PewDiePie">PewDiePie</a></h1>
<p style="line-height:150%">You can view the changelog dialog again at any time from the
    <i>about</i> section.</p>

<h3>Version 2.2.100</h3>
<ul style="line-height:150%">
    <li>On library click on toolbar for accessing main menu
    </li>
    <li>On home click on toolbar for accessing search
    </li>
    <li>BottomSheetDialogue is now adaptable to screens, background colour and text size
        consistency.
    </li>
    <li>Removed coloured navigation bar option to making app adapt the primary colour</li>
    <li>Swipe up gesture for now playing removed, replaced with "tap to open", To achieve
        transparent navigation bar for desired themes.
    </li>
    <li>Improved tablet UI and home screen by adding suggestions toggle banner issues.</li>
    <li>Improving lyrics page</li>
</ul>

<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
@ -322,7 +322,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements Shared
    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
        PreferenceUtil.getInstance().setLastPage(menuItem.getItemId());
        selectedFragment(menuItem.getItemId());
-        applyInsets();
        return true;
    }

--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
@ -46,7 +46,6 @@ import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
-import code.name.monkey.retromusic.util.RetroUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 import code.name.monkey.retromusic.views.BottomNavigationBarTinted;
 import code.name.monkey.retromusic.views.FitSystemWindowsLayout;
@ -81,11 +80,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderNavigationBar();
        super.onCreate(savedInstanceState);
        setContentView(createContentView());
        ButterKnife.bind(this);
-        checkDisplayCutout();
        choosFragmentForTheme();
        setupSlidingUpPanel();
    }
@ -120,12 +117,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
    }

    public void hideBottomBar(final boolean hide) {
-        //int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) + RetroUtil.getNavigationBarHeight(getResources());
-        int height = RetroUtil.checkNavigationBarHeight() ? getResources().getDimensionPixelSize(R.dimen.mini_player_height) : getResources().getDimensionPixelSize(R.dimen.mini_player_height);
-        int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height) + RetroUtil.getNavigationBarHeight(this);
-        int heightOfBarWithTabs =
-                getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) +
-                        RetroUtil.getNavigationBarHeight(this);
+        int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
+        int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded);
+
        if (hide) {
            slidingUpPanelLayout.setPanelHeight(0);
            collapsePanel();
@ -231,7 +225,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi

        slidingUpPanelLayout.addPanelSlideListener(this);

-        applyInsets();
    }

    protected void applyInsets() {
@ -297,8 +290,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
    public void onPanelSlide(View panel, float slideOffset) {
        bottomNavigationView.setTranslationY(slideOffset * 400);
        setMiniPlayerAlphaProgress(slideOffset);
-        if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel();
-        super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT));
+        //if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel();
+        //super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT));
    }

    @Override
@ -323,6 +316,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
        super.setNavigationbarColor(ThemeStore.primaryColor(this));
        super.setLightNavigationBar(lightNavigationBar);

+
        playerFragment.setMenuVisibility(false);
        playerFragment.setUserVisibleHint(false);
        playerFragment.onHide();
@ -330,15 +324,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi

    public void onPanelExpanded(View panel) {
        int playerFragmentColor = playerFragment.getPaletteColor();
-
        super.setTaskDescriptionColor(playerFragmentColor);
-        if (currentNowPlayingScreen == NowPlayingScreen.COLOR) {
-            super.setNavigationbarColor(playerFragmentColor);
-        } else {
-            super.setNavigationbarColor(Color.TRANSPARENT);
-        }
+        super.setLightStatusbar(lightStatusbar);

-        onPaletteColorChanged();
        playerFragment.setMenuVisibility(true);
        playerFragment.setUserVisibleHint(true);
        playerFragment.onShow();
@ -441,11 +429,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
            } else if (currentNowPlayingScreen == NowPlayingScreen.COLOR) {
                super.setLightStatusbar(isColorLight);
                super.setLightNavigationBar(isColorLight);
+                super.setNavigationbarColor(paletteColor);
            } else if (currentNowPlayingScreen == NowPlayingScreen.BLUR || currentNowPlayingScreen == NowPlayingScreen.BLUR_CARD) {
                super.setLightStatusbar(false);
+                super.setLightNavigationBar(true);
            } else if (currentNowPlayingScreen == NowPlayingScreen.CARD || currentNowPlayingScreen == NowPlayingScreen.FULL) {
-                super.setNavigationbarColor(Color.TRANSPARENT);
                super.setLightStatusbar(false);
+                super.setLightNavigationBar(ColorUtil.isColorLight(ThemeStore.primaryColor(this)));
            } else if (currentNowPlayingScreen == NowPlayingScreen.FIT) {
                super.setNavigationbarColor(Color.TRANSPARENT);
                super.setLightStatusbar(false);
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
@ -34,8 +34,6 @@ import code.name.monkey.retromusic.util.MusicUtil;
 import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroUtil;
-import code.name.monkey.retromusic.util.SystemUtils;
-import code.name.monkey.retromusic.views.FitSystemWindowsLayout;

 public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder {
    public static final String TAG = AbsPlayerFragment.class.getSimpleName();
@ -53,17 +51,6 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
        }
    }

-    protected void addSafeArea(View view) {
-        FitSystemWindowsLayout safeArea = view.findViewById(R.id.safeArea);
-        if (safeArea != null) {
-            //ViewGroup.MarginLayoutParams params = ((ViewGroup.MarginLayoutParams) safeArea.getLayoutParams());
-            //params.topMargin = RetroUtil.getStatusBarHeight();
-            //params.bottomMargin = RetroUtil.getNavigationBarHeight();
-            //if (PreferenceUtil.getInstance().getFullScreenMode()) safeArea.setFit(false);
-            //else safeArea.setFit(true);
-        }
-    }
-
    @Override
    public void onDetach() {
        super.onDetach();
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
@ -70,9 +70,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
    @BindView(R.id.toolbar)
    Toolbar toolbar;

-    /*@BindView(R.id.app_bar)
-    AppBarLayout appbar;
-*/
    @BindView(R.id.image)
    @Nullable
    ImageView imageView;
@ -80,9 +77,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
    @BindView(R.id.user_image)
    CircularImageView userImage;

-  /*  @BindView(R.id.collapsing_toolbar)
-    CollapsingToolbarLayout toolbarLayout;*/
-
    @BindView(R.id.recycler_view)
    RecyclerView recentArtistRV;

--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
@ -42,14 +42,12 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
                             @Nullable Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fragment_full, container, false);
        unbinder = ButterKnife.bind(this, view);
-
        return view;
    }

    @Override
    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
-
        setUpSubFragments();
        setUpPlayerToolbar();
    }
@ -64,7 +62,6 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
            playerAlbumCoverFragment.setCallbacks(this);
            playerAlbumCoverFragment.removeSlideEffect();
        }
-
    }

    @Override
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@ -3,8 +3,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
    android:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

@ -60,6 +60,50 @@
                    android:focusableInTouchMode="true"
                    android:orientation="vertical">

+                    <com.google.android.material.appbar.AppBarLayout
+                        android:id="@+id/app_bar"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:elevation="0dp"
+                        android:background="@android:color/transparent"
+                        app:elevation="0dp">
+
+                        <com.google.android.material.card.MaterialCardView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginEnd="8dp"
+                            app:cardCornerRadius="8dp"
+                            app:cardUseCompatPadding="true"
+                            app:layout_scrollFlags="scroll|enterAlways">
+
+                            <androidx.appcompat.widget.Toolbar
+                                android:id="@+id/toolbar"
+                                style="@style/Toolbar48"
+                                android:layout_gravity="center_vertical"
+                                app:layout_collapseMode="pin"
+                                tools:ignore="UnusedAttribute">
+
+                                <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                                    android:id="@+id/search_view"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:gravity="center"
+                                    android:hint="@string/search_hint"
+                                    android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                                <code.name.monkey.retromusic.views.CircularImageView
+                                    android:id="@+id/user_image"
+                                    android:layout_width="32dp"
+                                    android:layout_height="32dp"
+                                    android:layout_gravity="end|center_vertical"
+                                    android:layout_marginEnd="16dp"
+                                    app:civ_border="false" />
+                            </androidx.appcompat.widget.Toolbar>
+                        </com.google.android.material.card.MaterialCardView>
+                    </com.google.android.material.appbar.AppBarLayout>

                    <include layout="@layout/abs_playlists" />

--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@ -27,10 +27,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <LinearLayout
        android:id="@+id/safeArea"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -81,5 +84,5 @@
            </LinearLayout>
        </LinearLayout>

-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@ -21,16 +21,14 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <FrameLayout
            android:id="@+id/toolbar_container"
            android:layout_width="match_parent"
@ -72,8 +70,8 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom"
-            android:layout_marginStart="196dp"
-            android:layout_marginEnd="196dp">
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp">

        <fragment
            android:id="@+id/playback_controls_fragment"
@ -82,5 +80,5 @@
            android:layout_height="match_parent"
            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
    </FrameLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@ -20,16 +20,13 @@
        android:layout_height="match_parent"
        tools:layout="@layout/fragment_album_cover" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />

        <FrameLayout
            android:id="@+id/toolbar_container"
@ -54,10 +51,10 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="64dp"
            android:layout_marginEnd="64dp"
+            android:layout_marginBottom="8dp"
            android:layout_weight="0"
            app:cardBackgroundColor="?android:windowBackground"
            app:cardCornerRadius="8dp"
-                android:layout_marginBottom="8dp"
            app:cardUseCompatPadding="true">

            <FrameLayout
@ -74,7 +71,6 @@

        </androidx.cardview.widget.CardView>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>

    <include layout="@layout/shadow_statusbar_toolbar" />
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@ -14,10 +14,12 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
+    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -116,5 +118,5 @@

        </LinearLayout>

-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@ -15,10 +15,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <LinearLayout
        android:id="@+id/safeArea"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -67,5 +70,5 @@
                    tools:layout="@layout/fragment_flat_player_playback_controls" />
            </LinearLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
    android:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

@ -40,6 +40,50 @@
                android:focusableInTouchMode="true"
                android:orientation="vertical">

+                <com.google.android.material.appbar.AppBarLayout
+                    android:id="@+id/app_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:elevation="0dp"
+                    app:elevation="0dp">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_scrollFlags="scroll|enterAlways">
+
+                        <androidx.appcompat.widget.Toolbar
+                            android:id="@+id/toolbar"
+                            style="@style/Toolbar48"
+                            android:layout_gravity="center_vertical"
+                            app:layout_collapseMode="pin"
+                            tools:ignore="UnusedAttribute">
+
+                            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                                android:id="@+id/search_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:hint="@string/search_hint"
+                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                            <code.name.monkey.retromusic.views.CircularImageView
+                                android:id="@+id/user_image"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
+                                android:layout_gravity="end|center_vertical"
+                                android:layout_marginEnd="16dp"
+                                app:civ_border="false" />
+                        </androidx.appcompat.widget.Toolbar>
+                    </com.google.android.material.card.MaterialCardView>
+                </com.google.android.material.appbar.AppBarLayout>
+
                <include layout="@layout/abs_playlists" />

                <include layout="@layout/home_section_content" />
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@ -9,10 +9,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <LinearLayout
        android:id="@+id/safeArea"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -66,5 +69,5 @@
                </FrameLayout>
            </LinearLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@ -10,10 +10,13 @@
    <include layout="@layout/shadow_statusbar_toolbar" />


-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <LinearLayout
        android:id="@+id/safeArea"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -104,5 +107,5 @@
            </LinearLayout>

        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@ -14,10 +14,12 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
+    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout
            android:layout_width="match_parent"
@ -67,5 +69,5 @@

            </LinearLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@ -16,10 +16,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+    <LinearLayout
        android:id="@+id/safeArea"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/status_bar" />

        <LinearLayout

@ -69,5 +72,5 @@
                </FrameLayout>
            </LinearLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>
--- a/app/src/main/res/layout-sw600dp/abs_playlists.xml
+++ b/app/src/main/res/layout-sw600dp/abs_playlists.xml
@ -3,43 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
    android:orientation="vertical">

-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        app:cardCornerRadius="8dp"
-        app:cardUseCompatPadding="true">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar48"
-            tools:ignore="UnusedAttribute"
-            android:layout_gravity="center_vertical"
-            app:layout_collapseMode="pin">
-
-            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                android:id="@+id/search_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:hint="@string/search_hint"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-            <code.name.monkey.retromusic.views.CircularImageView
-                android:id="@+id/user_image"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_gravity="end|center_vertical"
-                android:layout_marginEnd="16dp"
-                app:civ_border="false" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.card.MaterialCardView>
-
    <androidx.appcompat.widget.AppCompatTextView
        style="@style/SubTitleTextAppearance"
        android:text="@string/for_you" />
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@ -21,6 +21,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

+
        <androidx.core.widget.NestedScrollView
            android:id="@+id/container"
            android:layout_width="match_parent"
@ -56,6 +57,51 @@
                        tools:ignore="ContentDescription" />
                </com.google.android.material.card.MaterialCardView>

+                <com.google.android.material.appbar.AppBarLayout
+                    android:id="@+id/app_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:elevation="0dp"
+                    app:elevation="0dp">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_scrollFlags="scroll|enterAlways">
+
+                        <androidx.appcompat.widget.Toolbar
+                            android:id="@+id/toolbar"
+                            style="@style/Toolbar48"
+                            android:layout_gravity="center_vertical"
+                            app:layout_collapseMode="pin"
+                            tools:ignore="UnusedAttribute">
+
+                            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                                android:id="@+id/search_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:hint="@string/search_hint"
+                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                            <code.name.monkey.retromusic.views.CircularImageView
+                                android:id="@+id/user_image"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
+                                android:layout_gravity="end|center_vertical"
+                                android:layout_marginEnd="16dp"
+                                app:civ_border="false" />
+                        </androidx.appcompat.widget.Toolbar>
+                    </com.google.android.material.card.MaterialCardView>
+                </com.google.android.material.appbar.AppBarLayout>
+
                <include layout="@layout/abs_playlists" />

                <include layout="@layout/home_section_content" />
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@ -35,10 +35,13 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent">

+            <include layout="@layout/status_bar" />
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_above="@id/toolbar_container"
+                android:layout_below="@id/status_bar"
                android:orientation="horizontal">

                <FrameLayout
@ -110,7 +113,6 @@
                </LinearLayout>
            </LinearLayout>

-
            <FrameLayout
                android:id="@+id/toolbar_container"
                android:layout_width="match_parent"
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@ -20,6 +20,50 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    android:layout_gravity="center_vertical"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
+
+                    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                        android:id="@+id/search_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:hint="@string/search_hint"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>

        <androidx.core.widget.NestedScrollView
            android:id="@+id/container"
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@ -14,16 +14,14 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <LinearLayout
            android:id="@+id/container"
            android:layout_width="400dp"
@ -66,5 +64,4 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </RelativeLayout>
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@ -25,10 +25,6 @@
        android:layout_height="match_parent"
        android:background="@drawable/shadow_up" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
@ -38,6 +34,8 @@
        android:layout_marginEnd="64dp"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <code.name.monkey.retromusic.views.WidthFitSquareLayout
            android:id="@+id/album_cover_container"
            android:layout_width="match_parent"
@ -80,5 +78,5 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
    android:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

@ -21,7 +21,50 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">

+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    android:layout_gravity="center_vertical"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
+
+                    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                        android:id="@+id/search_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:hint="@string/search_hint"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>

        <androidx.core.widget.NestedScrollView
            android:id="@+id/container"
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@ -14,11 +14,6 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@ -26,6 +21,7 @@
        android:gravity="center_horizontal"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />

        <code.name.monkey.retromusic.views.WidthFitSquareLayout
            android:id="@+id/album_cover_container"
@ -67,5 +63,4 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@ -1,45 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        app:cardCornerRadius="8dp"
-        app:cardUseCompatPadding="true">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar48"
-            android:layout_gravity="center_vertical"
-            app:layout_collapseMode="pin"
-            tools:ignore="UnusedAttribute">
-
-            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                android:id="@+id/search_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:hint="@string/search_hint"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
-
-            <code.name.monkey.retromusic.views.CircularImageView
-                android:id="@+id/user_image"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_gravity="end|center_vertical"
-                android:layout_marginEnd="16dp"
-                app:civ_border="false" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.card.MaterialCardView>
-
    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
        style="@style/SubTitleTextAppearance"
        android:text="@string/for_you" />
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@ -9,16 +9,14 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <FrameLayout
            android:id="@+id/toolbar_container"
            android:layout_width="match_parent"
@ -69,5 +67,4 @@
                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
    android:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

@ -18,6 +18,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

+
        <androidx.core.widget.NestedScrollView
            android:id="@+id/container"
            android:layout_width="match_parent"
@ -35,7 +36,6 @@
                android:focusableInTouchMode="true"
                android:orientation="vertical">

-
                <com.google.android.material.card.MaterialCardView
                    android:id="@+id/image_container"
                    android:layout_width="match_parent"
@ -47,12 +47,57 @@
                    <ImageView
                        android:id="@+id/image"
                        android:layout_width="match_parent"
-                        android:layout_height="196dp"
+                        android:layout_height="182dp"
                        android:scaleType="centerCrop"
                        app:layout_collapseMode="parallax"
                        tools:ignore="ContentDescription" />
                </com.google.android.material.card.MaterialCardView>

+                <com.google.android.material.appbar.AppBarLayout
+                    android:id="@+id/app_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:elevation="0dp"
+                    app:elevation="0dp">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_scrollFlags="scroll|enterAlways">
+
+                        <androidx.appcompat.widget.Toolbar
+                            android:id="@+id/toolbar"
+                            style="@style/Toolbar48"
+                            android:layout_gravity="center_vertical"
+                            app:layout_collapseMode="pin"
+                            tools:ignore="UnusedAttribute">
+
+                            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                                android:id="@+id/search_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:hint="@string/search_hint"
+                                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                            <code.name.monkey.retromusic.views.CircularImageView
+                                android:id="@+id/user_image"
+                                android:layout_width="32dp"
+                                android:layout_height="32dp"
+                                android:layout_gravity="end|center_vertical"
+                                android:layout_marginEnd="16dp"
+                                app:civ_border="false" />
+                        </androidx.appcompat.widget.Toolbar>
+                    </com.google.android.material.card.MaterialCardView>
+                </com.google.android.material.appbar.AppBarLayout>
+
                <include layout="@layout/abs_playlists" />

                <include layout="@layout/home_section_content" />
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@ -23,16 +23,13 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <FrameLayout
            android:id="@+id/toolbar_container"
            android:layout_width="match_parent"
@ -73,5 +70,4 @@
                android:layout_height="match_parent" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@ -21,10 +21,6 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <FrameLayout
        android:layout_width="match_parent"
@ -35,6 +31,8 @@
            android:layout_height="wrap_content"
            android:orientation="vertical">

+            <include layout="@layout/status_bar" />
+
            <FrameLayout
                android:id="@+id/toolbar_container"
                android:layout_width="match_parent"
@ -84,5 +82,5 @@
                tools:layout="@layout/fragment_card_blur_player_playback_controls" />
        </FrameLayout>
    </FrameLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@ -5,8 +5,8 @@
    android:id="@+id/playback_controls"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingStart="32dp"
-    android:paddingEnd="32dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
    android:paddingBottom="32dp">

    <LinearLayout
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@ -20,17 +20,12 @@
        android:layout_height="match_parent"
        tools:layout="@layout/fragment_album_full_cover" />
    
-
-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />

        <FrameLayout
            android:id="@+id/toolbar_container"
@ -73,5 +68,4 @@
            </FrameLayout>
        </com.google.android.material.card.MaterialCardView>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@ -15,16 +15,12 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />

        <com.google.android.material.card.MaterialCardView
            android:layout_width="match_parent"
@ -117,5 +113,5 @@

        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@ -15,16 +15,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <FrameLayout
            android:id="@+id/toolbar_container"
            android:layout_width="match_parent"
@ -65,5 +62,5 @@
                tools:layout="@layout/fragment_flat_player_playback_controls" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout> 
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@ -18,10 +18,7 @@
        android:layout_height="match_parent"
        android:background="#50000000" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+

        <LinearLayout
            android:layout_width="match_parent"
@ -49,5 +46,5 @@

            </FrameLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -2,9 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_fragment_content"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:id="@+id/main_fragment_content"
    android:orientation="vertical">

    <FrameLayout
@ -19,6 +19,51 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:elevation="0dp"
+            android:background="@android:color/transparent"
+            app:elevation="0dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    android:layout_gravity="center_vertical"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
+
+                    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                        android:id="@+id/search_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:hint="@string/search_hint"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
+
        <androidx.core.widget.NestedScrollView
            android:id="@+id/container"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@ -9,16 +9,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <code.name.monkey.retromusic.views.WidthFitSquareLayout
            android:id="@+id/album_cover_container"
            android:layout_width="match_parent"
@ -60,5 +57,5 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@ -9,16 +9,13 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <LinearLayout
            android:id="@+id/title_container"
            android:layout_width="match_parent"
@ -94,5 +91,4 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@ -14,16 +14,14 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <FrameLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <include layout="@layout/status_bar" />
+
        <code.name.monkey.retromusic.views.WidthFitSquareLayout
            android:id="@+id/album_cover_container"
            android:layout_width="match_parent"
@ -65,5 +63,5 @@
                app:navigationIcon="@drawable/ic_close_white_24dp" />
        </FrameLayout>
    </LinearLayout>
-    </FrameLayout>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@ -15,16 +15,12 @@

    <include layout="@layout/shadow_statusbar_toolbar" />

-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="vertical">
-
+            <include layout="@layout/status_bar" />

            <code.name.monkey.retromusic.views.WidthFitSquareLayout
                android:layout_width="match_parent"
@ -65,5 +61,5 @@
                    app:navigationIcon="@drawable/ic_close_white_24dp" />
            </FrameLayout>
        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
 </FrameLayout>