WIP pure Follow system

app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/Theme.RetroMusic.FollowSystem">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />

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

@@ -16,7 +16,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 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.MaterialUtil
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
@@ -192,14 +191,16 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
         val themeColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
         else ThemeStore.accentColor(this)
 
-        songTitle.setTextColor(themeColor)
+        songTitle.setTextColor(ThemeStore.accentColor(this))
-        moreTitle.setTextColor(themeColor)
+        moreTitle.setTextColor(ThemeStore.accentColor(this))
 
-        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
+        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
-        else ATHUtil.resolveColor(this, R.attr.cardBackgroundColor)
+            color
+        else
+            ATHUtil.resolveColor(this, R.attr.cardBackgroundColor)
 
-        MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
+        //MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
-        MaterialUtil.setTint(button = playAction, color = buttonColor)
+        //MaterialUtil.setTint(button = playAction, color = buttonColor)
 
         toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
         setSupportActionBar(toolbar)

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

@@ -2,15 +2,22 @@ package code.name.monkey.retromusic.activities.base
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
-import android.graphics.*
+import android.graphics.Color
+import android.graphics.Rect
 import android.os.Bundle
-import android.view.*
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.fragments.*
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
@@ -28,7 +35,8 @@ import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
 import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
 import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.views.BottomNavigationBarTinted
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.card.MaterialCardView
@@ -87,7 +95,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 
         bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel)
 
-		val themeColor = ATHUtil.resolveColor(this, R.attr.colorPrimary, Color.GRAY)
+        val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
         dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
     }
 

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

@@ -2,15 +2,24 @@ package code.name.monkey.retromusic.activities.base
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.os.*
+import android.os.Bundle
-import android.view.*
+import android.os.Handler
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowManager
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.*
+import code.name.monkey.appthemehelper.ATH
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.ThemeManager
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
@@ -20,8 +29,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         setTheme(ThemeManager.getThemeResValue(this))
         hideStatusBar()
         super.onCreate(savedInstanceState)
-
-		changeBackgroundShape()
         setImmersiveFullscreen()
         registerSystemUiVisibility()
         toggleScreenOn()
@@ -58,15 +65,10 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     }
 
     private fun changeBackgroundShape() {
-		var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners) ContextCompat.getDrawable(
+        var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners)
-				this,
+            ContextCompat.getDrawable(this, R.drawable.round_window)
-				R.drawable.round_window
-		)
         else ContextCompat.getDrawable(this, R.drawable.square_window)
-		background = TintHelper.createTintedDrawable(
+        background = TintHelper.createTintedDrawable(background, ATHUtil.resolveColor(this, android.R.attr.windowBackground))
-				background,
-				ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		)
         window.setBackgroundDrawable(background)
     }
 
@@ -107,7 +109,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     fun setStatusbarColorAuto() {
         // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
-		setStatusbarColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+        //setStatusbarColor(ATHUtil.resolveColor(this, android.R.attr.windowBackground))
     }
 
     open fun setTaskDescriptionColor(@ColorInt color: Int) {

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

@@ -1,20 +1,25 @@
 package code.name.monkey.retromusic.adapter
 
 import android.util.DisplayMetrics
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Home
+import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.textview.MaterialTextView
 
 class HomeAdapter(
         private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics
@@ -33,11 +38,7 @@ class HomeAdapter(
             RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout)
             PLAYLISTS -> PlaylistViewHolder(layout)
             else -> {
-				AlbumViewHolder(
+                AlbumViewHolder(LayoutInflater.from(activity).inflate(R.layout.metal_section_recycler_view, parent, false))
-						LayoutInflater.from(activity).inflate(
-								R.layout.metal_section_recycler_view, parent, false
-						)
-				)
             }
         }
     }
@@ -119,13 +120,9 @@ class HomeAdapter(
                     show()
                     adapter = AlbumFullWidthAdapter(activity, list, displayMetrics)
                 }
-				titleContainer.show()
                 title.text = activity.getString(titleRes)
-				text.text = activity.getString(subtitleRes)
             }
         }
-
-
     }
 
     inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
@@ -145,9 +142,7 @@ class HomeAdapter(
                     )
                     adapter = artistAdapter
                 }
-				titleContainer.show()
                 title.text = activity.getString(titleRes)
-				text.text = activity.getString(subtitleRes)
             }
         }
     }
@@ -168,9 +163,7 @@ class HomeAdapter(
                         adapter = songAdapter
 
                     }
-					titleContainer.show()
                     title.text = activity.getString(titleRes)
-					text.text = activity.getString(subtitleRes)
                 }
             }
         }
@@ -178,9 +171,7 @@ class HomeAdapter(
 
     open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
-		val titleContainer: View = itemView.findViewById(R.id.titleContainer)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
-		val text: MaterialTextView = itemView.findViewById(R.id.text)
     }
 }
 

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

@@ -2,14 +2,17 @@ package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
 import android.content.res.ColorStateList
-import android.view.*
+import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
 import com.google.android.material.button.MaterialButton
 import java.util.*
 
@@ -34,11 +37,7 @@ open class PlaylistSongAdapter(
         if (holder.itemViewType == OFFSET_ITEM) {
 
             val buttonColor = RetroColorUtil.toolbarColor(activity)
-			val textColor = MaterialValueHelper.getPrimaryTextColor(
+            val textColor = MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(buttonColor))
-					activity, ColorUtil.isColorLight(
-					buttonColor
-			)
-			)
             val viewHolder = holder as ViewHolder
 
             viewHolder.playAction?.let {

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

@@ -2,17 +2,25 @@ package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
 import android.graphics.drawable.Drawable
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.*
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.glide.*
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.helper.*
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.menu.*
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SortOrder
+import code.name.monkey.retromusic.helper.menu.SongMenuHelper
+import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
@@ -79,20 +87,8 @@ open class SongAdapter(
 	private fun setColors(color: Int, holder: ViewHolder) {
 		if (holder.paletteColorContainer != null) {
 			holder.paletteColorContainer?.setBackgroundColor(color)
-			holder.title?.setTextColor(
+			//holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
-					MaterialValueHelper.getPrimaryTextColor(
+			//holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
-							activity, ColorUtil.isColorLight(
-							color
-					)
-					)
-			)
-			holder.text?.setTextColor(
-					MaterialValueHelper.getSecondaryTextColor(
-							activity, ColorUtil.isColorLight(
-							color
-					)
-					)
-			)
 		}
 	}
 

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityEx.kt

@@ -26,7 +26,6 @@ fun AppCompatActivity.applyToolbar(toolbar: Toolbar) {
         setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
         ToolbarContentTintHelper.colorBackButton(toolbar)
         setBackgroundColor(ATHUtil.resolveColor(this@applyToolbar, R.attr.colorPrimary))
-
     }
     setSupportActionBar(toolbar)
 }

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

@@ -49,18 +49,16 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
         setUpMiniPlayer()
 
         if (RetroUtil.isTablet()) {
-            actionNext.visibility = View.VISIBLE
+            actionNext?.visibility = View.VISIBLE
-            actionPrevious.visibility = View.VISIBLE
+            actionPrevious?.visibility = View.VISIBLE
             actionPlayingQueue.visibility = View.VISIBLE
         } else {
-            actionNext.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
             actionPlayingQueue.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.GONE else View.VISIBLE
-            actionPrevious.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
         }
 
         actionPlayingQueue.setOnClickListener(this)
-        actionNext.setOnClickListener(this)
+        actionNext?.setOnClickListener(this)
-        actionPrevious.setOnClickListener(this)
+        actionPrevious?.setOnClickListener(this)
 
     }
 

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

@@ -1,12 +1,16 @@
 package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
-import androidx.annotation.*
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.ViewUtil
 import com.google.android.material.appbar.AppBarLayout
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.*
@@ -19,10 +23,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
     override fun onCreateView(
             inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
-		val view = inflater.inflate(
+        return inflater.inflate(R.layout.fragment_main_activity_recycler_view, container, false)
-				R.layout.fragment_main_activity_recycler_view, container, false
-		);
-		return view
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -35,9 +36,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
 
     private fun setUpRecyclerView() {
         if (recyclerView is FastScrollRecyclerView) {
-			ViewUtil.setUpFastScrollRecyclerViewColor(
+            ViewUtil.setUpFastScrollRecyclerViewColor(requireActivity(), recyclerView as FastScrollRecyclerView)
-					requireActivity(), recyclerView as FastScrollRecyclerView
-			)
         }
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
@@ -93,8 +92,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
                 container.paddingLeft,
                 container.paddingTop,
                 container.paddingRight,
-				libraryFragment.totalAppBarScrollingRange + i
+                libraryFragment.totalAppBarScrollingRange + i)
-		)
     }
 
     override fun onQueueChanged() {

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

@@ -26,11 +26,11 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
         mainActivity.setBottomBarVisibility(View.VISIBLE)
     }
 
-    private fun setStatusbarColor(view: View, color: Int) {
+    private fun setStatusBarColor(view: View, color: Int) {
         val statusBar = view.findViewById<View>(R.id.status_bar)
         if (statusBar != null) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                statusBar.setBackgroundColor(color)
+                //statusBar.setBackgroundColor(color)
                 mainActivity.setLightStatusbarAuto(color)
             } else {
                 statusBar.setBackgroundColor(color)
@@ -38,13 +38,13 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
         }
     }
 
-    fun setStatusbarColorAuto(view: View) {
+    fun setStatusBarColorAuto(view: View) {
-        val colorPrimary = ATHUtil.resolveColor(requireContext(), R.attr.colorPrimary)
+        val colorPrimary = ATHUtil.resolveColor(requireContext(), android.R.attr.windowBackground)
         // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
         if (VersionUtils.hasMarshmallow()) {
-            setStatusbarColor(view, colorPrimary)
+            setStatusBarColor(view, colorPrimary)
         } else {
-            setStatusbarColor(view, ColorUtil.darkenColor(colorPrimary))
+            setStatusBarColor(view, ColorUtil.darkenColor(colorPrimary))
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java

@@ -108,7 +108,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setStatusbarColorAuto(view);
+        setStatusBarColorAuto(view);
         setupToolbar();
         inflateFragment();
     }
@@ -149,7 +149,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         getMainActivity().setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
         ToolbarContentTintHelper.colorBackButton(toolbar);
-        toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
+        //toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
     }
 
     private Fragment getCurrentFragment() {

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt

@@ -131,4 +131,4 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
             return fragment
         }
     }
-}// Required empty public constructor
+}

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java

@@ -221,7 +221,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        setStatusbarColorAuto(view);
+        setStatusBarColorAuto(view);
         setUpAppbarColor();
         setUpBreadCrumbs();
         setUpRecyclerView();

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt

@@ -80,7 +80,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
             NavigationUtil.goToUserInfo(requireActivity(), options)
         }
         if (!PreferenceUtil.getInstance(requireContext()).isHomeBanner)
-            setStatusbarColorAuto(view)
+            setStatusBarColorAuto(view)
 
         lastAdded.setOnClickListener {
             NavigationUtil.goToPlaylistNew(requireActivity(), LastAddedPlaylist(requireActivity()))

app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt

@@ -14,17 +14,17 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.*
 import kotlinx.android.synthetic.main.media_button.*
-import kotlinx.android.synthetic.main.player_time.*
+
 
 class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
@@ -33,7 +33,6 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
     private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)

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

@@ -40,7 +40,7 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
         NavigationUtil.goToProVersion(requireActivity())
     }
 
-    internal fun setSummary(preference: Preference, value: Any) {
+    internal fun setSummary(preference: Preference, value: Any?) {
         val stringValue = value.toString()
         if (preference is ListPreference) {
             val index = preference.findIndexOfValue(stringValue)
@@ -52,10 +52,12 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
 
     abstract fun invalidateSettings()
 
-    protected fun setSummary(preference: Preference) {
+    protected fun setSummary(preference: Preference?) {
-        setSummary(preference, PreferenceManager
+        preference?.let {
-                .getDefaultSharedPreferences(preference.context)
+            setSummary(it, PreferenceManager
-                .getString(preference.key, "")!!)
+                    .getDefaultSharedPreferences(it.context)
+                    .getString(it.key, ""))
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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

@@ -37,7 +37,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
             R.id.generalSettings -> inflateFragment(ThemeSettingsFragment(), R.string.general_settings_title)
             R.id.audioSettings -> inflateFragment(AudioSettings(), R.string.pref_header_audio)
             R.id.nowPlayingSettings -> inflateFragment(NowPlayingSettingsFragment(), R.string.now_playing)
-            R.id.personalizeSettings -> inflateFragment(PersonaizeSettingsFragment(), R.string.personalize)
+            R.id.personalizeSettings -> inflateFragment(PersonalizeSettingsFragment(), R.string.personalize)
             R.id.imageSettings -> inflateFragment(ImageSettingFragment(), R.string.pref_header_images)
             R.id.notificationSettings -> inflateFragment(NotificationSettingsFragment(), R.string.notification)
             R.id.otherSettings -> inflateFragment(OtherSettingsFragment(), R.string.others)

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

@@ -19,23 +19,14 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 
 
-class PersonaizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+class PersonalizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     override fun invalidateSettings() {
-        val cornerWindow: TwoStatePreference = findPreference("corner_window")!!
+
-        cornerWindow.setOnPreferenceChangeListener { _, newValue ->
-            if (newValue as Boolean && !App.isProVersion()) {
-                showProToastAndNavigate(activity!!.getString(R.string.pref_title_round_corners))
-                return@setOnPreferenceChangeListener false
-            }
-            requireActivity().recreate()
-            return@setOnPreferenceChangeListener true
-        }
         val toggleFullScreen: TwoStatePreference = findPreference("toggle_full_screen")!!
         toggleFullScreen.setOnPreferenceChangeListener { _, _ ->
             requireActivity().recreate()
@@ -45,7 +36,6 @@ class PersonaizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSh
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_ui)
-        addPreferencesFromResource(R.xml.pref_window)
         addPreferencesFromResource(R.xml.pref_lockscreen)
     }
 

app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt

@@ -15,7 +15,7 @@ object ThemeManager {
     @StyleRes
     fun getThemeResValue(context: Context): Int = when (PreferenceUtil.getInstance(context).generalThemeValue) {
         "light" -> R.style.Theme_RetroMusic_Light
-        "auto" -> if (isSystemDarkModeEnabled(context)) R.style.Theme_RetroMusic else R.style.Theme_RetroMusic_Light
+        "auto" ->  R.style.Theme_RetroMusic_FollowSystem
         "black" -> R.style.Theme_RetroMusic_Black
         else -> R.style.Theme_RetroMusic
         /**

app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt

@@ -14,19 +14,26 @@
 
 package code.name.monkey.retromusic.util
 
-import android.animation.*
+import android.animation.Animator
+import android.animation.ArgbEvaluator
+import android.animation.ObjectAnimator
 import android.content.Context
-import android.content.res.*
+import android.content.res.ColorStateList
-import android.graphics.*
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.view.View
 import android.view.animation.PathInterpolator
-import android.widget.*
+import android.widget.ProgressBar
+import android.widget.SeekBar
 import androidx.annotation.ColorInt
 import androidx.core.view.ViewCompat
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 
@@ -56,14 +63,8 @@ object ViewUtil {
         progress.setColorFilter(newColor, PorterDuff.Mode.SRC_IN)
 
         val background = ld.findDrawableByLayerId(android.R.id.background)
-		val primaryColor = ATHUtil.resolveColor(progressSlider.context, R.attr.colorPrimary)
+        val primaryColor = ATHUtil.resolveColor(progressSlider.context, android.R.attr.windowBackground)
-		background.setColorFilter(
+        background.setColorFilter(MaterialValueHelper.getPrimaryDisabledTextColor(progressSlider.context, ColorUtil.isColorLight(primaryColor)), PorterDuff.Mode.SRC_IN)
-				MaterialValueHelper.getPrimaryDisabledTextColor(
-						progressSlider.context, ColorUtil.isColorLight(
-						primaryColor
-				)
-				), PorterDuff.Mode.SRC_IN
-		)
 
         val secondaryProgress = ld.findDrawableByLayerId(android.R.id.secondaryProgress)
         secondaryProgress?.setColorFilter(
@@ -106,23 +107,10 @@ object ViewUtil {
             accentColor: Int = ThemeStore.accentColor(context)
     ) {
         recyclerView.setPopupBgColor(accentColor)
-		recyclerView.setPopupTextColor(
+        recyclerView.setPopupTextColor(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(accentColor)))
-				MaterialValueHelper.getPrimaryTextColor(
-						context, ColorUtil.isColorLight(
-						accentColor
-				)
-				)
-		)
         recyclerView.setThumbColor(accentColor)
         recyclerView.setTrackColor(Color.TRANSPARENT)
-		recyclerView.setTrackColor(
+        recyclerView.setTrackColor(ColorUtil.withAlpha(ATHUtil.resolveColor(context, R.attr.colorControlNormal), 0.12f))
-				ColorUtil.withAlpha(
-						ATHUtil.resolveColor(
-								context, R.attr.colorControlNormal
-						), 0.12f
-				)
-		)
-
     }
 
     fun convertDpToPixel(dp: Float, resources: Resources): Float {

app/src/main/res/drawable-v21/rect_selector.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/rect_selector_strong.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ate_control_normal_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/round_selector.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/round_selector_dark.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_dark">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable/bottom_navigation_item_background.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="8dp" />
-    <solid android:color="?colorPrimary" />
+    <solid android:color="?attr/colorSurface" />
 </shape>

app/src/main/res/drawable/circle_progress.xml

@@ -19,7 +19,7 @@
             android:thickness="3dp"
             android:type="sweep"
             android:useLevel="false">
-            <solid android:color="?colorOnSecondary" />
+            <solid android:color="?android:attr/textColorSecondary" />
         </shape>
     </item>
     <item android:id="@android:id/progress">
@@ -28,7 +28,7 @@
             android:thickness="3dp"
             android:type="sweep"
             android:useLevel="true">
-            <solid android:color="?colorAccent" />
+            <solid android:color="?attr/colorAccent" />
 
         </shape>
     </item>

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

@@ -11,7 +11,7 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="156dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView

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

@@ -11,7 +11,7 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="256dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView

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

@@ -29,6 +29,6 @@
         android:maxLines="1"
         android:paddingTop="12dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         tools:text="Name" />
 </LinearLayout>

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

@@ -11,7 +11,7 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="196dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView

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

@@ -114,7 +114,6 @@
             android:gravity="center"
             android:paddingTop="8dp"
             android:text="@string/last_added"
-            android:textColor="?colorOnSecondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/v2"
@@ -152,7 +151,6 @@
             android:gravity="center"
             android:paddingTop="8dp"
             android:text="@string/my_top_tracks"
-            android:textColor="?colorOnSecondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/v3"
@@ -190,7 +188,6 @@
             android:gravity="center"
             android:paddingTop="8dp"
             android:text="@string/shuffle"
-            android:textColor="?colorOnSecondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/v4"

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

@@ -8,7 +8,6 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?colorPrimary"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar

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

@@ -20,6 +20,7 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
+            android:background="?attr/colorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:liftOnScroll="true">
@@ -32,6 +33,7 @@
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
+                    android:background="?attr/colorPrimary"
                     app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                     app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 

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

@@ -240,8 +240,7 @@
         android:text="@string/save"
         app:cornerRadius="25dp"
         app:icon="@drawable/ic_save_white_24dp"
-        app:iconGravity="textStart"
+        app:iconGravity="textStart" />
-        tools:backgroundTint="@color/md_red_400" />
 
     <ProgressBar
         android:id="@+id/progressBar"

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

@@ -13,7 +13,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -24,7 +24,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -35,7 +35,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -46,7 +46,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -57,7 +57,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -68,7 +68,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -80,7 +80,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 
 </LinearLayout>

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

@@ -145,6 +145,12 @@
 
     </RelativeLayout>
 
-    <include layout="@layout/volume_controls" />
+    <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" />
 
 </LinearLayout>

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

@@ -15,11 +15,48 @@
         android:orientation="vertical"
         tools:ignore="MissingPrefix">
 
-        <include layout="@layout/volume_controls" />
+        <FrameLayout
+            android:id="@+id/volumeFragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp" />
 
         <include layout="@layout/media_button" />
 
-        <include layout="@layout/player_time" />
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/songCurrentProgress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:textAppearance="@style/TextViewOverline"
+                android:textStyle="bold"
+                tools:text="22.00" />
+
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/songTotalTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:textAppearance="@style/TextViewOverline"
+                android:textStyle="bold"
+                tools:text="22.00" />
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/progressSlider"

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

@@ -93,5 +93,11 @@
 
     <include layout="@layout/media_button" />
 
-    <include layout="@layout/volume_controls" />
+    <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" />
 </LinearLayout>

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

@@ -37,7 +37,7 @@
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?colorPrimary"
+            android:background="@android:color/transparent"
             app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
@@ -48,7 +48,6 @@
                 android:layout_marginTop="@dimen/toolbar_margin_vertical"
                 android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
                 android:layout_marginBottom="@dimen/toolbar_margin_vertical"
-                app:cardBackgroundColor="?colorSurface"
                 app:cardCornerRadius="8dp"
                 app:cardUseCompatPadding="true"
                 app:layout_scrollFlags="scroll|enterAlways">

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

@@ -40,7 +40,7 @@
             android:layout_gravity="center"
             android:text="@string/empty"
             android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?colorOnSecondary"
+            android:textColor="?attr/colorOnSecondary"
             tools:visibility="visible" />
     </LinearLayout>
 </FrameLayout>

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

@@ -5,7 +5,7 @@
     android:id="@+id/miniPlayerContent"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="?colorSecondary"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     tools:ignore="UnusedAttribute">
@@ -26,9 +26,8 @@
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
             app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
-            app:tint="?colorOnSecondary"
+            app:tint="?attr/colorControlNormal"
-            tools:ignore="ContentDescription"
+            tools:ignore="ContentDescription" />
-            tools:tint="?colorOnSurface" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/miniPlayerTitle"
@@ -45,23 +44,13 @@
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textAppearance="@style/TextViewNormal"
-            android:textColor="?colorOnSurface"
+            android:textColor="?android:attr/textColorPrimary"
             tools:text="@tools:sample/lorem/random" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/actionPrevious"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:background="?roundSelector"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            app:tint="?colorOnSecondary" />
-
         <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_gravity="center_vertical">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/miniPlayerPlayPauseButton"
@@ -71,7 +60,7 @@
                 android:background="?roundSelector"
                 android:scaleType="center"
                 app:srcCompat="@drawable/ic_pause_white_24dp"
-                app:tint="?colorOnSecondary"
+                app:tint="?attr/colorControlNormal"
                 tools:ignore="ContentDescription" />
 
             <ProgressBar
@@ -79,26 +68,13 @@
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="44dp"
                 android:layout_height="44dp"
-                android:rotation="270"
                 android:layout_gravity="center"
-                android:progressTint="?colorAccent"
                 android:indeterminate="false"
                 android:progressDrawable="@drawable/circle_progress"
+                android:rotation="270"
                 tools:progress="80" />
         </FrameLayout>
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/actionNext"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:background="?roundSelector"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            app:tint="?colorOnSecondary"
-            tools:tint="?colorOnSecondary" />
-
-
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/actionPlayingQueue"
             android:layout_width="40dp"
@@ -107,10 +83,7 @@
             android:background="?roundSelector"
             android:padding="6dp"
             app:srcCompat="@drawable/ic_playlist_play_white_24dp"
-            app:tint="?colorOnSecondary"
+            app:tint="?attr/colorControlNormal" />
-            tools:tint="?colorOnSecondary" />
 
     </LinearLayout>
-
-
 </FrameLayout>

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

@@ -91,7 +91,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textAppearance="@style/TextViewBody2"
-        android:textColor="?colorOnSecondary"
+        android:textColor="?attr/colorOnSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/imageContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/imageContainer"

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

@@ -19,7 +19,7 @@
         android:background="?roundSelector"
         android:padding="8dp"
         app:srcCompat="@drawable/ic_volume_down_white_24dp"
-        app:tint="?colorOnBackground" />
+        app:tint="?attr/colorControlNormal" />
 
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/volumeSeekBar"
@@ -31,7 +31,7 @@
         android:maxHeight="2dp"
         android:progressDrawable="@drawable/color_progress_seek"
         tools:progress="20"
-        tools:progressTint="?colorControlNormal" />
+        tools:progressTint="?attr/colorControlNormal" />
 
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -42,5 +42,5 @@
         android:background="?roundSelector"
         android:padding="8dp"
         app:srcCompat="@drawable/ic_volume_up_white_24dp"
-        app:tint="?colorOnBackground" />
+        app:tint="?attr/colorControlNormal" />
 </LinearLayout>

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

@@ -33,7 +33,7 @@
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 </LinearLayout>

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

@@ -28,6 +28,6 @@
         android:gravity="center"
         android:maxLines="1"
         android:paddingTop="12dp"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         tools:text="Name" />
 </LinearLayout>

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

@@ -33,7 +33,6 @@
                 android:maxLines="1"
                 android:padding="8dp"
                 android:textAppearance="@style/TextViewNormal"
-                android:textColor="?colorOnPrimary"
                 tools:text="@string/home" />
         </FrameLayout>
     </LinearLayout>

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

@@ -52,6 +52,7 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
                 tools:text="@string/bug_report_summary" />
 
@@ -61,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="4dp"
                 android:singleLine="true"
-                android:textAppearance="@style/TextViewBody2"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="@string/bug_report_summary" />
 
         </LinearLayout>

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

@@ -19,7 +19,7 @@
         android:layout_gravity="center_vertical|start"
         android:visibility="gone"
         app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
-        app:tint="?colorOnBackground"
+        app:tint="?attr/colorControlNormal"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
 
@@ -80,7 +80,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="@style/TextViewSubtitle1"
-            android:textColor="?colorOnPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             tools:text="Song name" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -89,7 +89,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="?colorOnBackground"
+            android:textColor="?android:attr/textColorSecondary"
             tools:text="Song artist name " />
     </LinearLayout>
 
@@ -98,6 +98,6 @@
         style="@style/OverFlowButton"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
-        app:tint="?colorOnBackground" />
+        app:tint="?attr/colorControlNormal" />
 
 </LinearLayout>

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

@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:padding="14dp"
-        app:tint="?colorOnBackground"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_folder_white_24dp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -41,6 +41,6 @@
         android:layout_weight="1"
         android:text="@string/folders"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?attr/colorOnPrimary"
         android:textSize="16sp" />
 </LinearLayout>

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

@@ -85,7 +85,7 @@
             style="@style/OverFlowButton"
             android:layout_gravity="center_vertical"
             android:layout_weight="0"
-            app:tint="?colorOnBackground" />
+            app:tint="?attr/colorControlNormal" />
 
     </LinearLayout>
 </FrameLayout>

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

@@ -14,8 +14,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_weight="0"
-        android:paddingEnd="8dp"
         android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -27,10 +27,10 @@
             android:fontFeatureSettings="onum"
             android:gravity="center"
             android:maxLines="1"
-            tools:text="@tools:sample/date/hhmm"
             android:minHeight="40dp"
             android:textAppearance="@style/TextViewNormal"
-            android:textColor="?colorOnSecondary" />
+            android:textColor="?attr/colorOnSecondary"
+            tools:text="@tools:sample/date/hhmm" />
     </FrameLayout>
 
 
@@ -55,7 +55,7 @@
         android:layout_weight="0"
         android:fontFeatureSettings="onum"
         android:padding="4dp"
-        android:textColor="?colorOnSecondary"
+        android:textColor="?attr/colorOnSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/menu"
         app:layout_constraintTop_toTopOf="parent"
@@ -72,6 +72,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSecondary"
+        app:tint="?attr/colorControlNormal"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSurface"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -32,7 +32,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSurface"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSurface"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSurface"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -29,7 +29,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?colorOnSurface"
+        app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -8,8 +8,7 @@
     android:layoutDirection="ltr"
     android:paddingStart="4dp"
     android:paddingEnd="4dp"
-    tools:ignore="ContentDescription,UnusedAttribute"
+    tools:ignore="ContentDescription,UnusedAttribute">
-    tools:showIn="@layout/fragment_player_playback_controls">
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/previousButton"

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

@@ -7,57 +7,17 @@
     android:orientation="vertical"
     android:paddingBottom="12dp">
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp">
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="16dp"
         android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextViewCaption"
-                android:visibility="gone"
-                tools:text="@tools:sample/full_names" />
-        </LinearLayout>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/arrow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="16dp"
-            android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
+        tools:text="@tools:sample/full_names" />
-            app:tint="?colorOnPrimary" />
-    </LinearLayout>
 
     <code.name.monkey.retromusic.views.MetalRecyclerViewPager
         android:id="@+id/recyclerView"
@@ -68,6 +28,6 @@
         app:itemMargin="28dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        app:layout_constraintTop_toBottomOf="@+id/title"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="172dp"
         android:layout_margin="8dp"
-        app:cardCornerRadius="12dp">
+        app:cardCornerRadius="16dp">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp">
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:textAppearance="@style/TextViewOverline"
-        android:textStyle="bold"
-        tools:text="22.00" />
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:textAppearance="@style/TextViewOverline"
-        android:textStyle="bold"
-        tools:text="22.00" />
-</LinearLayout>

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

@@ -19,19 +19,16 @@
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:foreground="?attr/rectSelector"
+    android:foreground="?rectSelector"
-    android:minHeight="@dimen/md_listitem_height"
     android:orientation="horizontal"
     android:paddingStart="16dp"
-    android:paddingLeft="16dp"
+    android:paddingEnd="0dp"
-    android:paddingEnd="16dp"
-    android:paddingRight="16dp"
     tools:gravity="start|center_vertical">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@null"
         android:clickable="false"
         android:focusable="false"
@@ -51,21 +48,21 @@
         android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
         android:singleLine="true"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/md_listitem_textsize"
         tools:text="Item" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="end|center_vertical"
         android:clickable="false"
         android:focusable="false"
-        android:minHeight="@dimen/md_listitem_height"
+        android:padding="16dp"
         android:tintMode="src_in"
         app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
-        app:tint="?colorOnSecondary"
+        app:tint="?attr/colorControlNormal"
         tools:ignore="ContentDescription" />
 
 </LinearLayout>

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

@@ -7,57 +7,19 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="16dp"
         android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextViewCaption"
-                android:visibility="gone"
-                tools:text="@tools:sample/full_names" />
-        </LinearLayout>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/arrow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="16dp"
-            android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
+        tools:text="@tools:sample/full_names" />
-            app:tint="?colorOnPrimary" />
+
-    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
@@ -67,7 +29,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        app:layout_constraintTop_toBottomOf="@+id/title"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         app:behavior_hideable="false"
         app:behavior_peekHeight="0dp"
-        app:cardBackgroundColor="?colorSecondary"
+        app:cardBackgroundColor="?attr/colorSurface"
         app:cardCornerRadius="0dp"
         app:cardUseCompatPadding="false"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
@@ -51,7 +51,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="?colorSecondary"
+        android:background="?attr/colorSurface"
         android:elevation="0dp"
         android:visibility="gone"
         app:itemBackground="@drawable/bottom_navigation_item_background"

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    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/src/main/res/values-v21/styles.xml

@@ -18,6 +18,12 @@
         <item name="android:textViewStyle">@style/TextViewStyleIm</item>
     </style>
 
+    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+    </style>
+
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />
 
     <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />

app/src/main/res/values/styles.xml

@@ -6,6 +6,8 @@
 
     <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" />
 
+    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive" />
+
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
 
     <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />

app/src/main/res/values/styles_parents.xml

@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+
+        <item name="windowActionBarOverlay">true</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
+
+        <item name="roundSelector">@drawable/round_selector</item>
+        <item name="rectSelector">@drawable/rect_selector</item>
+        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
+    </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
 
@@ -170,11 +190,13 @@
 
     <style name="MaterialButtonTheme" parent="Widget.MaterialComponents.Button">
         <item name="cornerRadius">8dp</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconTint">?attr/colorControlNormal</item>
+        <item name="backgroundTint">?attr/colorSurface</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textAppearance">@style/TextViewNormal</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:paddingTop">@dimen/button_padding_vertical</item>
         <item name="android:paddingBottom">@dimen/button_padding_vertical</item>
-        <item name="iconGravity">textStart</item>
-        <item name="backgroundTint">?colorSurface</item>
     </style>
 </resources>

app/src/main/res/xml/pref_lockscreen.xml

@@ -1,32 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
-        android:layout="@layout/preference_category_title"
-        android:title="@string/pref_header_lockscreen">
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="true"
-            android:key="album_art_on_lockscreen"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_album_art_on_lockscreen"
-            android:title="@string/pref_title_album_art_on_lockscreen"
-            app:enableCopying="true" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:dependency="album_art_on_lockscreen"
-            android:key="blurred_album_art"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_blurred_album_art"
-            android:title="@string/pref_title_blurred_album_art"
-            app:enableCopying="true" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="lock_screen"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_lock_screen"
-            android:title="@string/pref_title_lock_screen"
-            app:enableCopying="true" />
-    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/pref_ui.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         app:title="@string/grid_style_label">
@@ -49,6 +48,8 @@
             android:summary="@string/pref_summary_home_banner"
             android:title="@string/pref_title_home_banner" />
 
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_library">
@@ -72,7 +73,45 @@
             android:title="@string/pref_title_tab_text_mode"
             app:enableCopying="true" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
+        android:layout="@layout/preference_category_title"
+        android:title="@string/window">
 
 
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="toggle_full_screen"
+            android:layout="@layout/list_item_view_switch"
+            android:summary="@string/pref_summary_toggle_full_screen"
+            android:title="@string/pref_title_toggle_full_screen"
+            app:icon="@drawable/ic_cellphone_white_24dp" />
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
+        android:layout="@layout/preference_category_title"
+        android:title="@string/pref_header_lockscreen">
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="true"
+            android:key="album_art_on_lockscreen"
+            android:layout="@layout/list_item_view_switch"
+            android:summary="@string/pref_summary_album_art_on_lockscreen"
+            android:title="@string/pref_title_album_art_on_lockscreen"
+            app:enableCopying="true" />
+
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:dependency="album_art_on_lockscreen"
+            android:key="blurred_album_art"
+            android:layout="@layout/list_item_view_switch"
+            android:summary="@string/pref_summary_blurred_album_art"
+            android:title="@string/pref_title_blurred_album_art"
+            app:enableCopying="true" />
+
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="lock_screen"
+            android:layout="@layout/list_item_view_switch"
+            android:summary="@string/pref_summary_lock_screen"
+            android:title="@string/pref_title_lock_screen"
+            app:enableCopying="true" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/pref_window.xml

@@ -1,25 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
-        android:layout="@layout/preference_category_title"
-        android:title="@string/window">
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="corner_window"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_round_corners"
-            android:title="@string/pref_title_round_corners"
-            app:enableCopying="true"
-            app:icon="@drawable/ic_rounded_corner" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="toggle_full_screen"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_toggle_full_screen"
-            android:title="@string/pref_title_toggle_full_screen"
-            app:icon="@drawable/ic_cellphone_white_24dp" />
-    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>

appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java

@@ -7,6 +7,8 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 
 import code.name.monkey.appthemehelper.ATHActivity;
+import code.name.monkey.appthemehelper.R;
+import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 
 

appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java

@@ -84,7 +84,7 @@ public final class ToolbarContentTintHelper {
     }
 
     public static void colorBackButton(@NonNull Toolbar toolbar) {
-        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), R.attr.colorOnPrimary);
+        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(),  R.attr.colorControlNormal);
         final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY);
         for (int i = 0; i < toolbar.getChildCount(); i++) {
             final View backButton = toolbar.getChildAt(i);