Converted all text to material widgest and font

app/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
-        renderscriptTargetApi 28 //must match target sdk and build tools
+        renderscriptTargetApi 29 //must match target sdk and build tools
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
@@ -67,6 +67,7 @@ android {
         sourceCompatibility '1.8'
         targetCompatibility '1.8'
     }
+    buildToolsVersion = '29.0.1'
 
     configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
@@ -100,14 +101,14 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.fragment:fragment:1.2.0-alpha02'
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta02'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.palette:palette:1.0.0"
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.preference:preference:1.1.0-rc01'
     implementation 'androidx.palette:palette-ktx:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'com.google.android.material:material:1.1.0-alpha09'
 
@@ -141,11 +142,11 @@ dependencies {
 
     implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
     implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
-    implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3'
+    implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.3-kmod'
     implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
 
     implementation 'com.anjlab.android.iab.v3:library:1.1.0'
-    implementation 'com.r0adkll:slidableactivity:2.0.6'
+    implementation 'com.r0adkll:slidableactivity:2.1.0'
     implementation 'com.heinrichreimersoftware:material-intro:1.6'
 
     implementation project(':appthemehelper')

app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt

@@ -9,12 +9,12 @@ import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
 import com.r0adkll.slidr.model.SlidrListener
@@ -57,11 +57,13 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
                     }
 
-                    override fun onSlideClosed() {
+                    override fun onSlideClosed(): Boolean {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                             val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
                             keyguardManager.requestDismissKeyguard(this@LockScreenActivity, null)
                         }
+                        finish()
+                        return true
                     }
                 })
                 .position(SlidrPosition.BOTTOM)

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt

@@ -48,11 +48,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
     }
 
     override fun createContentView(): View {
-        @SuppressLint("InflateParams")
+        return wrapSlidingMusicPanel(R.layout.activity_main_content)
-        val contentView = layoutInflater.inflate(R.layout.activity_main_drawer_layout, null)
-        val drawerContent = contentView.findViewById<ViewGroup>(R.id.drawer_content_container)
-        drawerContent.addView(wrapSlidingMusicPanel(R.layout.activity_main_content))
-        return contentView
     }
 
     override fun onCreate(

app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java

@@ -3,6 +3,7 @@ package code.name.monkey.retromusic.activities;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.webkit.WebView;
 
@@ -18,13 +19,14 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
+import static code.name.monkey.appthemehelper.util.ATHUtil.INSTANCE;
+
 public class WhatsNewActivity extends AbsBaseActivity {
     WebView webView;
     Toolbar toolbar;
@@ -41,8 +43,8 @@ public class WhatsNewActivity extends AbsBaseActivity {
         }
     }
 
-    private static String colorToHex(int color) {
+    private static String colorToCSS(int color) {
-        return Integer.toHexString(color).substring(2);
+        return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color)); // on API 29, WebView doesn't load with hex colors
     }
 
     @Override
@@ -75,14 +77,16 @@ public class WhatsNewActivity extends AbsBaseActivity {
             in.close();
 
             // Inject color values for WebView body background and links
-            final String backgroundColor = colorToHex(ThemeStore.Companion.primaryColor(this));
+            final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
-            final String contentColor = ATHUtil.INSTANCE.isWindowBackgroundDark(this) ? "#ffffff" : "#000000";
+            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.md_background_color, Color.parseColor(isDark ? "#424242" : "#ffffff")));
-            webView.loadData(buf.toString()
+            final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
-                            .replace("{style-placeholder}",
+            final String changeLog = buf.toString()
-                                    String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
+                    .replace("{style-placeholder}",
-                            .replace("{link-color}", colorToHex(ThemeStore.Companion.accentColor(this)))
+                            String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
-                            .replace("{link-color-active}", colorToHex(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))))
+                    .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this)))
-                    , "text/html", "UTF-8");
+                    .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))));
+
+            webView.loadData(changeLog, "text/html", "UTF-8");
         } catch (Throwable e) {
             webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
         }

app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt

@@ -82,12 +82,6 @@ class SearchAdapter(private val activity: AppCompatActivity, private var dataSet
         init {
             itemView.setOnLongClickListener(null)
 
-            if (itemViewType != HEADER) {
-                if (separator != null) {
-                    separator!!.visibility = View.GONE
-                }
-            }
-
             if (menu != null) {
                 if (itemViewType == SONG) {
                     menu!!.visibility = View.VISIBLE

app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt

@@ -84,16 +84,6 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
         val isChecked = isChecked(album)
         holder.itemView.isActivated = isChecked
 
-        if (holder.adapterPosition == itemCount - 1) {
-            if (holder.shortSeparator != null) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        } else {
-            if (holder.shortSeparator != null) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        }
-
         if (holder.title != null) {
             holder.title!!.text = getAlbumTitle(album)
         }

app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt

@@ -68,9 +68,7 @@ class ArtistAdapter(val activity: AppCompatActivity,
         if (holder.text != null) {
             holder.text!!.visibility = View.GONE
         }
-        if (holder.shortSeparator != null) {
+
-            holder.shortSeparator!!.visibility = View.GONE
-        }
         loadArtistImage(artist, holder)
     }
 

app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt

@@ -27,8 +27,6 @@ open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), Vie
     var imageContainer: ViewGroup? = null
     var imageContainerCard: CardView? = null
     var menu: View? = null
-    var separator: View? = null
-    var shortSeparator: View? = null
     var dragView: View? = null
     var paletteColorContainer: View? = null
     var time: TextView? = null
@@ -53,8 +51,6 @@ open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), Vie
         menu = view.findViewById(R.id.menu)
         dragView = view.findViewById(R.id.drag_view)
 
-        separator = view.findViewById(R.id.separator)
-        shortSeparator = view.findViewById(R.id.short_separator)
         paletteColorContainer = view.findViewById(R.id.palette_color_container)
 
         time = view.findViewById(R.id.time);

app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt

@@ -84,15 +84,6 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL
         if (holder.image != null) {
             holder.image!!.setImageDrawable(getIconRes(playlist))
         }
-        if (holder.adapterPosition == itemCount - 1) {
-            if (holder.shortSeparator != null) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        } else {
-            if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        }
     }
 
     private fun getIconRes(playlist: Playlist): Drawable {

app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt

@@ -78,16 +78,6 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp
         val isChecked = isChecked(song)
         holder.itemView.isActivated = isChecked
 
-        if (holder.adapterPosition == itemCount - 1) {
-            if (holder.shortSeparator != null) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        } else {
-            if (holder.shortSeparator != null) {
-                holder.shortSeparator!!.visibility = View.GONE
-            }
-        }
-
         if (holder.title != null) {
             holder.title!!.text = getSongTitle(song)
         }

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt

@@ -110,7 +110,7 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
      * @return whether the palette option should be available for the current item layout or not
      */
     fun canUsePalette(): Boolean {
-        return itemLayoutRes == R.layout.item_color
+        return itemLayoutRes == R.layout.item_card_color
     }
 
     protected fun notifyLayoutResChanged(@LayoutRes res: Int) {

app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt

@@ -302,8 +302,6 @@ class PortraitImpl(private val fragment: ClassicPlayerFragment) : BaseImpl(fragm
         currentSongViewHolder = MediaEntryViewHolder(fragment.view?.findViewById(R.id.currentSong)!!)
 
         currentSongViewHolder?.apply {
-            separator?.visibility = View.VISIBLE
-            shortSeparator?.visibility = View.GONE
             image?.apply {
                 scaleType = ImageView.ScaleType.CENTER
                 setColorFilter(ATHUtil.resolveColor(fragment.activity!!, R.attr.iconColor, ThemeStore.textColorSecondary(fragment.activity!!)), PorterDuff.Mode.SRC_IN)

app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt

@@ -100,13 +100,13 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() {
     }
 
     override fun setDark(color: Int) {
-        val colorBg = ATHUtil.resolveColor(context, android.R.attr.colorBackground)
+        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
         if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(context, true)
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(context, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
         } else {
-            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(context, false)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(context!!, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
         }
 
         updateRepeatState()
@@ -116,7 +116,7 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() {
             lastPlaybackControlsColor = color
             color
         } else {
-            ThemeStore.textColorSecondary(context!!)
+            ThemeStore.textColorSecondary(requireContext())
         }
 
         text.setTextColor(colorFinal)

app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt

@@ -1,6 +1,5 @@
 package code.name.monkey.retromusic.fragments.player.material
 
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,14 +8,12 @@ import androidx.appcompat.widget.Toolbar
 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.extensions.hide
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import kotlinx.android.synthetic.main.fragment_material.*
-import kotlinx.android.synthetic.main.shadow_statusbar_toolbar.*
 
 /**
  * @author Hemanth S (h4h13).
@@ -47,15 +44,15 @@ class MaterialFragment : AbsPlayerFragment() {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(context!!, R.attr.iconColor)
+        return ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
     }
 
     override fun onColorChanged(color: Int) {
         playbackControlsFragment.setDark(color)
         lastColor = color
-        callbacks!!.onPaletteColorChanged()
+        callbacks?.onPaletteColorChanged()
 
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context!!, R.attr.iconColor), activity)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.iconColor), requireActivity())
     }
 
     override fun toggleFavorite(song: Song) {
@@ -90,9 +87,9 @@ class MaterialFragment : AbsPlayerFragment() {
     private fun setUpPlayerToolbar() {
         playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { activity!!.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@MaterialFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt

@@ -66,7 +66,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
         aboutSettings.setOnClickListener(this)
 
         buyProContainer.apply {
-            if (!App.isProVersion) show() else hide()
+            if (App.isProVersion) show() else hide()
             setOnClickListener {
                 NavigationUtil.goToProVersion(context)
             }

app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt

@@ -40,12 +40,17 @@ import com.afollestad.materialdialogs.color.colorChooser
  */
 
 class ThemeSettingsFragment : AbsSettingsFragment() {
+    private var materialDialog: MaterialDialog? = null
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        materialDialog?.dismiss()
+    }
 
     override fun invalidateSettings() {
 
         val categoryColor: ATEPreferenceCategory? = findPreference("category_color")
         val primaryColorPref = ATEColorPreference(preferenceScreen.context)
-
         val primaryColor = ThemeStore.primaryColor(requireContext())
 
         primaryColorPref.apply {
@@ -57,7 +62,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
             setIcon(R.drawable.ic_colorize_white_24dp)
             setColor(primaryColor, ColorUtil.darkenColor(primaryColor))
             setOnPreferenceClickListener {
-                MaterialDialog(requireContext(), BottomSheet()).show {
+                materialDialog = MaterialDialog(requireContext(), BottomSheet()).show {
                     title(R.string.primary_color)
                     positiveButton(R.string.set)
                     colorChooser(initialSelection = BLUE,
@@ -120,7 +125,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
         accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor))
 
         accentColorPref.setOnPreferenceClickListener {
-            MaterialDialog(requireContext(), BottomSheet()).show {
+            materialDialog = MaterialDialog(requireContext(), BottomSheet()).show {
                 title(R.string.accent_color)
                 positiveButton(R.string.set)
                 colorChooser(colors = ACCENT_COLORS, allowCustomArgb = true, subColors = ACCENT_COLORS_SUB) { _, color ->

app/src/main/java/code/name/monkey/retromusic/views/FitSystemWindowsLayout.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.WindowInsets;
-import android.widget.FrameLayout;
-
-public class FitSystemWindowsLayout extends FrameLayout {
-    private boolean mFit = false;
-
-    public FitSystemWindowsLayout(final Context context) {
-        super(context);
-    }
-
-    public FitSystemWindowsLayout(final Context context, final AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public FitSystemWindowsLayout(final Context context, final AttributeSet attrs, final int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public boolean isFit() {
-        return mFit;
-    }
-
-    public void setFit(final boolean fit) {
-        if (mFit == fit) {
-            return;
-        }
-
-        mFit = fit;
-        requestApplyInsets();
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    protected boolean fitSystemWindows(final Rect insets) {
-        if (mFit) {
-            setPadding(
-                    insets.left,
-                    insets.top,
-                    insets.right,
-                    insets.bottom
-            );
-            return true;
-        } else {
-            setPadding(0, 0, 0, 0);
-            return false;
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
-    @Override
-    public WindowInsets onApplyWindowInsets(final WindowInsets insets) {
-        if (mFit) {
-            setPadding(
-                    insets.getSystemWindowInsetLeft(),
-                    insets.getSystemWindowInsetTop(),
-                    insets.getSystemWindowInsetRight(),
-                    insets.getSystemWindowInsetBottom()
-            );
-            return insets.consumeSystemWindowInsets();
-        } else {
-            setPadding(0, 0, 0, 0);
-            return insets;
-        }
-    }
-}

app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt

@@ -32,5 +32,6 @@ class RetroChip @JvmOverloads constructor(
         chipIcon?.setTintList(ColorStateList.valueOf(iconColor))
         setTextColor(iconColor)
         chipStrokeColor = ColorStateList.valueOf(dividerColor)
+
     }
 }

app/src/main/res/layout-land/activity_album.xml

@@ -24,7 +24,7 @@
                 android:scaleType="centerCrop"
                 android:transitionName="@string/transition_album_art" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar" />
         </FrameLayout>

app/src/main/res/layout-land/activity_album_tag_editor.xml

@@ -17,7 +17,7 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"

app/src/main/res/layout-land/activity_artist_details.xml

@@ -23,7 +23,7 @@
                 android:scaleType="centerCrop"
                 android:transitionName="@string/transition_album_art" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar" />
 

app/src/main/res/layout-land/activity_settings.xml

@@ -31,7 +31,7 @@
         app:elevation="0dp">
 
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"

app/src/main/res/layout-land/fragment_banner_home.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -81,12 +80,12 @@
                         app:cardUseCompatPadding="true"
                         app:layout_scrollFlags="scroll|enterAlways">
 
-                        <androidx.appcompat.widget.Toolbar
+                        <code.name.monkey.appthemehelper.common.views.ATEToolbar
                             android:id="@+id/toolbar"
                             style="@style/Toolbar"
                             app:title="@string/search_hint"
                             app:titleMarginStart="0dp"
-                            app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                             tools:ignore="UnusedAttribute" />
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

app/src/main/res/layout-land/fragment_blur.xml

@@ -27,70 +27,62 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_player_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <fragment
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal">
+                    android:layout_weight="1" />
 
-                    <fragment
+                <FrameLayout
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        tools:layout="@layout/fragment_player_album_cover" />
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_weight="0"
+                    tools:background="@color/md_red_A700">
 
-                    <fragment
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:id="@+id/playbackControlsFragment"
+                        android:id="@+id/playerToolbar"
-                        android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+                        style="@style/Toolbar"
-                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
-                        android:layout_height="match_parent"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        android:layout_weight="1" />
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-
+                </FrameLayout>
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        tools:background="@color/md_red_A700">
-
-                        <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:layout_height="48dp"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-
+    </LinearLayout>
-
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

app/src/main/res/layout-land/fragment_card_blur_player.xml

@@ -21,72 +21,68 @@
 
     <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">
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content">
-            android:orientation="vertical">
 
-            <FrameLayout
+            <include layout="@layout/status_bar" />
-                android:layout_width="match_parent"
+        </FrameLayout>
-                android:layout_height="wrap_content">
-
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:contentInsetLeft="0dp"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
-                    app:titleMargin="0dp"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
-            </FrameLayout>
-
-            <FrameLayout
-
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="64dp"
-                android:layout_marginEnd="64dp"
-                android:layout_weight="1">
-
-                <fragment
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </FrameLayout>
-
-        </LinearLayout>
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
+            android:layout_weight="0">
-            android:layout_marginStart="96dp"
+
-            android:layout_marginEnd="96dp">
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+        </FrameLayout>
+
+        <FrameLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="64dp"
+            android:layout_marginEnd="64dp"
+            android:layout_weight="1">
 
             <fragment
-                android:id="@+id/playbackControlsFragment"
+                android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content" />
-                tools:layout="@layout/fragment_card_blur_player_playback_controls" />
         </FrameLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp">
+
+        <fragment
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
+    </FrameLayout>
+
 </FrameLayout>

app/src/main/res/layout-land/fragment_card_player.xml

@@ -15,67 +15,61 @@
         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
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_close_white_24dp"
+                app:navigationIcon="@drawable/ic_close_white_24dp" />
+        </FrameLayout>
+
+        <Space
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_weight="1" />
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="64dp"
+            android:layout_marginEnd="64dp"
+            android:layout_marginBottom="8dp"
+            android:layout_weight="0"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playbackControlsFragment"
-
+                    android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
-            <FrameLayout
-
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
-            </FrameLayout>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                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"
-                app:cardUseCompatPadding="true">
-
-                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_card_player_playback_controls" />
+            </FrameLayout>
 
-                    <fragment
+        </androidx.cardview.widget.CardView>
-                        android:id="@+id/playbackControlsFragment"
+    </LinearLayout>
-                        android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_card_player_playback_controls" />
-                </FrameLayout>
-
-            </androidx.cardview.widget.CardView>
-        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 </FrameLayout>

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

@@ -15,7 +15,7 @@
 
         <include layout="@layout/status_bar" />
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/playerToolbar"
             style="@style/Toolbar"
             android:background="@android:color/transparent"

app/src/main/res/layout-land/fragment_color_player.xml

@@ -14,117 +14,112 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <androidx.cardview.widget.CardView
-            </FrameLayout>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="12dp"
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="8dp"
+                    app:cardPreventCornerOverlap="false"
+                    app:cardUseCompatPadding="true">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/playerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop" />
+
+                    <ScrollView
+                        android:id="@+id/lyricsContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/twenty_percent_black_overlay"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:id="@+id/lyricsView"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:lineSpacingExtra="4dp"
+                                android:lineSpacingMultiplier="1.5"
+                                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                                android:textColor="@color/md_white_1000" />
+                        </FrameLayout>
+                    </ScrollView>
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/expand"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom|end"
+                        android:padding="16dp"
+                        app:srcCompat="@drawable/ic_unfold_more_black_24dp"
+                        app:tint="@color/md_white_1000" />
+                </androidx.cardview.widget.CardView>
+
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
 
-                    <androidx.cardview.widget.CardView
+                    <fragment
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_margin="12dp"
+                        tools:layout="@layout/fragment_player_playback_controls" />
-                        app:cardCornerRadius="8dp"
+                </FrameLayout>
-                        app:cardElevation="8dp"
-                        app:cardPreventCornerOverlap="false"
-                        app:cardUseCompatPadding="true">
 
-                        <androidx.appcompat.widget.AppCompatImageView
+                <FrameLayout
-                            android:id="@+id/playerImage"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:scaleType="centerCrop" />
-
-                        <ScrollView
-                            android:id="@+id/lyricsContainer"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/twenty_percent_black_overlay"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-                            <FrameLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:padding="16dp">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:id="@+id/lyricsView"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:lineSpacingExtra="4dp"
-                                    android:lineSpacingMultiplier="1.5"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                                    android:textColor="@color/md_white_1000" />
-                            </FrameLayout>
-                        </ScrollView>
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/expand"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="bottom|end"
-                            android:padding="16dp"
-                            app:srcCompat="@drawable/ic_unfold_more_black_24dp"
-                            app:tint="@color/md_white_1000" />
-                    </androidx.cardview.widget.CardView>
-
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_weight="0">
 
-                    <FrameLayout
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:layout_width="match_parent"
+                        android:id="@+id/playerToolbar"
-                        android:layout_height="wrap_content"
+                        style="@style/Toolbar"
-                        android:layout_weight="1">
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                        <fragment
+                </FrameLayout>
-                            android:id="@+id/playbackControlsFragment"
-                            android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            tools:layout="@layout/fragment_player_playback_controls" />
-                    </FrameLayout>
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0">
-
-                        <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
+    </LinearLayout>
 
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

app/src/main/res/layout-land/fragment_flat_player.xml

@@ -15,68 +15,63 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
+
+                <fragment
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_player_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
 
-                    <fragment
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:id="@+id/playerAlbumCoverFragment"
+                        android:id="@+id/playerToolbar"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                        style="@style/Toolbar"
-                        android:layout_width="match_parent"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        android:layout_height="wrap_content"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                        tools:layout="@layout/fragment_player_album_cover" />
+                </FrameLayout>
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
-
+                <fragment
-                <LinearLayout
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_gravity="bottom"
-
+                    android:layout_weight="1"
-                    <FrameLayout
+                    tools:layout="@layout/fragment_flat_player_playback_controls" />
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0">
-
-                        <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
-
-                    <fragment
-                        android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="1"
-                        tools:layout="@layout/fragment_flat_player_playback_controls" />
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
 </FrameLayout>

app/src/main/res/layout-land/fragment_home.xml

@@ -53,12 +53,12 @@
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
 
-                <androidx.appcompat.widget.Toolbar
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
                     app:title="@string/search_hint"
                     app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                     tools:ignore="UnusedAttribute" />
             </com.google.android.material.card.MaterialCardView>
 

app/src/main/res/layout-land/fragment_material.xml

@@ -9,72 +9,67 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <fragment
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_album_cover" />
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_weight="1">
 
-                    <FrameLayout
+                    <fragment
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_weight="1">
+                        tools:layout="@layout/fragment_material_playback_controls" />
+                </FrameLayout>
 
-                        <fragment
+                <FrameLayout
-                            android:id="@+id/playbackControlsFragment"
+                    android:layout_width="match_parent"
-                            android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
+                    android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
+                    android:layout_weight="0">
-                            android:layout_height="match_parent"
-                            tools:layout="@layout/fragment_material_playback_controls" />
-                    </FrameLayout>
 
-                    <FrameLayout
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:layout_width="match_parent"
+                        android:id="@+id/playerToolbar"
-                        android:layout_height="wrap_content"
+                        style="@style/Toolbar"
-                        android:layout_weight="0">
+                        android:layout_gravity="bottom"
-
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        <androidx.appcompat.widget.Toolbar
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                            android:id="@+id/playerToolbar"
+                </FrameLayout>
-                            style="@style/Toolbar"
-                            android:layout_gravity="bottom"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
+
 </FrameLayout>

app/src/main/res/layout-land/fragment_plain_player.xml

@@ -10,107 +10,102 @@
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_player_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
-
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <fragment
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_player_album_cover" />
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_weight="0"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="16dp">
 
-                    <LinearLayout
+                    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                        android:id="@+id/playerTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0"
+                        android:ellipsize="marquee"
-                        android:orientation="vertical"
+                        android:focusable="true"
-                        android:paddingStart="16dp"
+                        android:focusableInTouchMode="true"
-                        android:paddingTop="8dp"
+                        android:freezesText="true"
-                        android:paddingEnd="16dp"
+                        android:marqueeRepeatLimit="marquee_forever"
-                        android:paddingBottom="16dp">
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textSize="24sp"
+                        android:textStyle="bold"
+                        tools:ignore="MissingPrefix"
+                        tools:text="Title" />
 
-                        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                            android:id="@+id/playerTitle"
+                        android:id="@+id/playerText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:ellipsize="marquee"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:freezesText="true"
-                            android:marqueeRepeatLimit="marquee_forever"
-                            android:scrollHorizontally="true"
-                            android:singleLine="true"
-                            android:textSize="24sp"
-                            android:textStyle="bold"
-                            tools:ignore="MissingPrefix"
-                            tools:text="Title" />
-
-                        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                            android:id="@+id/playerText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            tools:text="Text" />
-                    </LinearLayout>
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <fragment
-                            android:id="@+id/playbackControlsFragment"
-                            android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            tools:layout="@layout/fragment_plain_controls_fragment" />
-                    </FrameLayout>
-
-                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0">
+                        android:ellipsize="end"
-
+                        android:maxLines="1"
-                        <androidx.appcompat.widget.Toolbar
+                        tools:text="Text" />
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
                 </LinearLayout>
 
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <fragment
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:layout="@layout/fragment_plain_controls_fragment" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
+
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
             </LinearLayout>
+
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
+
 </FrameLayout>

app/src/main/res/layout-land/fragment_player.xml

@@ -15,69 +15,64 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_player_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <FrameLayout
+                    android:id="@+id/toolbar_container"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
 
-                    <fragment
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:id="@+id/playerAlbumCoverFragment"
+                        android:id="@+id/playerToolbar"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                        style="@style/Toolbar"
-                        android:layout_width="match_parent"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        android:layout_height="match_parent"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                        tools:layout="@layout/fragment_player_album_cover" />
+                </FrameLayout>
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
-                <LinearLayout
+                <fragment
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_gravity="bottom"
+                    android:layout_weight="1"
+                    tools:layout="@layout/fragment_player_playback_controls" />
 
-                    <FrameLayout
-                        android:id="@+id/toolbar_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0">
-
-                        <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
-                    </FrameLayout>
-
-                    <fragment
-                        android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="1"
-                        tools:layout="@layout/fragment_player_playback_controls" />
-
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
+
 </FrameLayout>

app/src/main/res/layout-land/fragment_simple_player.xml

@@ -16,68 +16,63 @@
 
     <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">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="horizontal">
 
-            <FrameLayout
+            <code.name.monkey.retromusic.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
+
+                <fragment
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_player_album_cover" />
+            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:paddingTop="8dp">
 
-                <code.name.monkey.retromusic.views.HeightFitSquareLayout
+                <fragment
-                    android:layout_width="match_parent"
+                    android:id="@+id/playbackControlsFragment"
-                    android:layout_height="match_parent">
+                    android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
-
-                    <fragment
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        tools:layout="@layout/fragment_player_album_cover" />
-                </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-
-                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical"
+                    android:layout_weight="1"
-                    android:paddingTop="8dp">
+                    tools:layout="@layout/fragment_simple_controls_fragment" />
 
-                    <fragment
+                <FrameLayout
-                        android:id="@+id/playbackControlsFragment"
+                    android:layout_width="match_parent"
-                        android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
+                    android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
+                    android:layout_weight="0">
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        tools:layout="@layout/fragment_simple_controls_fragment" />
 
-                    <FrameLayout
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                        android:layout_width="match_parent"
+                        android:id="@+id/playerToolbar"
-                        android:layout_height="wrap_content"
+                        style="@style/Toolbar"
-                        android:layout_weight="0">
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                        <androidx.appcompat.widget.Toolbar
+                </FrameLayout>
-                            android:id="@+id/playerToolbar"
-                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                    </FrameLayout>
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </LinearLayout>
+
 </FrameLayout>

app/src/main/res/layout-land/fragment_slide_player.xml

@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
-    android:orientation="vertical">
-
-    <code.name.monkey.retromusic.views.HeightFitSquareLayout
-        android:id="@+id/heightContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <code.name.monkey.retromusic.views.WidthFitSquareCardView
-            android:id="@+id/albumCoverContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            app:cardCornerRadius="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/playerImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/default_album_art" />
-
-            <FrameLayout
-                android:id="@+id/toolbarContainer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:elevation="10dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <include layout="@layout/shadow_statusbar_toolbar" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <include layout="@layout/status_bar" />
-                    </FrameLayout>
-
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:layout_gravity="bottom"
-                        android:navigationIcon="@drawable/ic_close_white_24dp"
-                        app:navigationIcon="@drawable/ic_close_white_24dp" />
-
-                </LinearLayout>
-            </FrameLayout>
-        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
-
-
-    </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/heightContainer"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <FrameLayout
-                android:id="@+id/frameLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
-
-            <LinearLayout
-                android:id="@+id/titleContainer"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/frameLayout">
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:ellipsize="marquee"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:freezesText="true"
-                    android:gravity="center"
-                    android:marqueeRepeatLimit="marquee_forever"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
-                    android:scrollHorizontally="true"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-                    android:textColor="?android:attr/textColorPrimary"
-                    tools:text="Title" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="4dp"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:id="@+id/progressContainer"
-                android:layout_width="match_parent"
-                android:layout_height="28dp"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/titleContainer">
-
-                <TextView
-                    android:id="@+id/songCurrentProgress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentLeft="true"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center_vertical|left|end"
-                    android:paddingLeft="8dp"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="12sp"
-                    tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                <TextView
-                    android:id="@+id/songTotalTime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentRight="true"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center_vertical|right|end"
-                    android:paddingRight="8dp"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="12sp"
-                    tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                <SeekBar
-                    android:id="@+id/progressSlider"
-                    style="@style/MusicProgressSlider"
-                    android:layout_height="wrap_content"
-                    android:layout_toLeftOf="@id/songTotalTime"
-                    android:layout_toRightOf="@id/songCurrentProgress"
-                    android:maxHeight="3dp"
-                    android:progressDrawable="@drawable/color_progress_seek"
-                    android:splitTrack="false"
-                    android:thumb="@drawable/switch_thumb_material"
-                    tools:ignore="RtlHardcoded,UnusedAttribute"
-                    tools:progress="20" />
-            </RelativeLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/playerMediaControllerContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layoutDirection="ltr"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/progressContainer"
-                tools:ignore="ContentDescription,UnusedAttribute"
-                tools:showIn="@layout/fragment_player_playback_controls">
-
-                <ImageButton
-                    android:id="@+id/repeatButton"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:background="?attr/roundSelector"
-                    android:padding="22dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/previousButton"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_repeat_white_24dp"
-                    tools:ignore="MissingPrefix"
-                    tools:tint="@color/md_black_1000" />
-
-                <ImageButton
-                    android:id="@+id/previousButton"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:background="?attr/roundSelector"
-                    android:padding="22dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/repeatButton"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-                    tools:ignore="MissingPrefix"
-                    tools:layout_editor_absoluteY="0dp"
-                    tools:tint="@color/md_black_1000" />
-
-                <ImageButton
-                    android:id="@+id/playPauseButton"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:layout_above="@id/title_container"
-                    android:background="?attr/roundSelector"
-                    android:padding="22dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/nextButton"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/previousButton"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_play_arrow_white_32dp"
-                    tools:layout_editor_absoluteY="0dp"
-                    tools:tint="@color/md_black_1000" />
-
-                <ImageButton
-                    android:id="@+id/nextButton"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:background="?attr/roundSelector"
-                    android:padding="22dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_skip_next_white_24dp"
-                    tools:ignore="MissingPrefix"
-                    tools:layout_editor_absoluteY="0dp"
-                    tools:tint="@color/md_black_1000" />
-
-
-                <ImageButton
-                    android:id="@+id/shuffleButton"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
-                    android:background="?attr/roundSelector"
-                    android:padding="22dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/nextButton"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_shuffle_white_24dp"
-                    tools:ignore="MissingPrefix"
-                    tools:layout_editor_absoluteY="0dp"
-                    tools:tint="@color/md_black_1000" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-            <FrameLayout
-                android:id="@+id/volumeFragmentContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/playerMediaControllerContainer"
-                tools:showIn="@layout/fragment_player_playback_controls">
-
-                <fragment
-                    android:id="@+id/volumeFragment"
-                    android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    tools:layout="@layout/fragment_volume" />
-            </FrameLayout>
-
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/volumeFragmentToggle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                app:constraint_referenced_ids="volumeFragmentContainer" />
-
-            <TextView
-                android:id="@+id/playerQueueSubHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="16dp"
-                android:text="@string/now_playing_queue"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/volumeFragmentContainer" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/playerQueueSubHeader" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.core.widget.NestedScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-land/pager_item.xml

@@ -42,20 +42,20 @@
         android:paddingTop="6dp"
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
-        android:textSize="13sp"
+        android:textAppearance="@style/TextViewNormal"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:textSize="14sp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 </LinearLayout>

app/src/main/res/layout-xlarge-land/activity_album.xml

@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>

app/src/main/res/layout-xlarge-land/activity_artist_details.xml

@@ -31,7 +31,7 @@
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin" />

app/src/main/res/layout-xlarge-land/fragment_banner_home.xml

@@ -82,12 +82,12 @@
                         app:cardUseCompatPadding="true"
                         app:layout_scrollFlags="scroll|enterAlways">
 
-                        <androidx.appcompat.widget.Toolbar
+                        <code.name.monkey.appthemehelper.common.views.ATEToolbar
                             android:id="@+id/toolbar"
                             style="@style/Toolbar"
                             app:title="@string/search_hint"
                             app:titleMarginStart="0dp"
-                            app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                             tools:ignore="UnusedAttribute" />
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

app/src/main/res/layout-xlarge-land/fragment_blur.xml

@@ -30,7 +30,7 @@
         android:id="@+id/playerContent"
         android:layout_width="400dp"
         android:layout_height="0dp"
-        android:layout_above="@id/toolbar_container"
+        android:layout_above="@id/playerToolbar"
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
     </LinearLayout>
 
 
-    <androidx.appcompat.widget.Toolbar
+    <code.name.monkey.appthemehelper.common.views.ATEToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
         android:layout_height="48dp"

app/src/main/res/layout-xlarge-land/fragment_home.xml

@@ -54,12 +54,12 @@
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
 
-                <androidx.appcompat.widget.Toolbar
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
                     app:title="@string/search_hint"
                     app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                     tools:ignore="UnusedAttribute" />
             </com.google.android.material.card.MaterialCardView>
         </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout-xlarge-land/fragment_player.xml

@@ -14,56 +14,51 @@
 
     <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">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:id="@+id/container"
+            android:layout_width="400dp"
             android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
             android:orientation="vertical">
 
-            <LinearLayout
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:id="@+id/container"
+                android:layout_width="match_parent"
-                android:layout_width="400dp"
+                android:layout_height="wrap_content">
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <fragment
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_player_album_cover" />
-                </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
                 <fragment
-                    android:id="@+id/playbackControlsFragment"
+                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_player_playback_controls" />
+                    tools:layout="@layout/fragment_player_album_cover" />
-            </LinearLayout>
+            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <FrameLayout
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0">
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                <androidx.appcompat.widget.Toolbar
+        </FrameLayout>
-                    android:id="@+id/playerToolbar"
+    </LinearLayout>
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-            </FrameLayout>
-        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </RelativeLayout>

app/src/main/res/layout-xlarge-land/pager_item.xml

@@ -42,20 +42,20 @@
         android:paddingTop="6dp"
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
-        android:textSize="13sp"
+        android:textAppearance="@style/TextViewNormal"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:textSize="14sp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 </LinearLayout>

app/src/main/res/layout-xlarge/abs_playlists.xml

@@ -69,7 +69,7 @@
                 app:iconBackgroundColor="@color/md_blue_A700"
                 app:srcCompat="@drawable/ic_access_time_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -95,7 +95,7 @@
                 app:iconBackgroundColor="@color/md_red_A700"
                 app:srcCompat="@drawable/ic_library_add_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -121,7 +121,7 @@
                 app:iconBackgroundColor="@color/md_deep_purple_A700"
                 app:srcCompat="@drawable/ic_trending_up_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -147,7 +147,7 @@
                 app:iconBackgroundColor="@color/md_green_A700"
                 app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -156,11 +156,4 @@
 
         </LinearLayout>
     </LinearLayout>
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_margin="12dp"
-        android:background="?attr/dividerColor" />
 </LinearLayout>

app/src/main/res/layout-xlarge/activity_album.xml

@@ -33,7 +33,7 @@
                 android:layout_width="320dp"
                 android:layout_height="wrap_content" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin"

app/src/main/res/layout-xlarge/activity_artist_content.xml

@@ -6,59 +6,59 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/playAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="4dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
-            android:text="@string/action_play"
+            android:text="@string/action_play_all"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_play_arrow_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:backgroundTint="@color/md_grey_900" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/shuffleAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
             android:text="@string/shuffle"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_shuffle_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintBottom_toBottomOf="@+id/playAction"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playAction"
+            app:layout_constraintTop_toTopOf="@+id/playAction"
             tools:backgroundTint="@color/md_grey_900" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/biographyTitle"
-        style="@style/TextAppearance.MaterialComponents.Subtitle2"
+        style="@style/SubTitleTextAppearance"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="24dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="24dp"
-        android:paddingBottom="12dp"
         android:text="@string/biography"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         android:visibility="gone"
-        tools:ignore="MissingPrefix" />
+        tools:visibility="visible" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/biographyText"

app/src/main/res/layout-xlarge/activity_artist_details.xml

@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin" />

app/src/main/res/layout-xlarge/activity_user_info.xml

@@ -12,7 +12,7 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"

app/src/main/res/layout-xlarge/fragment_banner_home.xml

@@ -82,12 +82,12 @@
                         app:cardUseCompatPadding="true"
                         app:layout_scrollFlags="scroll|enterAlways">
 
-                        <androidx.appcompat.widget.Toolbar
+                        <code.name.monkey.appthemehelper.common.views.ATEToolbar
                             android:id="@+id/toolbar"
                             style="@style/Toolbar"
                             app:title="@string/search_hint"
                             app:titleMarginStart="0dp"
-                            app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                             tools:ignore="UnusedAttribute" />
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

app/src/main/res/layout-xlarge/fragment_blur.xml

@@ -25,65 +25,59 @@
         android:layout_height="match_parent"
         android:background="@drawable/shadow_up" />
 
-    <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:layout_gravity="center_horizontal"
+        android:layout_marginStart="64dp"
+        android:layout_marginEnd="64dp"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
-            android:layout_marginStart="64dp"
+            tools:background="@color/md_white_1000">
-            android:layout_marginEnd="64dp"
-            android:orientation="vertical">
 
-            <FrameLayout
+            <fragment
-                android:layout_width="match_parent"
+                android:id="@+id/playbackControlsFragment"
-                android:layout_height="wrap_content">
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
-
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal">
-
-                <fragment
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
+                tools:layout="@layout/fragment_player_playback_controls" />
-                tools:background="@color/md_white_1000">
+        </FrameLayout>
 
-                <fragment
+        <FrameLayout
-                    android:id="@+id/playbackControlsFragment"
+            android:layout_width="match_parent"
-                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+            android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
+            android:layout_weight="0"
-                    android:layout_height="match_parent"
+            tools:background="@color/md_red_A700">
-                    tools:layout="@layout/fragment_player_playback_controls" />
-            </FrameLayout>
 
-            <FrameLayout
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
-                android:layout_width="match_parent"
+                android:id="@+id/playerToolbar"
-                android:layout_height="wrap_content"
+                style="@style/Toolbar"
-                android:layout_weight="0"
+                android:layout_height="48dp"
-                tools:background="@color/md_red_A700">
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                <androidx.appcompat.widget.Toolbar
+        </FrameLayout>
-                    android:id="@+id/playerToolbar"
+    </LinearLayout>
-                    style="@style/Toolbar"
-                    android:layout_height="48dp"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
-            </FrameLayout>
-        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

app/src/main/res/layout-xlarge/fragment_home.xml

@@ -55,12 +55,12 @@
                 app:strokeColor="?dividerColor"
                 app:strokeWidth="1dp">
 
-                <androidx.appcompat.widget.Toolbar
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
                     app:title="@string/search_hint"
                     app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                     tools:ignore="UnusedAttribute" />
             </com.google.android.material.card.MaterialCardView>
         </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout-xlarge/fragment_mini_player.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.FitSystemWindowsLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
@@ -25,7 +25,7 @@
             app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
             tools:ignore="ContentDescription" />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/miniPlayerTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -38,7 +38,8 @@
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="true"
-            android:singleLine="true" />
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewNormal" />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/actionPrevious"
@@ -86,5 +87,4 @@
         android:layout_width="match_parent"
         android:layout_height="3dp"
         android:progress="20" />
-
+</FrameLayout>
-</code.name.monkey.retromusic.views.FitSystemWindowsLayout>

app/src/main/res/layout-xlarge/fragment_player.xml

@@ -14,62 +14,57 @@
 
     <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:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content">
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
 
-            <FrameLayout
+            <include layout="@layout/status_bar" />
-                android:layout_width="match_parent"
+        </FrameLayout>
-                android:layout_height="wrap_content">
 
-                <include layout="@layout/status_bar" />
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            </FrameLayout>
+            android:id="@+id/album_cover_container"
+            android:layout_width="520dp"
+            android:layout_height="wrap_content">
 
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            <fragment
-                android:id="@+id/album_cover_container"
+                android:id="@+id/playerAlbumCoverFragment"
-                android:layout_width="520dp"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_height="wrap_content">
-
-                <fragment
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:layout="@layout/fragment_player_album_cover" />
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-            <FrameLayout
-                android:layout_width="520dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <fragment
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_player_playback_controls" />
-            </FrameLayout>
-
-            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0">
+                tools:layout="@layout/fragment_player_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-                <androidx.appcompat.widget.Toolbar
+        <FrameLayout
-                    android:id="@+id/playerToolbar"
+            android:layout_width="520dp"
-                    style="@style/Toolbar"
+            android:layout_height="wrap_content"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            android:layout_weight="1">
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+
-            </FrameLayout>
+            <fragment
-        </LinearLayout>
+                android:id="@+id/playbackControlsFragment"
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+                android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
 </FrameLayout>

app/src/main/res/layout-xlarge/item_artist.xml

@@ -1,7 +1,6 @@
 <?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="156dp"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
@@ -15,18 +14,16 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:civ_border="false"
+            app:civ_border="false" />
-            />
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:gravity="center"
         android:maxLines="1"
-        android:paddingBottom="16dp"
+        android:paddingTop="12dp"
-        android:paddingTop="16dp"
+        android:textAppearance="@style/TextViewNormal" />
-        android:textColor="?android:attr/textColorPrimary" />
 </LinearLayout>

app/src/main/res/layout-xlarge/item_image.xml

@@ -1,40 +1,39 @@
 <?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:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="wrap_content"
+    android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
+    android:layout_height="wrap_content"
-  android:orientation="vertical">
+    android:orientation="vertical">
 
     <code.name.monkey.retromusic.views.WidthFitSquareLayout
-      android:layout_width="156dp"
+        android:layout_width="156dp"
-      android:layout_height="match_parent"
+        android:layout_height="match_parent"
-      android:orientation="vertical">
+        android:orientation="vertical">
 
         <androidx.cardview.widget.CardView
-          android:id="@+id/image_container_card"
+            android:id="@+id/image_container_card"
-          android:layout_width="match_parent"
+            android:layout_width="match_parent"
-          android:layout_height="match_parent"
+            android:layout_height="match_parent"
-          android:layout_margin="8dp"
+            android:layout_margin="8dp"
-          app:cardCornerRadius="6dp"
+            app:cardCornerRadius="6dp"
-          app:cardElevation="4dp"
+            app:cardElevation="4dp"
-          app:cardPreventCornerOverlap="true">
+            app:cardPreventCornerOverlap="true">
 
             <androidx.appcompat.widget.AppCompatImageView
-              android:id="@+id/image"
+                android:id="@+id/image"
-              android:layout_width="match_parent"
+                android:layout_width="match_parent"
-              android:layout_height="match_parent"
+                android:layout_height="match_parent"
-              android:scaleType="centerCrop"
+                android:scaleType="centerCrop" />
-              />
         </androidx.cardview.widget.CardView>
 
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-    <TextView
+    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-      android:id="@+id/title"
+        android:id="@+id/title"
-      android:layout_width="match_parent"
+        android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+        android:layout_height="wrap_content"
-      android:padding="8dp"
+        android:ellipsize="end"
-      android:ellipsize="end"
+        android:maxLines="1"
-      android:maxLines="1"
+        android:padding="10dp"
-      android:textColor="?android:attr/textColorPrimary"/>
+        android:textAppearance="@style/TextViewNormal" />
 </LinearLayout>

app/src/main/res/layout-xlarge/pager_item.xml

@@ -42,20 +42,20 @@
         android:paddingTop="6dp"
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
-        android:textSize="13sp"
+        android:textAppearance="@style/TextViewNormal"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:textSize="14sp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 </LinearLayout>

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

@@ -43,41 +43,14 @@
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                 android:id="@+id/titleWelcome"
-                style="@style/TextAppearance.MaterialComponents.Headline5"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="0dp"
+                android:textAppearance="@style/TextViewHeadline5"
                 tools:text="@string/app_name" />
         </LinearLayout>
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/material_design_outline"
-        android:backgroundTint="?dividerColor"
-        android:gravity="center_vertical"
-        android:paddingStart="12dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="6dp"
-        android:visibility="gone">
-
-        <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/sectionIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            app:srcCompat="@drawable/ic_person_white_24dp" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/sectionTitle"
-            style="@style/SubTitleTextAppearance"
-            android:padding="0dp"
-            android:text="@string/for_you" />
-
-    </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -100,13 +73,12 @@
                 app:iconBackgroundColor="@color/md_blue_500"
                 app:srcCompat="@drawable/ic_access_time_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingTop="8dp"
-                android:text="@string/history"
+                android:text="@string/history" />
-                app:fontFamily="@font/circular" />
 
         </LinearLayout>
 
@@ -125,7 +97,7 @@
                 app:iconBackgroundColor="@color/md_red_500"
                 app:srcCompat="@drawable/ic_library_add_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -149,7 +121,7 @@
                 app:iconBackgroundColor="@color/md_deep_purple_500"
                 app:srcCompat="@drawable/ic_trending_up_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -173,7 +145,7 @@
                 app:iconBackgroundColor="@color/md_green_500"
                 app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"

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

@@ -12,7 +12,7 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"

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

@@ -38,7 +38,7 @@
 
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin" />
@@ -87,15 +87,14 @@
 
                         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                             android:id="@+id/albumTitle"
-                            style="@style/TextAppearance.MaterialComponents.Headline6"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:maxLines="2"
+                            android:textAppearance="@style/TextViewHeadline6"
                             tools:ignore="MissingPrefix" />
 
                         <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                             android:id="@+id/albumText"
-                            style="@style/TextAppearance.MaterialComponents.Subtitle2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
@@ -106,6 +105,7 @@
                             android:marqueeRepeatLimit="marquee_forever"
                             android:scrollHorizontally="true"
                             android:singleLine="true"
+                            android:textAppearance="@style/TextViewSubtitle2"
                             tools:ignore="MissingPrefix"
                             tools:text="Title" />
 

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

@@ -6,44 +6,52 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/playAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
             android:text="@string/action_play"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_play_arrow_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:backgroundTint="@color/md_grey_900" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/shuffleAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
             android:text="@string/shuffle"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_shuffle_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintBottom_toBottomOf="@+id/playAction"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playAction"
+            app:layout_constraintTop_toTopOf="@+id/playAction"
             tools:backgroundTint="@color/md_grey_900" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/songTitle"

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

@@ -61,7 +61,7 @@
                     <include layout="@layout/status_bar" />
                 </FrameLayout>
 
-                <androidx.appcompat.widget.Toolbar
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
                     app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"

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

@@ -6,44 +6,52 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/playAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
-            android:text="@string/action_play"
+            android:text="@string/action_play_all"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_play_arrow_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:backgroundTint="@color/md_grey_900" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/shuffleAction"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:layout_weight="1"
             android:padding="10dp"
             android:text="@string/shuffle"
             android:textAllCaps="false"
+            android:textAppearance="@style/TextViewNormal"
             app:cornerRadius="6dp"
             app:icon="@drawable/ic_shuffle_white_24dp"
             app:iconGravity="textStart"
+            app:layout_constraintBottom_toBottomOf="@+id/playAction"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/playAction"
+            app:layout_constraintTop_toTopOf="@+id/playAction"
             tools:backgroundTint="@color/md_grey_900" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/biographyTitle"

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

@@ -39,7 +39,7 @@
 
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin" />

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             android:layout_width="match_parent"

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

@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin"

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"

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

@@ -21,7 +21,7 @@
             app:titleEnabled="false">
 
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin"

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

@@ -50,7 +50,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="TODO"
-                android:scaleType="centerCrop" />
+                android:scaleType="centerCrop"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
+
         </com.google.android.material.card.MaterialCardView>
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 

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

@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/player_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/player_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" />
-</FrameLayout>

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

@@ -21,7 +21,7 @@
             app:titleEnabled="false">
 
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:layout_collapseMode="pin"
@@ -51,14 +51,13 @@
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <TextView
+    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
         android:id="@android:id/empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:fontFamily="sans-serif-light"
         android:text="@string/empty"
-        android:textColor="?android:textColorSecondary"
+        android:textAppearance="@style/TextViewNormal"
         android:visibility="gone" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -68,6 +67,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:text="@string/clear_playing_queue"
+        android:textAppearance="@style/TextViewHeadline6"
         app:icon="@drawable/ic_clear_all_black_24dp" />
 
 

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

@@ -41,9 +41,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
 
-                    <androidx.appcompat.widget.Toolbar
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar"
+                        app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
                         app:layout_collapseMode="pin"
                         app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
 
@@ -74,13 +75,13 @@
                 android:layout_height="96dp"
                 app:srcCompat="@drawable/ic_disc_full_black_24dp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/emptyText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="@string/playlist_empty_text"
-                android:textColor="?android:textColorSecondary"
+                android:textAppearance="@style/TextViewNormal"
                 android:visibility="gone"
                 tools:visibility="visible" />
         </LinearLayout>

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

@@ -35,7 +35,7 @@
                 app:titleEnabled="false">
 
 
-                <androidx.appcompat.widget.Toolbar
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
                     app:layout_collapseMode="pin"

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

@@ -49,7 +49,8 @@
                     android:background="@null"
                     android:hint="@string/action_search"
                     android:inputType="text|textAutoComplete"
-                    android:padding="12dp">
+                    android:padding="12dp"
+                    android:textAppearance="@style/TextViewSubtitle1">
 
                     <requestFocus />
                 </com.google.android.material.textfield.TextInputEditText>
@@ -71,7 +72,7 @@
         android:layout_height="wrap_content"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@android:id/empty"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -79,8 +80,7 @@
             android:paddingTop="48dp"
             android:paddingBottom="48dp"
             android:text="@string/no_results"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textAppearance="@style/TextViewHeadline6"
-            android:textSize="16sp"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -101,5 +101,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:text="@string/keyboard"
+        android:textAppearance="@style/TextViewHeadline6"
         app:icon="@drawable/ic_keyboard_white_24dp" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -20,12 +20,12 @@
         app:elevation="0dp">
 
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-            tools:title="@string/app_name" />
+            tools:title="@string/action_settings" />
 
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -32,7 +32,7 @@
                     android:visibility="gone" />
             </FrameLayout>
 
-            <androidx.appcompat.widget.Toolbar
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"

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

@@ -13,7 +13,7 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"

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

@@ -13,7 +13,7 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <androidx.appcompat.widget.Toolbar
+        <code.name.monkey.appthemehelper.common.views.ATEToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"

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

@@ -22,7 +22,7 @@
             android:paddingTop="24dp"
             android:paddingRight="16dp"
             android:text="@string/device_info"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" />
+            android:textAppearance="@style/TextViewOverline" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/airTextDeviceInfo"

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

@@ -16,7 +16,7 @@
         <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
             style="@style/SubTitleTextAppearance"
             android:text="@string/credit_title"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" />
+            android:textAppearance="@style/TextViewOverline" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"

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

@@ -17,8 +17,7 @@
         <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
             style="@style/SubTitleTextAppearance"
             android:text="@string/others"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" />
+            android:textAppearance="@style/TextViewOverline" />
-
 
         <LinearLayout
             android:id="@+id/changelog"
@@ -36,18 +35,17 @@
 
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                style="@style/TextAppearance.MaterialComponents.Subtitle1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/changelog"
-                app:fontFamily="@font/circular_std_medium" />
+                android:textAppearance="@style/TextViewSubtitle1" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                style="@style/TextAppearance.MaterialComponents.Body2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:alpha="0.85"
-                android:text="@string/changelog_summary" />
+                android:text="@string/changelog_summary"
+                android:textAppearance="@style/TextViewBody2" />
         </LinearLayout>
 
         <LinearLayout
@@ -64,20 +62,18 @@
             android:paddingBottom="8dp"
             tools:ignore="PrivateResource">
 
-
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                style="@style/TextAppearance.MaterialComponents.Subtitle1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/pref_title_open_source_licences"
-                app:fontFamily="@font/circular_std_medium" />
+                android:textAppearance="@style/TextViewSubtitle1" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                style="@style/TextAppearance.MaterialComponents.Body2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:alpha="0.85"
-                android:text="@string/pref_summary_open_source_licences" />
+                android:text="@string/pref_summary_open_source_licences"
+                android:textAppearance="@style/TextViewBody2" />
         </LinearLayout>
 
         <LinearLayout
@@ -93,24 +89,22 @@
             android:paddingBottom="8dp"
             tools:ignore="PrivateResource">
 
-
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                style="@style/TextAppearance.MaterialComponents.Subtitle1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/version"
-                app:fontFamily="@font/circular_std_medium" />
+                android:textAppearance="@style/TextViewSubtitle1" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/appVersion"
-                style="@style/TextAppearance.MaterialComponents.Body2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:alpha="0.85"
-                android:text="0.0.0" />
+                android:text="0.0.0"
+                android:textAppearance="@style/TextViewBody2" />
         </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
             android:id="@+id/madeText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -118,8 +112,6 @@
             android:gravity="center"
             android:padding="16dp"
             android:text="@string/made_with_love"
-            android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
+            android:textAppearance="@style/TextViewBody1" />
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>

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

@@ -17,7 +17,7 @@
         <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
             style="@style/SubTitleTextAppearance"
             android:text="@string/support_development"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" />
+            android:textAppearance="@style/TextViewOverline" />
 
         <LinearLayout
             android:id="@+id/appGithub"
@@ -47,21 +47,19 @@
                 android:paddingEnd="12dp"
                 android:paddingBottom="8dp">
 
-
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/circular"
                     android:text="@string/git_hub"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/git_hub_summary" />
+                    android:text="@string/git_hub_summary"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 
@@ -93,20 +91,18 @@
                 android:paddingEnd="12dp"
                 android:paddingBottom="8dp">
 
-
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/translate"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/translate_community" />
+                    android:text="@string/translate_community"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 
@@ -140,14 +136,13 @@
 
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/rate_app"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
+                    android:textAppearance="@style/TextViewBody2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
@@ -185,14 +180,13 @@
 
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/donate"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
+                    android:textAppearance="@style/TextViewBody2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
@@ -229,14 +223,13 @@
                 android:paddingBottom="8dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/report_bug"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
+                    android:textAppearance="@style/TextViewBody2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
@@ -276,12 +269,11 @@
 
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/action_share"
-                    android:textColor="@color/md_white_1000"
+                    android:textAppearance="@style/TextViewSubtitle1"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textColor="@color/md_white_1000" />
 
             </LinearLayout>
         </LinearLayout>
@@ -317,12 +309,11 @@
                 android:paddingBottom="8dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/faq"
-                    android:textColor="@color/md_white_1000"
+                    android:textAppearance="@style/TextViewSubtitle1"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textColor="@color/md_white_1000" />
 
             </LinearLayout>
         </LinearLayout>

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

@@ -17,7 +17,7 @@
         <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
             style="@style/SubTitleTextAppearance"
             android:text="@string/social"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" />
+            android:textAppearance="@style/TextViewOverline" />
 
         <LinearLayout
             android:id="@+id/pinterestLink"
@@ -48,18 +48,17 @@
 
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/pinterest_page"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/pinterest_page_summary" />
+                    android:text="@string/pinterest_page_summary"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 
@@ -92,18 +91,17 @@
 
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/instagram_page"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/instagram_page_summary" />
+                    android:text="@string/instagram_page_summary"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 
@@ -135,18 +133,17 @@
                 android:paddingBottom="8dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/twitter_page"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/twitter_page_summary" />
+                    android:text="@string/twitter_page_summary"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 
@@ -178,18 +175,17 @@
                 android:paddingBottom="8dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/telegram_group"
-                    app:fontFamily="@font/circular_std_medium" />
+                    android:textAppearance="@style/TextViewSubtitle1" />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    style="@style/TextAppearance.MaterialComponents.Body2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:alpha="0.85"
-                    android:text="@string/telegram_group_summary" />
+                    android:text="@string/telegram_group_summary"
+                    android:textAppearance="@style/TextViewBody2" />
             </LinearLayout>
         </LinearLayout>
 

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

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView 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/container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    app:cardCornerRadius="26dp"
-    app:cardUseCompatPadding="true"
-    tools:backgroundTint="@color/md_red_400">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="14dp"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            app:tint="@color/md_black_1000" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/shuffle_text"
-            style="@style/TextAppearance.MaterialComponents.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="@string/action_shuffle_all"
-            android:textColor="@color/md_black_1000" />
-    </LinearLayout>
-</com.google.android.material.card.MaterialCardView>

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

@@ -14,12 +14,12 @@
 
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
             android:id="@+id/bannerTitle"
-            style="@style/TextAppearance.MaterialComponents.Headline6"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:padding="16dp"
-            android:text="@string/add_playlist_title" />
+            android:text="@string/add_playlist_title"
+            android:textAppearance="@style/TextViewHeadline6" />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/actionAddPlaylist"

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

@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@@ -21,6 +22,7 @@
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@@ -30,6 +32,7 @@
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@@ -39,6 +42,7 @@
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@@ -57,6 +61,7 @@
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
@@ -67,6 +72,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
 </LinearLayout>

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

@@ -21,6 +21,7 @@
             android:background="@null"
             android:hint="@string/playlist_name_empty"
             android:inputType="textPersonName|textCapWords|text"
-            android:padding="16dp" />
+            android:padding="16dp"
+            android:textAppearance="@style/TextViewNormal" />
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>

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

@@ -7,10 +7,10 @@
 
     <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
         android:id="@+id/timerDisplay"
-        style="@style/TextAppearance.MaterialComponents.Headline6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:textAppearance="@style/TextViewHeadline6" />
 
 
     <androidx.appcompat.widget.AppCompatSeekBar
@@ -24,12 +24,12 @@
         android:thumb="@drawable/switch_thumb_material"
         tools:progress="20" />
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/shouldFinishLastSong"
-        style="@style/TextAppearance.MaterialComponents.Subtitle1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="@string/finish_last_song" />
+        android:text="@string/finish_last_song"
+        android:textAppearance="@style/TextViewSubtitle1" />
 
 </LinearLayout>

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

@@ -9,107 +9,101 @@
 
     <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
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/toolbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_weight="1">
 
-            <FrameLayout
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent" />
-
-                <include layout="@layout/status_bar" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/toolbar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:contentInsetLeft="0dp"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
-                    app:titleMargin="0dp"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-            </FrameLayout>
 
             <FrameLayout
+                android:id="@+id/player_lyrics"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:alpha="0"
+                android:clipToPadding="false"
+                android:elevation="20dp"
+                android:padding="16dp"
+                android:visibility="gone"
+                tools:visibility="visible">
 
-                <fragment
+                <TextView
-                    android:id="@+id/playerAlbumCoverFragment"
+                    android:id="@+id/player_lyrics_line1"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:shadowColor="@color/md_black_1000"
+                    android:shadowRadius="4"
+                    android:textAlignment="center"
+                    android:textColor="@color/md_white_1000"
+                    android:textSize="22sp"
+                    android:visibility="gone" />
 
-                <FrameLayout
+                <TextView
-                    android:id="@+id/player_lyrics"
+                    android:id="@+id/player_lyrics_line2"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:alpha="0"
+                    android:layout_gravity="center_vertical"
-                    android:clipToPadding="false"
+                    android:shadowColor="@color/md_black_1000"
-                    android:elevation="20dp"
+                    android:shadowRadius="4"
-                    android:padding="16dp"
+                    android:textAlignment="center"
-                    android:visibility="gone"
+                    android:textColor="@color/md_white_1000"
-                    tools:visibility="visible">
+                    android:textSize="22sp" />
-
-                    <TextView
-                        android:id="@+id/player_lyrics_line1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:shadowColor="@color/md_black_1000"
-                        android:shadowRadius="4"
-                        android:textAlignment="center"
-                        android:textColor="@color/md_white_1000"
-                        android:textSize="22sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/player_lyrics_line2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:shadowColor="@color/md_black_1000"
-                        android:shadowRadius="4"
-                        android:textAlignment="center"
-                        android:textColor="@color/md_white_1000"
-                        android:textSize="22sp" />
-
-                </FrameLayout>
 
             </FrameLayout>
 
-            <FrameLayout
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-                android:layout_weight="0">
+                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
+        </FrameLayout>
+    </LinearLayout>
 
-                <fragment
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_adaptive_player_playback_controls" />
-            </FrameLayout>
-        </LinearLayout>
-
-
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

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

@@ -24,11 +24,10 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
@@ -42,7 +41,7 @@
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />

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

@@ -77,12 +77,12 @@
                     app:layout_scrollFlags="scroll|enterAlways"
                     app:strokeColor="?dividerColor">
 
-                    <androidx.appcompat.widget.Toolbar
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar"
                         app:title="@string/search_hint"
                         app:titleMarginStart="0dp"
-                        app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                        app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                         tools:ignore="UnusedAttribute" />
                 </com.google.android.material.card.MaterialCardView>
             </LinearLayout>

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

@@ -23,61 +23,55 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <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">
 
-        <LinearLayout
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_weight="1"
+            tools:background="@color/md_white_1000">
 
-            <FrameLayout
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent" />
+        </FrameLayout>
 
-                <include layout="@layout/status_bar" />
+        <FrameLayout
-            </FrameLayout>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
 
-
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/playerToolbar"
-                android:layout_width="match_parent"
+                style="@style/Toolbar"
-                android:layout_height="wrap_content"
+                android:layout_height="48dp"
-                android:layout_gravity="center_horizontal">
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-                <fragment
+        </FrameLayout>
-                    android:id="@+id/playerAlbumCoverFragment"
+    </LinearLayout>
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                tools:background="@color/md_white_1000">
-
-                <fragment
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:layout_height="48dp"
-                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-            </FrameLayout>
-        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

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

@@ -55,7 +55,7 @@
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
@@ -69,7 +69,7 @@
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
@@ -86,7 +86,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/progressContainer">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -101,10 +101,10 @@
             android:paddingEnd="16dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+            android:textAppearance="@style/TextViewHeadline6"
             tools:text="@string/bug_report_summary" />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
             android:paddingEnd="16dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="@style/TextViewNormal"
             tools:text="@string/bug_report_summary" />
     </LinearLayout>
 

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

@@ -21,73 +21,69 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
+
-        android:id="@+id/safeArea"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content">
-                android:orientation="vertical">
 
-                <FrameLayout
+                <include layout="@layout/status_bar" />
-                    android:layout_width="match_parent"
+            </FrameLayout>
-                    android:layout_height="wrap_content">
-
-                    <include layout="@layout/status_bar" />
-                </FrameLayout>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0">
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/playerToolbar"
-                        style="@style/Toolbar"
-                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        app:contentInsetLeft="0dp"
-                        app:contentInsetStart="0dp"
-                        app:contentInsetStartWithNavigation="0dp"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
-                        app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
-                        app:titleMargin="0dp"
-                        app:titleMarginStart="0dp"
-                        app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
-                </FrameLayout>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="1">
-
-                    <fragment
-                        android:id="@+id/playerAlbumCoverFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </FrameLayout>
-
-            </LinearLayout>
 
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom">
+                android:layout_weight="0">
+
+                <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:contentInsetLeft="0dp"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                    app:titleMargin="0dp"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1">
 
                 <fragment
-                    android:id="@+id/playbackControlsFragment"
+                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content" />
-                    tools:layout="@layout/fragment_card_blur_player_playback_controls" />
             </FrameLayout>
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_card_blur_player_playback_controls" />
         </FrameLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
+    </FrameLayout>
+
 </FrameLayout>

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

@@ -15,39 +15,6 @@
         android:orientation="vertical"
         tools:ignore="MissingPrefix">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:freezesText="true"
-                android:gravity="center"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                tools:text="@string/pref_title_user_info" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:alpha="0.5"
-                android:gravity="center_horizontal"
-                android:maxLines="1"
-                tools:text="@string/action_share" />
-
-        </LinearLayout>
-
         <include layout="@layout/volume_controls" />
 
         <include layout="@layout/media_button" />

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

@@ -8,7 +8,6 @@
     android:clickable="true"
     android:focusable="true">
 
-
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
@@ -16,64 +15,56 @@
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
-
+    <LinearLayout
-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/safeArea"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/toolbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+
+            <code.name.monkey.appthemehelper.common.views.ATEToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_close_white_24dp"
+                app:navigationIcon="@drawable/ic_close_white_24dp" />
+        </FrameLayout>
+
+        <Space
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_weight="1" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:layout_weight="0"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/status_bar" />
+                <fragment
-            </FrameLayout>
+                    android:id="@+id/playbackControlsFragment"
-
+                    android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
-            <FrameLayout
-                android:id="@+id/toolbar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
-            </FrameLayout>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:layout_weight="0"
-                app:cardBackgroundColor="?android:windowBackground"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
-
+                    tools:layout="@layout/fragment_card_player_playback_controls" />
-                    <fragment
+            </FrameLayout>
-                        android:id="@+id/playbackControlsFragment"
+        </com.google.android.material.card.MaterialCardView>
-                        android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+    </LinearLayout>
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/fragment_card_player_playback_controls" />
-                </FrameLayout>
-            </com.google.android.material.card.MaterialCardView>
-        </LinearLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>

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

@@ -22,7 +22,7 @@
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
@@ -34,7 +34,7 @@
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textAppearance="@style/TextViewOverline"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
@@ -99,16 +99,16 @@
                 android:layout_marginBottom="2dp"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textSize="16sp" />
+                android:textAppearance="@style/TextViewSubtitle1" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/songText"
-                style="@style/TextAppearance.AppCompat.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:ellipsize="end"
-                android:maxLines="1" />
+                android:maxLines="1"
+                android:textAppearance="@style/TextViewBody1" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -73,7 +73,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/status_bar_padding" />
 
-                    <androidx.appcompat.widget.Toolbar
+                    <code.name.monkey.appthemehelper.common.views.ATEToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
                         android:background="@android:color/transparent"