XML String sort

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

@@ -190,7 +190,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
     override fun moreAlbums(albums: ArrayList<Album>) {
         moreTitle.show()
         moreRecyclerView.show()
-        moreTitle.text = String.format("More from %s", album.artistName)
+        moreTitle.text = String.format(getString(R.string.label_more_from), album.artistName)
 
         val albumAdapter = HorizontalAlbumAdapter(this, albums, false, null)
         moreRecyclerView.layoutManager = GridLayoutManager(this, 1, GridLayoutManager.HORIZONTAL, false)

app/src/main/res/color/text_field_background.xml

@@ -1,19 +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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.16" android:color="?attr/colorSecondary" android:state_hovered="true" />
-    <item android:alpha="0.04" android:color="?attr/colorSecondary" android:state_enabled="false" />
-    <item android:alpha="0.12" android:color="?attr/colorSecondary" />
-</selector>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="0"
-        android:centerColor="#80ffffff"
-        android:endColor="@android:color/transparent"
-        android:startColor="?colorPrimary"
-        android:type="linear" />
-</shape>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="16dp"
-        android:height="16dp" />
-    <solid android:color="@color/md_white_1000" />
-</shape>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z" />
-</vector>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <path android:pathData="M0,0h24v24H0V0z" />
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M16.56,8.94L8.32,0.7c-0.39-0.39-1.02-0.39-1.41,0l0,0c-0.39,0.39-0.39,1.02,0,1.41l1.68,1.68L3.44,8.94 c-0.59,0.59-0.59,1.54,0,2.12l5.5,5.5C9.23,16.85,9.62,17,10,17s0.77-0.15,1.06-0.44l5.5-5.5C17.15,10.48,17.15,9.53,16.56,8.94z M5.21,10L10,5.21L14.79,10H5.21z M19,11.5c0,0-2,2.17-2,3.5c0,1.1,0.9,2,2,2s2-0.9,2-2C21,13.67,19,11.5,19,11.5z" />
-
-</vector>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M12 6c1.1 0 2 0.9 2 2s-0.9 2-2 2-2-0.9-2-2 0.9-2 2-2m0 10c2.7 0 5.8 1.29 6 2H6c0.23-0.72 3.31-2 6-2m0-12C9.79 4 8 5.79 8 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 10c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" />
-</vector>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M15.5 14h-0.79l-0.28-0.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-0.59 4.23-1.57l0.27 0.28 v0.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" />
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z"/>
-</vector>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M16.24 7.75c-1.17-1.17-2.7-1.76-4.24-1.76v6l-4.24 4.24c2.34 2.34 6.14 2.34 8.49 0 2.34-2.34 2.34-6.14-0.01-8.48zM12 1.99c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
-</vector>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M15.07 1.01h-6v2h6v-2zm-4 13h2v-6h-2v6zm8.03-6.62l1.42-1.42c-0.43-0.51-0.9-0.99-1.41-1.41l-1.42 1.42C16.14 4.74 14.19 4 12.07 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03 9-9c0-2.11-0.74-4.06-1.97-5.61zm-7.03 12.62c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z" />
-</vector>

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

@@ -1,21 +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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke
-        android:width="1dp"
-        android:color="@color/md_grey_200" />
-    <solid android:color="@android:color/transparent" />
-    <corners android:radius="25dp" />
-</shape>

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

@@ -1,18 +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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@null" android:state_checked="false" />
-    <item android:drawable="@drawable/navigation_item_checked" android:state_checked="true" />
-</selector>

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

@@ -1,20 +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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners
-        android:bottomRightRadius="25dp"
-        android:topRightRadius="25dp" />
-    <solid android:color="@color/md_deep_orange_A400" />
-</shape>

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

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-            app:title="@string/equalizer"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/equalizerSwitch"
-            style="@style/TextAppearance.MaterialComponents.Subtitle1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/md_red_A400"
-            android:fontFamily="@font/circular_std_medium"
-            android:padding="16dp"
-            android:text="@string/on" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <LinearLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:padding="16dp"
-                    android:text="@string/select_preset"
-                    android:textAppearance="@style/TextViewSubtitle2" />
-
-                <androidx.appcompat.widget.AppCompatSpinner
-                    android:id="@+id/presets"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/bassBoost"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:padding="16dp"
-                    android:text="@string/bass_boost"
-                    android:textAppearance="@style/TextViewSubtitle2" />
-
-                <androidx.appcompat.widget.AppCompatSeekBar
-                    android:id="@+id/bassBoostStrength"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:max="1000"
-                    android:maxHeight="3dp"
-                    android:padding="16dp"
-                    android:progressDrawable="@drawable/color_progress_seek"
-                    android:splitTrack="false"
-                    android:thumb="@drawable/switch_thumb_material"
-                    tools:progress="20" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/virtualizer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:padding="16dp"
-                    android:text="@string/virtualizer"
-                    android:textAppearance="@style/TextViewSubtitle2" />
-
-                <androidx.appcompat.widget.AppCompatSeekBar
-                    android:id="@+id/virtualizerStrength"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:max="1000"
-                    android:maxHeight="3dp"
-                    android:padding="16dp"
-                    android:progressDrawable="@drawable/color_progress_seek"
-                    android:splitTrack="false"
-                    android:thumb="@drawable/switch_thumb_material"
-                    tools:progress="20" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/frequencyBands"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="16dp"
-                android:text="*Warning: It's alpha version. We don't recommend to use Equalizer, We believe without using Equalizer songs has better sound quality."
-                app:lineHeightHint="24sp" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,74 +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="wrap_content">
-
-    <code.name.monkey.appthemehelper.common.views.BaselineGridTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:text="If you enjoy using Retro Music, please take a moment to rate it. Thanks for your support!"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        tools:layout_editor_absoluteY="100dp">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/rateButton"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Rate"
-            app:backgroundTint="@color/md_red_400"
-            app:cornerRadius="8dp"
-            tools:layout_editor_absoluteX="1dp" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/laterButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="May be later"
-            android:textColor="@color/md_red_400"
-            app:cornerRadius="8dp"
-            app:layout_constraintLeft_toRightOf="@id/rateButton"
-            app:strokeColor="@color/md_red_400"
-            app:strokeWidth="1dp" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/noButton"
-            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="No thanks"
-            android:textColor="@color/md_red_400"
-            app:cornerRadius="8dp"
-            app:layout_constraintLeft_toRightOf="@id/laterButton" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,39 +0,0 @@
-<?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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="16dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/bannerTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:padding="16dp"
-            android:text="@string/add_playlist_title"
-            android:textAppearance="@style/TextViewHeadline6" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/actionAddPlaylist"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="16dp"
-            android:text="@string/new_playlist_title"
-            app:srcCompat="@drawable/ic_playlist_add_white_24dp"
-            app:tint="?colorOnBackground" />
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</LinearLayout>

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

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

    <WebView
        android:id="@+id/web_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars="none" />

</FrameLayout>

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

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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:orientation="vertical">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="centerCrop"
-        android:contentDescription="TODO" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/title_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="70"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Headline1"
-                android:textColor="@android:color/black"
-                tools:ignore="MissingPrefix" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="32dp"
-                android:paddingBottom="32dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="%"
-                    android:textColor="@android:color/black" />
-
-                <TextView
-                    android:id="@+id/off"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:text="Off"
-                    android:textColor="@android:color/black"
-                    android:textStyle="italic" />
-            </LinearLayout>
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:gravity="center"
-        android:text="Christmas &amp; New year offer"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
-        android:textColor="@android:color/black" />
-</FrameLayout>

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

@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:orientation="horizontal">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="2">
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true">
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/image_1"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@color/md_red_400"
-                        android:padding="8dp"
-                        android:text="New music mix"
-                        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
-                        app:autoSizeMaxTextSize="128sp"
-                        app:autoSizeMinTextSize="24sp"
-                        app:autoSizeStepGranularity="1sp"
-                        app:autoSizeTextType="uniform" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2.68"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image_2"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic[18]" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image_3"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic[19]" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:minHeight="100dp">
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image_4"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic[20]" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image_5"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[21]" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image_6"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[22]" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image_7"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[23]" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <Space
-            android:layout_width="1dp"
-            android:layout_height="match_parent" />
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image_8"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[24]" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:cardCornerRadius="6dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image_9"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[25]" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </LinearLayout>
-</LinearLayout>

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

@@ -86,6 +86,7 @@
             android:ellipsize="end"
             android:lines="1"
             android:singleLine="true"
+            android:textAppearance="@style/Theme.RetroMusic.Notification"
             android:textStyle="bold"
             tools:text="@tools:sample/lorem/random" />
 
@@ -96,6 +97,7 @@
             android:ellipsize="end"
             android:lines="1"
             android:singleLine="true"
+            android:textAppearance="@style/Theme.RetroMusic.Notification.Title"
             tools:text="@tools:sample/lorem/random" />
 
     </LinearLayout>
@@ -111,41 +113,46 @@
         android:layout_marginEnd="48dp"
         android:orientation="horizontal">
 
-        <ImageView
+        <ImageButton
             android:id="@+id/action_prev"
             android:layout_width="38dp"
             android:layout_height="38dp"
+            android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
             android:src="@drawable/ic_skip_previous_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/action_play_pause"
             android:layout_width="38dp"
             android:layout_height="38dp"
+            android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
             android:src="@drawable/ic_pause_white_24dp"
             tools:tint="?colorOnPrimary" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/action_next"
             android:layout_width="38dp"
             android:layout_height="38dp"
+            android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
             android:src="@drawable/ic_skip_next_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/action_quit"
             android:layout_width="38dp"
             android:layout_height="38dp"
+            android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
             android:visibility="gone" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/fifth"
             android:layout_width="38dp"
             android:layout_height="38dp"
+            android:background="@drawable/notification_selector"
             android:scaleType="centerInside" />
     </LinearLayout>
 </RelativeLayout>

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

@@ -79,6 +79,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="0dp"
             android:singleLine="true"
+            android:textAppearance="@style/Theme.RetroMusic.Notification"
             android:textStyle="bold"
             tools:text="@tools:sample/lorem/random" />
 
@@ -91,6 +92,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="0dp"
             android:singleLine="true"
+            android:textAppearance="@style/Theme.RetroMusic.Notification.Title"
             tools:text="@tools:sample/lorem/random" />
 
         <LinearLayout
@@ -100,34 +102,38 @@
             android:paddingStart="8dp"
             android:paddingEnd="0dp">
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/action_prev"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
+                android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
                 tools:src="@drawable/ic_skip_previous_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/action_play_pause"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
+                android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
                 tools:src="@drawable/ic_pause_white_48dp"
                 tools:tint="?colorOnPrimary" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/action_next"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
+                android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
                 tools:src="@drawable/ic_skip_next_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
-            <ImageView
+            <ImageButton
                 android:id="@+id/action_quit"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
+                android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
                 tools:src="@drawable/ic_close_white_24dp"
                 tools:tint="?colorOnPrimary" />

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

@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="64dp">
-
-    <LinearLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#00000000"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        tools:ignore="UselessParent">
-
-        <FrameLayout
-            android:id="@+id/icon_group"
-            android:layout_width="@dimen/notification_large_icon_width"
-            android:layout_height="@dimen/notification_large_icon_height"
-            android:layout_weight="0">
-
-            <ImageView
-                android:id="@+id/image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:scaleType="centerInside"
-                tools:ignore="ContentDescription" />
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:id="@+id/media_titles"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="fill_vertical"
-            android:layout_weight="1"
-            android:minHeight="@dimen/notification_large_icon_height"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:gravity="bottom"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.RetroMusic.Notification.Title"
-                tools:ignore="NestedWeights" />
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.RetroMusic.Notification" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="6dp"
-            android:layout_marginRight="6dp"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            tools:ignore="UnusedAttribute">
-
-            <!-- media buttons will be added here -->
-            <ImageButton
-                android:id="@+id/action_prev"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_play_pause"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-            <ImageButton
-                android:id="@+id/action_next"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</FrameLayout>

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

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
-
-<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="128dp">
-
-    <RelativeLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#00000000"
-        tools:ignore="UselessParent">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="@dimen/notification_big_image_size"
-            android:layout_height="@dimen/notification_big_image_size"
-            android:scaleType="centerCrop"
-            tools:ignore="ContentDescription"/>
-
-        <ImageButton
-            android:id="@+id/action_quit"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_margin="2dp"
-            android:background="@drawable/notification_selector"
-            android:padding="6dp"
-            android:scaleType="fitCenter"
-            tools:ignore="ContentDescription"/>
-
-        <LinearLayout
-            android:id="@+id/media_titles"
-            android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="8dp"
-            android:layout_toEndOf="@id/image"
-            android:layout_toLeftOf="@id/action_quit"
-            android:layout_toRightOf="@id/image"
-            android:layout_toStartOf="@id/action_quit"
-            android:minHeight="@dimen/notification_large_icon_height"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.RetroMusic.Notification.Title"/>
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="-1dp"
-                android:layout_marginTop="-1dp"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.RetroMusic.Notification"/>
-
-            <TextView
-                android:id="@+id/text2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="@style/Theme.RetroMusic.Notification"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_below="@+id/media_titles"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_toEndOf="@id/image"
-            android:layout_toRightOf="@id/image"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            tools:ignore="UnusedAttribute">
-
-            <!-- media buttons will be added here -->
-            <ImageButton
-                android:id="@+id/action_prev"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription"/>
-
-            <ImageButton
-                android:id="@+id/action_play_pause"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription"/>
-
-            <ImageButton
-                android:id="@+id/action_next"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="48dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:gravity="center"
-                android:padding="8dp"
-                android:scaleType="fitCenter"
-                tools:ignore="ContentDescription"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</FrameLayout>

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

@@ -1,46 +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:orientation="vertical">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/hurtz"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/minus_db"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="8dp" />
-
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/seekbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:maxHeight="3dp"
-            android:padding="8dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            android:splitTrack="false"
-            android:thumb="@drawable/switch_thumb_material"
-            tools:progress="20" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/plus_db"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="8dp" />
-    </LinearLayout>
-</LinearLayout>

app/src/main/res/menu/menu_expanded_controller.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/media_route_menu_item"
-        android:title="Cast"
-        app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
-        app:showAsAction="always" />
-
-</menu>

app/src/main/res/values-ar/strings.xml

@@ -31,7 +31,6 @@
     <string name="action_rename">اعادة تسمية</string>
     <string name="action_save_playing_queue">حفظ قائمة التشغيل الحالية</string>
     <string name="action_scan">فحص</string>
-    <string name="action_scan_directory">مسار الفحص</string>
     <string name="action_search">بحث</string>
     <string name="set">تعيين</string>
     <string name="action_set">تشغيل</string>
@@ -97,7 +96,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="close_notification">اغلاق</string>
     <string name="color">لون</string>
     <string name="color_theme_name">لون</string>
-    <string name="day_night_theme_name">مضيء ومظلم(اختباري)</string>
     <string name="colors">الوان</string>
     <string name="could_not_create_playlist">\u0644\u0627\u064a\u0645\u0643\u0646 \u0625\u0646\u0634\u0627\u0621 \u0642\u0627\u0626\u0645\u0629 \u062a\u0634\u063a\u064a\u0644</string>
     <string name="could_not_download_album_cover">"\u0644\u0627\u064a\u0645\u0643\u0646 \u062a\u0646\u0632\u064a\u0644 \u063a\u0644\u0627\u0641 \u0627\u0644\u0628\u0648\u0645 \u0645\u062a\u0637\u0627\u0628\u0642."</string>
@@ -216,7 +214,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_header_images">الصور</string>
     <string name="pref_header_lockscreen">شاشة القفل</string>
     <string name="pref_header_playlists">" قوائم التشغيل"</string>
-    <string name="pref_only_lollipop">"متاح فقط على لوليبوب"</string>
     <string name="pref_summary_album_art_on_lockscreen">استخدم غلاف ألبوم الأغنية قيد التشغيل حاليًا كخلفية لشاشة القفل</string>
     <string name="pref_summary_audio_ducking">خفض مستوى الصوت عند تشغيل صوت نظام أو تلقي إشعارات</string>
     <string name="pref_summary_blurred_album_art">ظبابية غطاء الألبوم على شاشة القفل . يمكن أن يسبب مشاكل في تطبيقات وويدجت الطرف الثالث</string>
@@ -455,16 +452,12 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="dialog_message_set_ringtone">السمات لتطبيق ريترو ميوزك بتعديل اعدادات الصوت</string>
     <string name="about_settings_summary">الفريق, الروابط للتواصل</string>
     <string name="other_settings_summary">اعدادات اختبارية متقدمة</string>
-    <string name="on">تفعيل</string>
-    <string name="select_preset">حدد مسبقا</string>
-    <string name="upgrade_to_premium">الترقية إلى الإصدار الكامل</string>
     <string name="action_new_playlist">قائمة تشغيل جديدة</string>
     <string name="finish_last_song">إنهاء الأغنية الأخيرة</string>
     <string name="image_gradient">الصورة المتدرجة</string>
     <string name="stack">التكدس</string>
     <string name="grid_style_label"><![CDATA[الشبكة والأسلوب]]></string>
     <string name="welcome">مرحبا,</string>
-    <string name="premium">الحصول على الإصدار الكامل</string>
     <string name="pro_summary">تشغيل الآن السمات ، وتأثير التكدس ، وموضوع اللون وأكثر من ذلك ..</string>
     <string name="action_play_all">تشغيل الكل</string>
     <string name="start_play_music">أبدا بتشغيل الموسيقى.</string>

app/src/main/res/values-bg/strings.xml

@@ -44,7 +44,6 @@
     <string name="action_save_playing_queue">Запази опашката</string>
 
     <string name="action_scan">Сканирай</string>
-    <string name="action_scan_directory">Сканирай директория</string>
 
     <string name="action_search">Търси</string>
 
@@ -432,7 +431,6 @@
     <string name="pref_now_playing_screen_summary">Натисни за или плъзни за без прозрачна навигация на екрана с песен</string>
     <string name="pref_now_playing_screen_title">Натисни или плъзни</string>
 
-    <string name="pref_only_lollipop">"Наличен единствено в Lollipop."</string>
 
     <string name="pref_snow_fall_title">Ефект на валящ сняг</string>
 

app/src/main/res/values-cs/strings.xml

@@ -184,7 +184,6 @@
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_images">Obrázky</string>
     <string name="pref_header_lockscreen">Obrazovka uzamčení</string>
-    <string name="pref_only_lollipop">"K dispozici pouze na Lollipop."</string>
     <string name="pref_summary_album_art_on_lockscreen">Používá současný obal alba písní jako tapetu zámku.</string>
     <string name="pref_summary_audio_ducking">Oznámení, navigace atd.</string>
     <string name="pref_summary_blurred_album_art">Blur obal alba na uzamčení obrazovky. Může způsobit problémy s aplikacemi třetích stran a widgety.</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Warteschleife abspeichern</string>
 
     <string name="action_scan">Scannen</string>
-    <string name="action_scan_directory">Verzeichnis scannen</string>
 
     <string name="action_search">Suchen</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Ziemlich Dunkel</string>
 
-    <string name="day_night_theme_name">Tag-Nacht</string>
-
     <string name="default_hint">Kein Songtext</string>
 
     <string name="delete_playlist_title">Wiedergabeliste löschen</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">Passe den Abspielbildschirm an</string>
     <string name="now_playing_themes">Mehr als 10 Abspiel-Themes</string>
 
-    <string name="on">An</string>
-
     <string name="only_on_wifi">Nur über WLAN</string>
 
     <string name="other_settings_summary">Erweiterte Testfunktionen</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Tippen oder wischen, um den Abspielbildschirm zu öffnen. Ist Wischen aktiv, kann die Navigationsleiste nicht transparent sein.</string>
     <string name="pref_now_playing_screen_title">Wischgesten</string>
 
-    <string name="pref_only_lollipop">"Nur auf Lollipop verfügbar."</string>
-
     <string name="pref_snow_fall_title">Schneefall-Effekt</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Nutzt das Albumcover des derzeitigen Songs als Sperrbildschirmhintergrund.</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">Lautstärkesteuerung</string>
     <string name="pref_title_user_info">Nutzerinfo</string>
 
-    <string name="premium">Premium kaufen</string>
-
     <string name="primary_color">Primärfarbe</string>
     <string name="primary_color_desc">Die Primärfarbe, standardmäßig blau/grau, funktioniert nun auch mit dunklen Farben</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">Banner-Foto auswählen</string>
 
-    <string name="select_preset">Wähle eine Voreinstellung</string>
-
     <string name="selected">Ausgewähltes beschriftet</string>
 
     <string name="send_crash_log">Crashlogs senden</string>
@@ -755,8 +744,6 @@
 
     <string name="updating">Aktualisieren...</string>
 
-    <string name="upgrade_to_premium">Upgrade auf Premium</string>
-
     <string name="username">Benutzername</string>
 
     <string name="version">Version</string>

app/src/main/res/values-de/strings.xml

@@ -269,8 +269,6 @@
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
     <string name="pref_header_playlists">Playlist</string>
 
-    <string name="pref_only_lollipop">"Nur unter Android Lollipop verfügbar."</string>
-
     <string name="pref_summary_album_art_on_lockscreen">Aktuelles Album-Cover als Sperrbildschrim verwenden.</string>
     <string name="pref_summary_audio_ducking">Benachrichtigungen, Benachrichtigung etc.</string>
     <string name="pref_summary_blurred_album_art">Verunschärft das Album-Cover des Sperrbildschirm. Kann Probleme mit anderen Apps und Widgets verursachen.</string>

app/src/main/res/values-el/strings.xml

@@ -277,7 +277,6 @@
     <string name="pref_header_lockscreen">Οθόνη Κλειδώματος</string>
     <string name="pref_header_playlists">Playlists</string>
 
-    <string name="pref_only_lollipop">"Διαθέσιμο μόνο στο Android Lollipop."</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Χρησιμοποιεί το εξώφυλλο του τρέχων κομματιού ως φόντο οθόνης κλειδώματος.</string>
     <string name="pref_summary_audio_ducking">Ειδοποιήσεις, πλοήγηση, κλπ.</string>

app/src/main/res/values-es-rES/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Guardar cola de reproducción</string>
 
     <string name="action_scan">Escanear</string>
-    <string name="action_scan_directory">Escanear directorio</string>
 
     <string name="action_search">Buscar</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Algo oscuro</string>
 
-    <string name="day_night_theme_name">Día Noche (alpha)</string>
-
     <string name="default_hint">No hay letras</string>
 
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
@@ -486,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Toca para abrir con o desliza sin la barra de navegación transparente de la pantalla de reproducción</string>
     <string name="pref_now_playing_screen_title">Hacer clic o deslizar</string>
 
-    <string name="pref_only_lollipop">"Sólo disponible en Lollipop."</string>
-
     <string name="pref_snow_fall_title">Efecto de caída de nieve</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se está reproduciendo como fondo de la pantalla de bloqueo</string>
@@ -553,8 +548,6 @@
     <string name="pref_title_toggle_volume">Controles de volumen</string>
     <string name="pref_title_user_info">Información del usuario</string>
 
-    <string name="premium">Obtener premium</string>
-
     <string name="primary_color">Color primario</string>
     <string name="primary_color_desc">El color de tema primario, azul grisáceo por defecto, por ahora funciona con colores oscuros</string>
 
@@ -636,8 +629,6 @@
 
     <string name="select_banner_photo">Elegir una foto de portada</string>
 
-    <string name="select_preset">Seleccionar preset</string>
-
     <string name="selected">Seleccionado</string>
 
     <string name="send_crash_log">Enviar registro de depuración</string>
@@ -753,8 +744,6 @@
 
     <string name="updating">Actualizando...</string>
 
-    <string name="upgrade_to_premium">Mejorado a premium</string>
-
     <string name="username">Nombre de Usuario</string>
 
     <string name="version">Versión</string>

app/src/main/res/values-es-rUS/strings.xml

@@ -44,7 +44,6 @@
     <string name="action_save_playing_queue">Guardar cola de reproducción</string>
 
     <string name="action_scan">Escanear</string>
-    <string name="action_scan_directory">Escanear directorio</string>
 
     <string name="action_search">Buscar</string>
 
@@ -432,8 +431,6 @@
     <string name="pref_now_playing_screen_summary">Click para abrir con o sin navegación transparente de la pantalla de reproducción actual</string>
     <string name="pref_now_playing_screen_title">Hacer Clic o Deslizar</string>
 
-    <string name="pref_only_lollipop">"Sólo disponible en Lollipop"</string>
-
     <string name="pref_snow_fall_title">Efecto \"Snow Fall\"</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se reproduce como fondo de pantalla de bloqueo</string>

app/src/main/res/values-es/strings.xml

@@ -46,7 +46,6 @@
     <string name="action_save_playing_queue">Guardar lista de reproducción</string>
 
     <string name="action_scan">Escanear</string>
-    <string name="action_scan_directory">Escanear directorio</string>
 
     <string name="action_search">Buscar</string>
 
@@ -432,7 +431,6 @@
     <string name="pref_now_playing_screen_summary">Toca para abrir con o desliza sin la barra de navegación transparente de la pantalla de reproducción</string>
     <string name="pref_now_playing_screen_title">Toca o desliza</string>
 
-    <string name="pref_only_lollipop">"Solo disponible en Lollipop."</string>
 
     <string name="pref_snow_fall_title">Efecto de nevada</string>
 

app/src/main/res/values-eu-rES/strings.xml

@@ -44,7 +44,6 @@
     <string name="action_save_playing_queue">Erreprodukzio ilara gorde</string>
 
     <string name="action_scan">Eskaneatu</string>
-    <string name="action_scan_directory">Direktorioa eskaneatu</string>
 
     <string name="action_search">Bilatu</string>
 
@@ -430,8 +429,6 @@
     <string name="pref_now_playing_screen_summary">Orain erreproduzitzen pantailaren nabigazio gardena irekitzeko klikatu, irristatu gardentasunik gabeko nabigaziorako</string>
     <string name="pref_now_playing_screen_title">Klikatu edo irristatu</string>
 
-    <string name="pref_only_lollipop">"Lollipop-en bakarrik eskuragarri"</string>
-
     <string name="pref_snow_fall_title">Elur efektua</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Erabili erreproduzitzen ari den abestiaren azala blokeo-pantailako horma-paper gisa</string>

app/src/main/res/values-fr/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Enregistrer la file d\'attente</string>
 
     <string name="action_scan">Scanner</string>
-    <string name="action_scan_directory">Scanner le dossier</string>
 
     <string name="action_search">Rechercher</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Plutôt Sombre</string>
 
-    <string name="day_night_theme_name">De Nuit par jour(alpha)</string>
-
     <string name="default_hint">Pas de Paroles</string>
 
     <string name="delete_playlist_title">Supprimer la liste de lecture</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">Personnaliser l\'écran de lecture</string>
     <string name="now_playing_themes">9+ thèmes d\'écran de lecture en cours</string>
 
-    <string name="on">Sur</string>
-
     <string name="only_on_wifi">Uniquement via Wi-Fi</string>
 
     <string name="other_settings_summary">Fonctions de test avancées</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Cliquez pour ouvrir avec ou glisser à sans navigation transparente de l\'écran de lecture</string>
     <string name="pref_now_playing_screen_title">Cliquez ou balayez</string>
 
-    <string name="pref_only_lollipop">"Seulement disponible sur Lollipop."</string>
-
     <string name="pref_snow_fall_title">Effet chute de neige</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Utiliser la couverture d\'album de la piste en cours de lecture comme fond sur l\'écran de verrouillage</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">Contrôles de volume</string>
     <string name="pref_title_user_info">Informations utilisateur</string>
 
-    <string name="premium">Obtenir La Prime</string>
-
     <string name="primary_color">Couleur primaire</string>
     <string name="primary_color_desc">La couleur de thème primaire, par défaut bleu-gris, fonctionne maintenant avec les couleurs sombres</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">Choisir la bannière photo</string>
 
-    <string name="select_preset">Sélection préréglage</string>
-
     <string name="selected">Sélectionné</string>
 
     <string name="send_crash_log">Envoyer le journal du crash</string>
@@ -755,8 +744,6 @@
 
     <string name="updating">Mise à jour...</string>
 
-    <string name="upgrade_to_premium">Mise à niveau vers premium</string>
-
     <string name="username">Nom d\'utilisateur</string>
 
     <string name="version">version</string>

app/src/main/res/values-hr/strings.xml

@@ -44,7 +44,6 @@
     <string name="action_save_playing_queue">Spremi red reproduciranja</string>
 
     <string name="action_scan">Skeniraj</string>
-    <string name="action_scan_directory">Skeniraj direktorij</string>
 
     <string name="action_search">Traži</string>
 
@@ -434,8 +433,6 @@
     <string name="pref_now_playing_screen_summary">Dodirnite za otvaranje ili klizanje bez prozirne navigacije zaslona za reprodukciju</string>
     <string name="pref_now_playing_screen_title">Klik ili klizanje</string>
 
-    <string name="pref_only_lollipop">"Dostupno samo na Lollipop-u."</string>
-
     <string name="pref_snow_fall_title">Efekt padanja snijega</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Koristite omot albuma trenutne pjesme kao pozadinu zaključanog zaslona.</string>

app/src/main/res/values-hu/strings.xml

@@ -44,7 +44,6 @@
     <string name="action_save_playing_queue">Lejátszási sor mentése</string>
 
     <string name="action_scan">Letapogatás</string>
-    <string name="action_scan_directory">Szkennelési könyvtár</string>
 
     <string name="action_search">Keresés</string>
 
@@ -389,8 +388,6 @@
     <string name="pref_keep_screen_on_summary">Vedd figyelembe hogy ha bekapcsolod ezt gyorsabban fog merülni a telefonod.</string>
     <string name="pref_keep_screen_on_title">Tartsa bekapcsolva a képernyőt</string>
 
-    <string name="pref_only_lollipop">"Csak a Lollipopon elérhető."</string>
-
     <string name="pref_summary_album_art_on_lockscreen">A jelenlegi zeneszámok albumborítóját zárolt háttérképként használja.</string>
     <string name="pref_summary_audio_ducking">Értesítések, navigáció stb.</string>
     <string name="pref_summary_blurred_album_art">Blokkolja az album borítóját a zárolás képernyőjén. Problémákat okozhat harmadik féltől származó alkalmazásokkal és kütyükkel.</string>

app/src/main/res/values-id/strings.xml

@@ -48,7 +48,6 @@
     <string name="action_save_playing_queue">Simpan antrean pemutar</string>
 
     <string name="action_scan">Pindai</string>
-    <string name="action_scan_directory">Pindai direktori</string>
 
     <string name="action_search">Cari</string>
 
@@ -476,7 +475,6 @@ anda dapat berdonasi disini</string>
     <string name="pref_now_playing_screen_summary">Klik atau geser untuk membuka layar sedang diputar</string>
     <string name="pref_now_playing_screen_title">Klik atau geser</string>
 
-    <string name="pref_only_lollipop">"Hanya tersedia di Lollipop"</string>
 
     <string name="pref_snow_fall_title">Efek salju jatuh</string>
 
@@ -622,8 +620,6 @@ anda dapat berdonasi disini</string>
 
     <string name="select_banner_photo">Pilih foto banner</string>
 
-    <string name="select_preset">Pilih Preset</string>
-
     <string name="selected">Terpilih</string>
 
     <string name="send_crash_log">Kirim catatan kerusakan</string>

app/src/main/res/values-in/strings.xml

@@ -204,8 +204,6 @@
     <string name="pref_header_images">Gambar</string>
     <string name="pref_header_lockscreen">Layarkunci</string>
 
-    <string name="pref_only_lollipop">"Hanya tersedia pada Lollipop."</string>
-
     <string name="pref_summary_album_art_on_lockscreen">Menggunakan gambar album sebagai latar layarkunci.</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, navigasi, dll.</string>
     <string name="pref_summary_blurred_album_art">Kaburkan gambar album pada layarkunci. Dapat menyebabkan masalah pada apl pihak ketiga dan widget.</string>

app/src/main/res/values-it/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Salva coda</string>
 
     <string name="action_scan">Scansiona</string>
-    <string name="action_scan_directory">Scansiona cartella</string>
 
     <string name="action_search">Cerca</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Tipo buio</string>
 
-    <string name="day_night_theme_name">Chiaro Scuro (alpha)</string>
-
     <string name="default_hint">Nessun testo</string>
 
     <string name="delete_playlist_title">Elimina playlist</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">Personalizza la schermata riproduzione</string>
     <string name="now_playing_themes">Più di 9 schermate di riproduzione</string>
 
-    <string name="on">Acceso</string>
-
     <string name="only_on_wifi">Solo tramite Wi-fi</string>
 
     <string name="other_settings_summary">Funzionalità avanzate</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Premi per aprire o scorri nella schermata di riproduzione</string>
     <string name="pref_now_playing_screen_title">Premi o scorri</string>
 
-    <string name="pref_only_lollipop">"Disponibile solo con Lollipop"</string>
-
     <string name="pref_snow_fall_title">Effetto neve</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Imposta la copertina del brano riprodotto come sfondo del blocco schermo</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">Controlli volume</string>
     <string name="pref_title_user_info">Info utente</string>
 
-    <string name="premium">Ottieni premium</string>
-
     <string name="primary_color">Colore primario</string>
     <string name="primary_color_desc">Il colore primario del tema, blu-grigio di default, per ora funziona con colori scuri</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">Seleziona la foto del banner</string>
 
-    <string name="select_preset">Seleziona preimpostato</string>
-
     <string name="selected">Selezionato</string>
 
     <string name="send_crash_log">Invia registro errori</string>
@@ -755,8 +744,6 @@
 
     <string name="updating">Aggiornamento...</string>
 
-    <string name="upgrade_to_premium">Passa a premium</string>
-
     <string name="username">Nome utente</string>
 
     <string name="version">Versione</string>

app/src/main/res/values-ja/strings.xml

@@ -46,7 +46,6 @@
     <string name="action_save_playing_queue">再生キューを保存</string>
 
     <string name="action_scan">スキャン</string>
-    <string name="action_scan_directory">ディレクトリをスキャン</string>
 
     <string name="action_search">検索</string>
 
@@ -466,8 +465,6 @@
     <string name="pref_now_playing_screen_summary">現在再生中の画面に移動せずに、クリックまたはスライドして開く</string>
     <string name="pref_now_playing_screen_title">クリックもしくはスライド</string>
 
-    <string name="pref_only_lollipop">"Lollipop バージョンでのみ利用できます"</string>
-
     <string name="pref_snow_fall_title">スノーフォールエフェクト</string>
 
     <string name="pref_summary_album_art_on_lockscreen">再生中のジャケットをロック画面の壁紙に適用する</string>

app/src/main/res/values-ko/strings.xml

@@ -310,8 +310,6 @@
     <string name="pref_header_lockscreen">잠금 화면</string>
     <string name="pref_header_playlists">재생목록</string>
 
-    <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 사용할 수 있습니다."</string>
-
     <string name="pref_summary_album_art_on_lockscreen">현재 재생 중인 노래의 앨범 커버를 잠금 화면 배경화면으로 사용합니다.</string>
     <string name="pref_summary_audio_ducking">알림, 탐색 등</string>
     <string name="pref_summary_blurred_album_art">잠금 화면의 앨범 커버에 흐림 효과를 적용합니다. 서드 파티 앱 및 위젯에서 문제가 생길 수 있습니다.</string>

app/src/main/res/values-land/dimens.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="horizontal_margin">52dp</dimen>
     <dimen name="toolbar_margin_horizontal">52dp</dimen>
-    <dimen name="horizontal_padding_home">52dp</dimen>
 </resources>

app/src/main/res/values-land/integers.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources></resources>
-    <integer name="options_height">96</integer>
-</resources>

app/src/main/res/values-ms/strings.xml

@@ -280,7 +280,6 @@
     <string name="pref_header_lockscreen">Skrin kunci</string>
     <string name="pref_header_playlists">Senarai main</string>
 
-    <string name="pref_only_lollipop">"Hanya tersedia pada Lollipop."</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Menggunakan kulit album lagu semasa sebagai hias latar skrin kunci</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, pandu arah dan lain-lain.</string>

app/src/main/res/values-night/is_dark_mode.xml

@@ -1,18 +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.
-  -->
-
-<resources>
-    <bool name="is_dark_mode">true</bool>
-</resources>

app/src/main/res/values-nl/strings.xml

@@ -265,8 +265,6 @@
     <string name="pref_header_lockscreen">Vergrendelscherm</string>
     <string name="pref_header_playlists">Afspeellijsten</string>
 
-    <string name="pref_only_lollipop">"Alleen beschikbaar op Lollipop"</string>
-
     <string name="pref_summary_album_art_on_lockscreen">Gebruik de huidige cover als vergrendelscherm achtergrond.</string>
     <string name="pref_summary_audio_ducking">Notificaties, bediening etc.</string>
     <string name="pref_summary_blurred_album_art">Vervaagt de album cover op het vergrendelscherm. Kan problemen veroorzaken met apps van derde en widgets/</string>

app/src/main/res/values-pl/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Zapisz kolejkę</string>
 
     <string name="action_scan">Skanuj</string>
-    <string name="action_scan_directory">Przeszukaj katalog</string>
 
     <string name="action_search">Szukaj</string>
 
@@ -418,8 +417,6 @@
     <string name="now_playing_summary">Dostosuj panel aktualnie odtwarzanych</string>
     <string name="now_playing_themes">9+ motywów Teraz odtwarzane</string>
 
-    <string name="on">Włącz</string>
-
     <string name="only_on_wifi">Tylko przez Wi-Fi</string>
 
     <string name="other_settings_summary">Zaawansowane funkcje eksperymentalne</string>
@@ -484,7 +481,6 @@
     <string name="pref_now_playing_screen_summary">Kliknij aby otworzyć z lub przesunąć do przezroczystej nawigacji ekranu teraz odtwarzane</string>
     <string name="pref_now_playing_screen_title">Kliknij albo przesuń</string>
 
-    <string name="pref_only_lollipop">"Dostępne tylko na Androidzie Lolipop"</string>
 
     <string name="pref_snow_fall_title">Efekt spadającego śniegu</string>
 
@@ -551,8 +547,6 @@
     <string name="pref_title_toggle_volume">Sterowanie głośnością</string>
     <string name="pref_title_user_info">Informacje użytkownika</string>
 
-    <string name="premium">Kup Premium</string>
-
     <string name="primary_color">Kolor podstawowy</string>
     <string name="primary_color_desc">Główny kolor motywu, domyślnie niebieski, działa teraz z ciemnymi kolorami</string>
 
@@ -634,8 +628,6 @@
 
     <string name="select_banner_photo">Wybierz zdjęcie banera</string>
 
-    <string name="select_preset">Wybierz zdefiniowane</string>
-
     <string name="selected">Zaznaczone</string>
 
     <string name="send_crash_log">Zgłoś awarię</string>
@@ -751,8 +743,6 @@
 
     <string name="updating">Aktualizowanie...</string>
 
-    <string name="upgrade_to_premium">Sięgnij po wersję Premium</string>
-
     <string name="username">Nazwa użytkownika</string>
 
     <string name="version">Wersja</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Salvar fila de reprodução</string>
 
     <string name="action_scan">Escanear</string>
-    <string name="action_scan_directory">Escanear diretório</string>
 
     <string name="action_search">Pesquisar</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Meio escuro</string>
 
-    <string name="day_night_theme_name">Day Night(alpha)</string>
-
     <string name="default_hint">Sem letras</string>
 
     <string name="delete_playlist_title">Excluir playlist</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">Personalizar tela de reprodução</string>
     <string name="now_playing_themes">Incríveis 9 temas para a interface do reprodutor</string>
 
-    <string name="on">Ligado</string>
-
     <string name="only_on_wifi">Apenas com Wi-Fi</string>
 
     <string name="other_settings_summary">Recursos avançados em teste</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Clique para abrir ou deslizar sem a navegação transparente da tela que está sendo reproduzida agora</string>
     <string name="pref_now_playing_screen_title">Clique ou deslize</string>
 
-    <string name="pref_only_lollipop">"Disponível apenas no Android Lollipop"</string>
-
     <string name="pref_snow_fall_title">Efeito de neve caindo</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Usar a capa do álbum da música em reprodução como papel de parede na tela de bloqueio</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">Controles do volume</string>
     <string name="pref_title_user_info">Informação do usuário</string>
 
-    <string name="premium">Obtenha o Premium</string>
-
     <string name="primary_color">Cor primária</string>
     <string name="primary_color_desc">A cor principal do tema por padrão é cinza azulado, por enquanto funciona com cores escuras</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">Selecione a foto do mural</string>
 
-    <string name="select_preset">Selecionar predefinição</string>
-
     <string name="selected">Selecionado</string>
 
     <string name="send_crash_log">Enviar log de falha</string>
@@ -756,8 +745,6 @@
 
     <string name="updating">Atualizando...</string>
 
-    <string name="upgrade_to_premium">Atualize para o premium</string>
-
     <string name="username">Nome de usuário</string>
 
     <string name="version">Versão</string>

app/src/main/res/values-ro/strings.xml

@@ -310,8 +310,6 @@
     <string name="pref_header_lockscreen">Ecran de blocare</string>
     <string name="pref_header_playlists">Playlist-uri</string>
 
-    <string name="pref_only_lollipop">"Valabil doar pe Lollipop"</string>
-
     <string name="pref_summary_album_art_on_lockscreen">Folosește coperta de album curentă ca imagine de fundal pe ecranul de blocare.</string>
     <string name="pref_summary_audio_ducking">Notificațiile, navigarea etc.</string>
     <string name="pref_summary_blurred_album_art">Spălăcește coperta de album pe ecranul de blocare. Poate cauza probleme cu alte aplcicatii sau widget-uri.</string>

app/src/main/res/values-ru/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Сохранить очередь воспроизведения</string>
 
     <string name="action_scan">Сканировать</string>
-    <string name="action_scan_directory">Сканирование каталога</string>
 
     <string name="action_search">Поиск</string>
 
@@ -474,8 +473,6 @@
     <string name="pref_now_playing_screen_summary">Нажмите, чтобы открыть экран воспроизведения с прозрачной навигации или проведите чтобы открыть без прозрачной навигации</string>
     <string name="pref_now_playing_screen_title">Нажмите или Проведите</string>
 
-    <string name="pref_only_lollipop">"Доступно только на Lollipop."</string>
-
     <string name="pref_snow_fall_title">Эффект снегопада</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.</string>

app/src/main/res/values-sr/strings.xml

@@ -276,8 +276,6 @@
     <string name="pref_header_lockscreen">Zakljucan ekran</string>
     <string name="pref_header_playlists">Plejliste</string>
 
-    <string name="pref_only_lollipop">"Dostupno samo na Android Lollipop-u"</string>
-
     <string name="pref_summary_album_art_on_lockscreen">Koristi omot albuma kao pozadinu kada se reprodukuje muzika</string>
     <string name="pref_summary_audio_ducking">Obavestenja, navigacija itd.</string>
     <string name="pref_summary_blurred_album_art">Zamuti omot albuma na zakljucanom ekranu. (moze izazvati probleme sa drugim aplikacijama i vidzetima)</string>

app/src/main/res/values-sw600dp-land/dimens.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="horizontal_margin">128dp</dimen>
-</resources>

app/src/main/res/values-sw600dp/dimens.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="bottom_sheet_width">600dp</dimen>
-    <dimen name="progress_slider_height">32dp</dimen>
-</resources>

app/src/main/res/values-tr/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Oynatma kuyruğunu kaydet</string>
 
     <string name="action_scan">Tara</string>
-    <string name="action_scan_directory">Tarama rehberi</string>
 
     <string name="action_search">Ara</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">Koyu</string>
 
-    <string name="day_night_theme_name">Gündüz Gece (alpha)</string>
-
     <string name="default_hint">Şarkı sözü yok</string>
 
     <string name="delete_playlist_title">Çalma listesini sil</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">Şimdi oynatılıyor ekranını özelleştirin</string>
     <string name="now_playing_themes">9+ şimdi oynatılıyor temaları</string>
 
-    <string name="on">Açık</string>
-
     <string name="only_on_wifi">Sadece Wi-Fi ile</string>
 
     <string name="other_settings_summary">Gelişmiş test özellikleri</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">Çalmakta olan ekrana şeffaf gezinme olmadan açmak veya kaydırmak için tıklayın</string>
     <string name="pref_now_playing_screen_title">Tıkla veya Kaydır</string>
 
-    <string name="pref_only_lollipop">"Sadece Lollipop'da kullanılabilir."</string>
-
     <string name="pref_snow_fall_title">Kar yağışı efekti</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Çalmakta olan şarkı albüm kapağını kilit ekranı duvar kağıdı olarak kullanın</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">Ses kontrolleri</string>
     <string name="pref_title_user_info">Kullanıcı bilgisi</string>
 
-    <string name="premium">Premium\'u al</string>
-
     <string name="primary_color">Ana renk</string>
     <string name="primary_color_desc">Ana tema rengi, varsayılanı mavi griye, şimdilik koyu renklerle çalışıyor</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">Afiş fotoğrafını seçin</string>
 
-    <string name="select_preset">Ön ayar seç</string>
-
     <string name="selected">Seçilmiş</string>
 
     <string name="send_crash_log">Çökme raporu gönder</string>
@@ -756,8 +745,6 @@
 
     <string name="updating">Güncelleniyor ...</string>
 
-    <string name="upgrade_to_premium">Premium\'a yükselt</string>
-
     <string name="username">Kullanıcı Adı</string>
 
     <string name="version">Sürüm</string>

app/src/main/res/values-vi/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">Lưu hàng đợi phát</string>
 
     <string name="action_scan">Quét</string>
-    <string name="action_scan_directory">Quét thư mục</string>
 
     <string name="action_search">Tìm kiếm</string>
 
@@ -481,8 +480,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_now_playing_screen_summary">Nhấp hoặc trượt để mở mà không cần điều hướng của màn hình đang phát</string>
     <string name="pref_now_playing_screen_title">Nhấp hoặc Trượt</string>
 
-    <string name="pref_only_lollipop">"Chỉ có trên phiên bản Lollipop"</string>
-
     <string name="pref_snow_fall_title">Hiệu ứng tuyết rơi</string>
 
     <string name="pref_summary_album_art_on_lockscreen">Sử dụng ảnh bìa album bài hát đang phát làm ảnh nền màn hình khóa.</string>
@@ -548,8 +545,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_title_toggle_volume">Điều khiển âm lượng</string>
     <string name="pref_title_user_info">Thông tin người dùng</string>
 
-    <string name="premium">Nâng cấp Premium</string>
-
     <string name="primary_color">Màu chủ đạo</string>
     <string name="primary_color_desc">Màu sắc chủ đạo, mặc định là màu xanh xám, bây giờ hoạt động với màu tối</string>
 
@@ -629,8 +624,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
 
     <string name="select_banner_photo">Chọn ảnh biểu ngữ</string>
 
-    <string name="select_preset">Chọn Preset</string>
-
     <string name="selected">Đã chọn</string>
 
     <string name="send_crash_log">Gửi bản ghi lỗi</string>
@@ -744,8 +737,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
 
     <string name="updating">Đang cập nhật...</string>
 
-    <string name="upgrade_to_premium">Nâng cấp lên Premium</string>
-
     <string name="username">Tên người dùng</string>
 
     <string name="version">Phiên bản</string>

app/src/main/res/values-xlarge/dimens.xml

@@ -5,5 +5,4 @@
     <dimen name="item_song_height">64dp</dimen>
     <dimen name="button_padding_vertical">16dp</dimen>
     <dimen name="button_margin_horizontal">72dp</dimen>
-    <dimen name="horizontal_padding_home">128dp</dimen>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="about_settings_summary">团队，社交链接</string>
 
     <string name="accent_color">主题色</string>
@@ -46,7 +46,6 @@
     <string name="action_save_playing_queue">保存播放队列</string>
 
     <string name="action_scan">扫描</string>
-    <string name="action_scan_directory">目录扫描</string>
 
     <string name="action_search">搜索</string>
 
@@ -73,7 +72,7 @@
 
     <string name="add_lyrics">添加歌词</string>
 
-    <string name="add_photo">添加\n头像</string>
+    <string name="add_photo" tools:keep="@string/add_photo">添加\n头像</string>
 
     <string name="add_playlist_title">"添加到播放列表"</string>
 
@@ -116,9 +115,9 @@
 
     <string name="auto">自动</string>
 
-    <string name="base_color_theme">基础颜色主题</string>
+    <string name="base_color_theme" tools:keep="@string/base_color_theme">基础颜色主题</string>
 
-    <string name="bass_boost">低音增强</string>
+    <string name="bass_boost" tools:keep="@string/bass_boost">低音增强</string>
 
     <string name="bio">个性签名</string>
 
@@ -144,7 +143,7 @@
     <string name="bug_report_no_title">请输入问题标题</string>
     <string name="bug_report_no_username">请输入您有效的 GitHub 用户名</string>
     <string name="bug_report_summary">出错了，如一直崩溃请尝试清除应用数据或发送邮件给开发者</string>
-    <string name="bug_report_uploading">提交此报告</string>
+    <string name="bug_report_uploading" tools:keep="@string/bug_report_uploading">提交此报告</string>
     <string name="bug_report_use_account">使用 GitHub 帐户发送</string>
 
     <string name="cancel_current_timer">取消</string>
@@ -157,13 +156,13 @@
 
     <string name="card_style">卡片</string>
 
-    <string name="carousal">圆盘传送带</string>
+    <string name="carousal" tools:keep="@string/carousal">圆盘传送带</string>
 
     <string name="carousal_effect_on_now_playing_screen">在播放界面使用轮播效果</string>
 
     <string name="cascading">层叠</string>
 
-    <string name="cast">投射</string>
+    <string name="cast" tools:keep="@string/cast">投射</string>
 
     <string name="changelog">更新日志</string>
 
@@ -171,7 +170,7 @@
 
     <string name="circular">圆形</string>
 
-    <string name="classic">古典</string>
+    <string name="classic" tools:keep="@string/classic">古典</string>
 
     <string name="clear_action">清空</string>
 
@@ -188,7 +187,7 @@
 
     <string name="color">颜色</string>
 
-    <string name="color_theme_name">颜色</string>
+    <string name="color_theme_name" tools:keep="@string/color_theme_name">颜色</string>
 
     <string name="colors">更多颜色</string>
 
@@ -211,7 +210,7 @@
 
     <string name="dark_theme_name">暗夜黑</string>
 
-    <string name="default_hint">暂无歌词</string>
+    <string name="default_hint" tools:keep="@string/default_hint">暂无歌词</string>
 
     <string name="delete_playlist_title">删除播放列表</string>
     <string name="delete_playlist_x"><![CDATA[确认删除播放列表 <b>%1$s</b> 吗？]]></string>
@@ -247,7 +246,7 @@
 
     <string name="edit">编辑</string>
 
-    <string name="edit_cover">编辑专辑封面</string>
+    <string name="edit_cover" tools:keep="@string/edit_cover">编辑专辑封面</string>
 
     <string name="empty">空空如也</string>
 
@@ -280,7 +279,7 @@
 
     <string name="git_hub_summary">在GitHub上克隆项目</string>
 
-    <string name="google_plus_community">加入Google+社区获得帮助或者更新信息</string>
+    <string name="google_plus_community" tools:keep="@string/google_plus_community">加入Google+社区获得帮助或者更新信息</string>
 
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
@@ -325,7 +324,7 @@
 
     <string name="last_song">最后一首</string>
 
-    <string name="lets_play_something">来点音乐吧！</string>
+    <string name="lets_play_something" tools:keep="@string/lets_play_something">来点音乐吧！</string>
 
     <string name="library">音乐库</string>
 
@@ -426,7 +425,7 @@
 
     <string name="pick_from_local_storage">从本地选取</string>
 
-    <string name="pick_image_intent_text">选择图片</string>
+    <string name="pick_image_intent_text" tools:keep="@string/pick_image_intent_text">选择图片</string>
 
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">在 Pintrest 页面关注 Retro Music 的设计灵感</string>
@@ -444,7 +443,7 @@
 
     <string name="playlists">播放列表</string>
 
-    <string name="pref_album_detail_style">专辑详细风格</string>
+    <string name="pref_album_detail_style" tools:keep="@string/pref_album_detail_style">专辑详细风格</string>
 
     <string name="pref_blur_amount_summary">应用于模糊主题，数值越低加载越快</string>
     <string name="pref_blur_amount_title">模糊值</string>
@@ -462,12 +461,11 @@
     <string name="pref_keep_screen_on_summary">请注意，启用此功能可能会降低电池续航时间</string>
     <string name="pref_keep_screen_on_title">保持屏幕常亮</string>
 
-    <string name="pref_now_playing_screen_summary">点击打开或者滑动到非正在播放界面的透明导航栏</string>
+    <string name="pref_now_playing_screen_summary" tools:keep="@string/pref_now_playing_screen_summary">点击打开或者滑动到非正在播放界面的透明导航栏</string>
-    <string name="pref_now_playing_screen_title">单击或划动</string>
+    <string name="pref_now_playing_screen_title" tools:keep="@string/pref_now_playing_screen_title">单击或划动</string>
 
-    <string name="pref_only_lollipop">"仅在Android 5.x(Lollipop)上可用"</string>
 
-    <string name="pref_snow_fall_title">降雪效果</string>
+    <string name="pref_snow_fall_title" tools:keep="@string/pref_snow_fall_title">降雪效果</string>
 
     <string name="pref_summary_album_art_on_lockscreen">将正在播放的歌曲专辑封面设置为锁屏壁纸</string>
     <string name="pref_summary_audio_ducking">系统音响起或消息提醒时降低音量</string>
@@ -479,19 +477,19 @@
     <string name="pref_summary_classic_notification">使用经典通知栏设计</string>
     <string name="pref_summary_colored_app">背景色以及控件色跟随正在播放界面的专辑封面变化</string>
     <string name="pref_summary_colored_app_shortcuts">将快捷方式颜色更改为强调色，每次颜色更改后需要切换一下该设置才能生效</string>
-    <string name="pref_summary_colored_navigation_bar">修改导航栏颜色为主调色</string>
+    <string name="pref_summary_colored_navigation_bar" tools:keep="@string/pref_summary_colored_navigation_bar">修改导航栏颜色为主调色</string>
     <string name="pref_summary_colored_notification">"\u4ee5\u5c01\u9762\u7684\u4e3b\u8272\u8c03\u914d\u7f6e\u901a\u77e5\u680f\u989c\u8272"</string>
     <string name="pref_summary_dominant_color">从专辑封面或艺术家图中选取主色调</string>
     <string name="pref_summary_extra_controls">给迷你播放器添加额外控件</string>
     <string name="pref_summary_gapless_playback">"在一些设备上可能会播放异常"</string>
-    <string name="pref_summary_genre_toggle">切换流派标签</string>
+    <string name="pref_summary_genre_toggle" tools:keep="@string/pref_summary_genre_toggle">切换流派标签</string>
     <string name="pref_summary_home_banner">切换主页横幅样式</string>
     <string name="pref_summary_ignore_media_store_artwork">可以提高封面质量，但加载时间较慢
 （建议只在不满意图片分辨率过低时开启）</string>
     <string name="pref_summary_lock_screen">使用Retro Music的自定义锁屏</string>
     <string name="pref_summary_open_source_licences">开源许可详情</string>
     <string name="pref_summary_round_corners">使应用边角圆滑</string>
-    <string name="pref_summary_tab_titles">切换底部导航栏的标签标题</string>
+    <string name="pref_summary_tab_titles" tools:keep="@string/pref_summary_tab_titles">切换底部导航栏的标签标题</string>
     <string name="pref_summary_toggle_full_screen">沉浸式</string>
     <string name="pref_summary_toggle_headset">检测到耳机后自动播放</string>
     <string name="pref_summary_toggle_shuffle">播放新列表时关闭随机播放</string>
@@ -507,20 +505,20 @@
     <string name="pref_title_auto_download_artist_images">自动下载艺术家图片</string>
     <string name="pref_title_blacklist">黑名单</string>
     <string name="pref_title_blurred_album_art">模糊专辑封面</string>
-    <string name="pref_title_choose_equalizer">选择均衡器</string>
+    <string name="pref_title_choose_equalizer" tools:keep="@string/pref_title_choose_equalizer">选择均衡器</string>
     <string name="pref_title_classic_notification">经典通知栏设计</string>
     <string name="pref_title_colored_app">自适应颜色</string>
     <string name="pref_title_colored_notification">带颜色的通知栏</string>
     <string name="pref_title_extra_controls">额外控件</string>
     <string name="pref_title_gapless_playback">无间隙连续播放</string>
     <string name="pref_title_general_theme">应用主题</string>
-    <string name="pref_title_genre_toggle">显示流派标签</string>
+    <string name="pref_title_genre_toggle" tools:keep="@string/pref_title_genre_toggle">显示流派标签</string>
     <string name="pref_title_home_artist_grid_style">主页艺术家网格</string>
     <string name="pref_title_home_banner">主页横幅</string>
     <string name="pref_title_ignore_media_store_artwork">忽略多媒体商店封面</string>
     <string name="pref_title_last_added_interval">上次添加播放列表到现在的间隔</string>
     <string name="pref_title_lock_screen">全屏控件</string>
-    <string name="pref_title_navigation_bar">带颜色的导航栏</string>
+    <string name="pref_title_navigation_bar" tools:keep="@string/pref_title_navigation_bar">带颜色的导航栏</string>
     <string name="pref_title_now_playing_screen_appearance">播放主题</string>
     <string name="pref_title_open_source_licences">开源许可</string>
     <string name="pref_title_round_corners">边角</string>
@@ -528,20 +526,20 @@
     <string name="pref_title_toggle_carousel_effect">轮播效果</string>
     <string name="pref_title_toggle_dominant_color">主色调</string>
     <string name="pref_title_toggle_full_screen">全屏应用</string>
-    <string name="pref_title_toggle_tab_titles">标签标题</string>
+    <string name="pref_title_toggle_tab_titles" tools:keep="@string/pref_title_toggle_tab_titles">标签标题</string>
     <string name="pref_title_toggle_toggle_headset">音频播放</string>
     <string name="pref_title_toggle_toggle_shuffle">随机播放</string>
     <string name="pref_title_toggle_volume">音量控件</string>
-    <string name="pref_title_user_info">用户信息</string>
+    <string name="pref_title_user_info" tools:keep="@string/pref_title_user_info">用户信息</string>
 
-    <string name="primary_color">主颜色</string>
+    <string name="primary_color" tools:keep="@string/primary_color">主颜色</string>
-    <string name="primary_color_desc">默认蓝灰色为主要颜色，目前使用深色</string>
+    <string name="primary_color_desc" tools:keep="@string/primary_color_desc">默认蓝灰色为主要颜色，目前使用深色</string>
 
     <string name="profile">个人概况</string>
 
     <string name="purchase">购买</string>
 
-    <string name="purchase_summary">*购买前请先考虑，不要征询退款。</string>
+    <string name="purchase_summary" tools:keep="@string/purchase_summary">*购买前请先考虑，不要征询退款。</string>
 
     <string name="queue">队列</string>
 
@@ -585,7 +583,7 @@
 
     <string name="restoring_purchase">恢复购买中 ...</string>
 
-    <string name="retro_equalizer">Retro Music 均衡器</string>
+    <string name="retro_equalizer" tools:keep="@string/retro_equalizer">Retro Music 均衡器</string>
 
     <string name="retro_music_pro">Retro Music高级版</string>
 
@@ -630,9 +628,9 @@
     <string name="sleep_timer_canceled">睡眠定时已取消</string>
     <string name="sleep_timer_set">睡眠定时器设置为%d分钟。</string>
 
-    <string name="slide">滑动</string>
+    <string name="slide" tools:keep="@string/slide">滑动</string>
 
-    <string name="small">小专辑</string>
+    <string name="small" tools:keep="@string/small">小专辑</string>
 
     <string name="social">社交</string>
 
@@ -655,9 +653,9 @@
 
     <string name="speech_prompt">搜索媒体库</string>
 
-    <string name="suggestion_songs">建议</string>
+    <string name="suggestion_songs" tools:keep="@string/suggestion_songs">建议</string>
 
-    <string name="summary_user_info">仅仅在主页上显示你的名字</string>
+    <string name="summary_user_info" tools:keep="@string/summary_user_info">仅仅在主页上显示你的名字</string>
 
     <string name="support_development">支持开发者</string>
 
@@ -665,7 +663,7 @@
 
     <string name="synced_lyrics">滚动歌词</string>
 
-    <string name="system_equalizer">系统均衡器</string>
+    <string name="system_equalizer" tools:keep="@string/system_equalizer">系统均衡器</string>
 
     <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
@@ -685,15 +683,15 @@
 
     <string name="title">标题</string>
 
-    <string name="title_dashboard">仪表盘</string>
+    <string name="title_dashboard" tools:keep="@string/title_dashboard">仪表盘</string>
 
-    <string name="title_good_afternoon">下午好</string>
+    <string name="title_good_afternoon" tools:keep="@string/title_good_afternoon">下午好</string>
-    <string name="title_good_day">美好的一天</string>
+    <string name="title_good_day" tools:keep="@string/title_good_day">美好的一天</string>
-    <string name="title_good_evening">傍晚好</string>
+    <string name="title_good_evening" tools:keep="@string/title_good_evening">傍晚好</string>
-    <string name="title_good_morning">早上好</string>
+    <string name="title_good_morning" tools:keep="@string/title_good_morning">早上好</string>
-    <string name="title_good_night">晚上好</string>
+    <string name="title_good_night" tools:keep="@string/title_good_night">晚上好</string>
 
-    <string name="title_user_info">你的名字是什么</string>
+    <string name="title_user_info" tools:keep="@string/title_user_info">你的名字是什么</string>
 
     <string name="today">今日</string>
 
@@ -728,7 +726,7 @@
 
     <string name="vertical_flip">垂直滚动</string>
 
-    <string name="virtualizer">虚拟器</string>
+    <string name="virtualizer" tools:keep="@string/virtualizer">虚拟器</string>
 
     <string name="web_search">网络搜索</string>
 

app/src/main/res/values-zh-rHK/strings.xml

@@ -49,7 +49,6 @@
     <string name="action_save_playing_queue">儲存播放清單</string>
 
     <string name="action_scan">掃描</string>
-    <string name="action_scan_directory">掃描資料夾</string>
 
     <string name="action_search">搜尋</string>
 
@@ -214,8 +213,6 @@
 
     <string name="dark_theme_name">暗黑</string>
 
-    <string name="day_night_theme_name">夜間模式(Alpha)</string>
-
     <string name="default_hint">沒有歌詞</string>
 
     <string name="delete_playlist_title">移除播放清單</string>
@@ -422,8 +419,6 @@
     <string name="now_playing_summary">個人化現在播放界面</string>
     <string name="now_playing_themes">9+ 現在播放介面主題</string>
 
-    <string name="on">開啟</string>
-
     <string name="only_on_wifi">僅透過Wi-Fi</string>
 
     <string name="other_settings_summary">進階測試功能</string>
@@ -488,8 +483,6 @@
     <string name="pref_now_playing_screen_summary">點擊或滑動開啟無透明現在播放導航欄</string>
     <string name="pref_now_playing_screen_title">點擊或滑動</string>
 
-    <string name="pref_only_lollipop">"只適合於Lollipop。"</string>
-
     <string name="pref_snow_fall_title">雪花效果</string>
 
     <string name="pref_summary_album_art_on_lockscreen">使用現在播放歌曲的專輯圖片來用作鎖定畫面背景圖片</string>
@@ -555,8 +548,6 @@
     <string name="pref_title_toggle_volume">音量控制</string>
     <string name="pref_title_user_info">使用者資料</string>
 
-    <string name="premium">獲得Premium</string>
-
     <string name="primary_color">原色</string>
     <string name="primary_color_desc">主原色預設為灰藍色，現在適用於深色色彩</string>
 
@@ -638,8 +629,6 @@
 
     <string name="select_banner_photo">選擇橫幅圖片</string>
 
-    <string name="select_preset">選擇預定設置</string>
-
     <string name="selected">已選</string>
 
     <string name="send_crash_log">傳送報告</string>
@@ -755,8 +744,6 @@
 
     <string name="updating">更新中...</string>
 
-    <string name="upgrade_to_premium">升級至Premium</string>
-
     <string name="username">用戶名稱</string>
 
     <string name="version">版本</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -233,8 +233,6 @@
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
 
-    <string name="pref_only_lollipop">"只適用於 Lollipop。"</string>
-
     <string name="pref_summary_album_art_on_lockscreen">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
     <string name="pref_summary_audio_ducking">通知鈴聲、導航語音等。</string>
     <string name="pref_summary_blurred_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作。</string>

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

@@ -102,9 +102,6 @@
         <item>never</item>
     </array>
 
-    <array name="pref_album_detail_style_values">
-        <item>@layout/activity_album</item>
-    </array>
 
     <string-array name="pref_playlists_last_added_interval_titles">
         <item>@string/today</item>
@@ -174,29 +171,9 @@
         <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/1.png</item>
     </string-array>
 
-    <string-array name="pref_equalizer_types_titles">
-        <item>@string/system_equalizer</item>
-        <item>@string/retro_equalizer</item>
-    </string-array>
-
-    <string-array name="pref_equalizer_types_values">
-        <item>system</item>
-        <item>retro</item>
-    </string-array>
-
-    <array name="pref_album_details_style_titles">
-        <item>@string/normal</item>
-        <item>@string/small</item>
-    </array>
 
     <array name="pref_album_details_style_layout">
         <item>@layout/activity_album</item>
     </array>
 
-    <string-array name="pref_album_details_style_values">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-
 </resources>

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

@@ -9,8 +9,6 @@
     <color name="dark_grey">#121212</color>
     <color name="card_dark_color">#2C2D30</color>
     <color name="black_color">#121212</color>
-    <color name="card_black_color">#1E1E1E</color>
-    <color name="pitch_black">#000000</color>
 
     <color name="lightColorPrimary">#FFFFFF</color>
     <color name="lightColorOnPrimary">#202020</color>

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

@@ -2,7 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="status_bar_padding">0dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
-    <dimen name="default_item_margin">16dp</dimen>
 
     <dimen name="card_elevation">2dp</dimen>
 
@@ -11,30 +10,12 @@
 
     <dimen name="tab_height">48dp</dimen>
 
-    <dimen name="pause_bar_width">5dp</dimen>
-    <dimen name="pause_bar_distance">4dp</dimen>
-    <dimen name="pause_bar_height">16dp</dimen>
-
-
-    <dimen name="empty_text_size">20sp</dimen>
-
     <dimen name="notification_big_image_size">112dp</dimen>
 
-    <!-- MUST BE THE RESULT OF WIDTH PLUS INSET-->
-
-    <!-- ONLY 0dp WHILE THERE IS THE BUG IN DESIGN SUPPORT LIBRARY 22.2.0-->
-
-    <!-- For use with 24dp drawables in the item_list layouts-->
     <dimen name="list_item_image_icon_padding">8dp</dimen>
 
     <dimen name="mini_player_height">48dp</dimen>
 
-
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-    <!--App Widgets-->
     <dimen name="app_widget_classic_height">96dp</dimen>
     <dimen name="app_widget_classic_image_size">96dp</dimen>
     <dimen name="app_widget_classic_min_width">250dp</dimen>
@@ -50,24 +31,18 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
 
     <dimen name="app_widget_card_image_size">56dp</dimen>
     <dimen name="app_widget_card_min_width">250dp</dimen>
-    <dimen name="app_widget_card_min_height">64dp</dimen>
     <dimen name="app_widget_card_buttons_width">128dp</dimen>
     <dimen name="app_widget_card_radius">2dp</dimen>
     <dimen name="now_playing_top_margin">12dp</dimen>
 
     <dimen name="icon_notification_dimen">32dp</dimen>
-    <dimen name="horizontal_margin">0dp</dimen>
-    <dimen name="bottom_sheet_width">0dp</dimen>
     <dimen name="mini_player_height_expanded">104dp</dimen>
     <dimen name="progress_slider_height">30dp</dimen>
-    <dimen name="triple_and_half_margin">56dp</dimen>
-    <dimen name="four_dp">4dp</dimen>
     <dimen name="toolbar_margin_horizontal">8dp</dimen>
     <dimen name="toolbar_height">48dp</dimen>
     <dimen name="toolbar_margin_vertical">0dp</dimen>
     <dimen name="item_song_height">52dp</dimen>
     <dimen name="button_padding_vertical">10dp</dimen>
     <dimen name="button_margin_horizontal">4dp</dimen>
-    <dimen name="horizontal_padding_home">8dp</dimen>
     <dimen name="home_icon_padding">14dp</dimen>
 </resources>

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

@@ -11,9 +11,7 @@
     </string-array>
 
     <string name="app_name" translatable="false">Retro Music</string>
-    <string name="google_plus" translatable="false">Google Plus</string>
     <string name="git_hub" translatable="false">GitHub</string>
-    <string name="social_buttons" translatable="false">Social Buttons</string>
 
 
     <string name="app_shortcut_last_added_long" translatable="false">@string/last_added</string>

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

@@ -12,5 +12,4 @@
     <integer name="max_columns_land">6</integer>
 
     <integer name="anim_duration_medium">200</integer>
-    <integer name="options_height">240</integer>
 </resources>

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

@@ -1,17 +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.
-  -->
-
-<resources>
-    <bool name="is_dark_mode">false</bool>
-</resources>

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

@@ -35,7 +35,6 @@
     <string name="action_rename">Rename</string>
     <string name="action_save_playing_queue">Save playing queue</string>
     <string name="action_scan">Scan</string>
-    <string name="action_scan_directory">Scan directory</string>
     <string name="action_search">Search</string>
     <string name="action_set">Start</string>
     <string name="action_set_as_ringtone">Set as ringtone</string>
@@ -66,7 +65,6 @@
     <string name="album_or_artist_empty">The title or artist is empty.</string>
 
     <string name="albums">Albums</string>
-    <string name="albums_label">Albums</string>
 
 
     <string name="always">Always</string>
@@ -84,7 +82,6 @@
     <string name="artist">Artist</string>
 
     <string name="artists">Artists</string>
-    <string name="artists_label">Artists</string>
 
     <string name="audio_focus_denied">Audio focus denied.</string>
     <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
@@ -177,8 +174,6 @@
 
     <string name="dark_theme_name">Kinda Dark</string>
 
-    <string name="day_night_theme_name">Day Night(alpha)</string>
-
     <string name="default_hint">No Lyrics</string>
 
     <string name="delete_playlist_title">Delete playlist</string>
@@ -248,7 +243,6 @@
     <string name="genre">Genre</string>
 
     <string name="genres">Genres</string>
-    <string name="genres_label">Genres</string>
 
     <string name="git_hub_summary">Fork the project on GitHub</string>
 
@@ -267,7 +261,6 @@
     <string name="hinge">Hinge</string>
 
     <string name="history">History</string>
-    <string name="history_label">History</string>
 
     <string name="home">Home</string>
 
@@ -363,8 +356,6 @@
     <string name="now_playing_summary">Customize the now playing screen</string>
     <string name="now_playing_themes">9+ now playing themes</string>
 
-    <string name="on">On</string>
-
     <string name="only_on_wifi">Only on Wi-Fi</string>
 
     <string name="other_settings_summary">Advanced testing features</string>
@@ -402,7 +393,6 @@
     <string name="playlist_name_empty">Playlist name</string>
 
     <string name="playlists">Playlists</string>
-    <string name="playlists_label">Playlists</string>
 
     <string name="pref_album_detail_style">Album detail style</string>
     <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
@@ -423,7 +413,7 @@
     <string name="pref_keep_screen_on_title">Keep the screen on</string>
     <string name="pref_now_playing_screen_summary">Click to open with or slide to without transparent navigation of now playing screen</string>
     <string name="pref_now_playing_screen_title">Click or Slide</string>
-    <string name="pref_only_lollipop">"Only available on Lollipop."</string>
+
     <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
     <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
@@ -489,8 +479,6 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_user_info">User info</string>
 
-    <string name="premium">Get Premium</string>
-
     <string name="primary_color">Primary color</string>
     <string name="primary_color_desc">The primary theme color, defaults to blue grey, for now works with dark colors</string>
 
@@ -502,7 +490,6 @@
     <string name="purchase_summary">*Think before buying, don\'t ask for refund.</string>
 
     <string name="queue">Queue</string>
-    <string name="queue_label">Queue</string>
 
     <string name="rate_app">Rate the app</string>
     <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
@@ -551,8 +538,6 @@
     <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
     <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
     <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_pick_file">File access required. Pick %s</string>
-    <string name="saf_pick_sdcard">SD card access required. Please pick root directory of SD card</string>
     <string name="saf_write_failed">File write failed: %s</string>
 
     <string name="save">Save</string>
@@ -573,7 +558,6 @@
 
     <string name="select_all">Select all</string>
     <string name="select_banner_photo">Select banner photo</string>
-    <string name="select_preset">Select preset</string>
 
     <string name="selected">Selected</string>
 
@@ -658,7 +642,6 @@
 
     <string name="top_albums">Top albums</string>
     <string name="top_artists">Top artists</string>
-    <string name="top_tracks_label">Top Tracks</string>
 
     <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
     <string name="track_list">Track number</string>
@@ -679,8 +662,6 @@
 
     <string name="updating">Updating…</string>
 
-    <string name="upgrade_to_premium">Upgrade to premium</string>
-
     <string name="username">Username</string>
 
     <string name="version">Version</string>
@@ -709,4 +690,6 @@
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
 
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+
+    <string name="label_more_from">More from %s</string>
 </resources>

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

@@ -48,14 +48,6 @@
         <item name="android:letterSpacing">0.0125</item>
     </style>
 
-    <style name="ToolbarSubTitleTextAppearance">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
-
-    <style name="BigTitleTextAppearance">
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="BigTitleTextAppearanceToolbar">
         <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
         </item>
@@ -86,24 +78,6 @@
         <item name="android:fontFamily">@font/circular</item>
     </style>
 
-    <style name="MaterialShuffleButtonStyle" parent="Widget.MaterialComponents.Button.Icon">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_margin">16dp</item>
-        <item name="android:text">@string/action_shuffle_all</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="cornerRadius">25dp</item>
-        <item name="android:padding">16dp</item>
-        <item name="icon">@drawable/ic_shuffle_white_24dp</item>
-        <item name="backgroundTint">@color/md_red_400</item>
-        <item name="iconGravity">start</item>
-    </style>
-
-    <style name="NavigationViewTitleTextAppearance">
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
-    </style>
-
     <style name="Fab" parent="FabParent" />
 
     <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
@@ -124,44 +98,10 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="OptionButtonsStyle" parent="@style/Widget.MaterialComponents.Button.TextButton.Icon">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="iconPadding">16dp</item>
-        <item name="iconTint">?iconColor</item>
-        <item name="rippleColor">?iconColor</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingBottom">8dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="iconSize">12dp</item>
-    </style>
-
-    <style name="OptionButtonsTextStyle" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
     <style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
 
     </style>
 
-    <style name="AppTextAppearance.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <style name="AppTextField" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
-        <item name="boxBackgroundColor">@color/text_field_background</item>
-    </style>
-
-    <style name="CarTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimaryDark">@color/md_deep_purple_700</item>
-        <item name="colorAccent">@color/md_deep_purple_A400</item>
-        <item name="colorPrimary">@color/md_deep_purple_500</item>
-    </style>
-
     <style name="TextViewNormal">
         <item name="android:fontFamily">@font/circular</item>
         <item name="android:textSize">14sp</item>
@@ -183,10 +123,6 @@
         <item name="android:fontFamily">@font/circular</item>
     </style>
 
-    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
-
     <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="android:fontFamily">@font/circular</item>
     </style>
@@ -213,11 +149,6 @@
         <item name="android:fontFamily">@font/circular</item>
     </style>
 
-
-    <style name="ChipFont" parent="TextAppearance.MaterialComponents.Chip">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
-
     <style name="TopCornerCardView">
         <item name="cornerFamilyTopLeft">rounded</item>
         <item name="cornerFamilyTopRight">rounded</item>

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

@@ -172,39 +172,6 @@
         <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>
     </style>
 
-    <!-- set the rounded drawable as background to your bottom sheet -->
-    <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/bg_bottom_sheet_dialog_fragment</item>
-    </style>
-
-    <style name="BaseBottomSheetDialog" parent="@style/Theme.Design.Light.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="bottomSheetStyle">@style/BottomSheet</item>
-    </style>
-
-    <style name="BaseBottomSheetDialogDark" parent="@style/Theme.Design.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="bottomSheetStyle">@style/BottomSheet</item>
-    </style>
-
-    <style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">?cardBackgroundColor</item>
-    </style>
-
-    <style name="BottomSheetDialogThemeDark" parent="BaseBottomSheetDialogDark">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">?cardBackgroundColor</item>
-    </style>
-
-    <style name="BottomSheetDialog" parent="Theme.Design.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
-    </style>
-
-    <style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
     <style name="FabParent">
         <item name="borderWidth">0dp</item>
         <item name="android:layout_width">wrap_content</item>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="transition_album_art" translatable="false">album_art_transition</string>
     <string name="transition_user_image" translatable="false">user_image_transition</string>
-    <string name="transition_album_name" translatable="false">album_art_transition</string>
+    <string name="transition_album_name" translatable="false" tools:keep="@string/transition_album_name">album_art_transition</string>
-    <string name="transition_album_text" translatable="false">album_art_transition</string>
+    <string name="transition_album_text" translatable="false" tools:keep="@string/transition_album_text">album_art_transition</string>
     <string name="transition_artist_image" translatable="false">artist_image_transition</string>
-    <string name="transition_artist_name" translatable="false">artist_image_transition</string>
+    <string name="transition_artist_name" translatable="false" tools:keep="@string/transition_artist_name">artist_image_transition</string>
-    <string name="transition_artist_text" translatable="false">artist_image_transition</string>
+    <string name="transition_artist_text" translatable="false" tools:keep="@string/transition_artist_text">artist_image_transition</string>
     <string name="transition_mini_player" translatable="false">mini_player_transition</string>
     <string name="transition_toolbar" translatable="false">toolbar_transition</string>
     <string name="transition_lyrics" translatable="false">toolbar_transition</string>

app/src/main/res/xml/allowed_media_browser_callers.xml

@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2017 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
-  If you add a new signing_certificate to allowed_callers and you don't know its signature,
-  PackageValidator by default will print to logcat (INFO level) a message with the proper base64
-  version of the caller's certificate that has not been validated. You can copy from logcat and
-  paste it here.
-  Spaces and newlines are ignored.
--->
-<allowed_callers>
-    <signing_certificate
-        name="Android Auto"
-        package="com.google.android.projection.gearhead"
-        release="false">
-        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
-        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
-        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
-        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
-        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
-        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
-        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
-        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
-        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
-        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
-        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
-        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
-        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
-        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
-        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
-        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
-    </signing_certificate>
-    <signing_certificate
-        name="Android Auto"
-        package="com.google.android.projection.gearhead"
-        release="false">
-        MIIDvTCCAqWgAwIBAgIJAOfkBvDXw5bzMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
-        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
-        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDERMA8G
-        A1UEAwwIZ2VhcmhlYWQwHhcNMTQwNTI3MjMwMjUxWhcNNDExMDEyMjMwMjUxWjB1
-        MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
-        bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJv
-        aWQxETAPBgNVBAMMCGdlYXJoZWFkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-        CgKCAQEAou7wwBKFyznqpRretJ3EVp55/Yr049Ag5wlGvrCnjIP8DrMrU+skfKe1
-        DmwpsLNtnhhiNH+J000Lok3hc8jdWKeKOopzKGDNvL/HvnS70Zyk26gj9jtMMHz9
-        2aZdpmwD67FNmTlG2FERr+TwMD5agaPnsFR2zla6ugUvHGzz65YDxpCZsQ/TowyD
-        LnxgMagvhvS+Oex3yh2FN7pJfwS03KdGdkWPbLqf9Fem09s5jjeZW/O3RgnKoRPI
-        J4QLK70efjAZqJyBGcDZyQMwOs+8HIknraf8+cRZJDzqOx7rttl8M3KGB2EFljTp
-        6/FyxJLnAo6QlXn7GrYalTI0yLU9dQIDAQABo1AwTjAdBgNVHQ4EFgQU9QPJ5xJE
-        DA8MDQMrj0hm2/A2BRkwHwYDVR0jBBgwFoAU9QPJ5xJEDA8MDQMrj0hm2/A2BRkw
-        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEADcr5h1FR8IpmN4hSsUA9
-        SnCQVyXa1GQhzpQgRbF+npkgOn2Mebp8bd28VpfgooD2OBNQXCUcZkn7pWj++ut9
-        HhObHVaV5FNg0pdDqLna9QZ9Y4oS+ZrijK70XZ/EjlYUHvhu0pIjZAbD8CmCFlow
-        SR55qCSjM5iS37LZB32SMr1BBiYrNAvncKjYQVK8ctTRzhpNQQPBgXBA98Xl+d1D
-        Py00JWQuF0ssmhKcJuvfdEnFF7Hvaxz/gCQ9nzarQI3CJB8dOXVwF8mcyDRBz4JR
-        +YDpXo6BD+fGt15ov+zmqC8xaT9P1/JgoDXiMhy/6rwgdi9WxPf8mb7TnBC+CksX
-        0A==
-    </signing_certificate>
-    <signing_certificate
-        name="Android Auto"
-        package="com.google.android.projection.gearhead"
-        release="true">
-        MIIDvTCCAqWgAwIBAgIJAMePnkuTQTAGMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
-        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
-        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDERMA8G
-        A1UEAwwIZ2VhcmhlYWQwHhcNMTQwNTI3MjMwNTM0WhcNNDExMDEyMjMwNTM0WjB1
-        MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
-        bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJv
-        aWQxETAPBgNVBAMMCGdlYXJoZWFkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-        CgKCAQEA050XDkNIsVRMX2wTvVplpCu4OtnyNK2v5B7PS+DggmH2yuZiwpTurdKD
-        Q9R9UzxH9U4lsC+mIxXkiBYKIWNVgMtiTgxkEy7cgWvdYHgNYpFu8IxZKYDyXes+
-        02pfvpu63MIBD/PnvVFipo1oUrbfetj+mroEpjnA71gUS0Ok+H6XWWsmb8xFHQVM
-        oZWEIzsUJ2nhm8EcnPkAPfNZAG++XLPROoRQCaswyYsd42JuYAP3CwZuhDcUbMWm
-        k7rBi9BVQ8gmkrbwqo94A7qStLUp3NyCmlKSWHaZ05SspEPwsfctka0oXG5bhgT6
-        67EMCzQ+YsFN1oJRL7Qq+mMQjFJs3wIDAQABo1AwTjAdBgNVHQ4EFgQUGvBfYNeu
-        6JSJUnJZCiaBGsnXztswHwYDVR0jBBgwFoAUGvBfYNeu6JSJUnJZCiaBGsnXztsw
-        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAlGsDY0EPu3NBSH5k6iw/
-        wJh9e3xMwS17ErKGlhyWogxJMzLjAN6g0aCPHxB40IQC+8qAl+RL7VQx6oxttf0m
-        31yUGQPcNYbt2CxBTCAr885oLK5t2TAi5tQzhd6ZEYihWSUWUd/X8BQRouxboss9
-        QbBA/iIx0OpDaxiAcq7Cb67TheXZDxGuQ8fmHYbLx84pEvm3DQOB/LIMkkpQSfEC
-        1f+oP1zB3urPU/dSvED/LCgOdrpxZ5di7SwSyue+Vq/TZQy34tPygEzD2d8hFlh/
-        yfhWkMizOeIXcayVAQdNn5zpBkuay1skGOjQQ5kTbDcDzigO2R2rqn6HCd9l5Z0W
-        IQ==
-    </signing_certificate>
-    <signing_certificate
-        name="Android Wear"
-        package="com.google.android.wearable.app"
-        release="false">
-        MIIDvzCCAqegAwIBAgIJANqYw9kVc9PvMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
-        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
-        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDESMBAG
-        A1UEAwwJQ2xvY2tXb3JrMB4XDTE0MDMwNzIyMDExOFoXDTQxMDcyMzIyMDExOFow
-        djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1v
-        dW50YWluIFZpZXcxFDASBgNVBAoMC0dvb2dsZSBJbmMuMRAwDgYDVQQLDAdBbmRy
-        b2lkMRIwEAYDVQQDDAlDbG9ja1dvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-        ggEKAoIBAQDcHW9LKO04MBSynIL22v/THd57jB5jCEBlC1ixZaNqrrYscVOVLgRF
-        Ca+CH5S6n08YZMOntdZTzAAVnQAQ4eVm+jeq/xg2Xa57SoXdsfODzEdwoj6VYpH+
-        tXLBaTFar0706qWuhh/N1ufl6tQxE3RGRgx8KPsyLJKVXFx6qJV3w3A/l+CYt362
-        oG6sa3LqoK0hCrAqH9z8dmJ0dEGpPzzqihb0jJciweMyQTJ+wsn3MDEujRvv7ikL
-        RRo0iSys71sUctbZfvlUKMyK1e8EuMTx9Q3SQtVdclhmhVBbXksbHlmtjB2FL6CC
-        SBVnO8bmQynsxOrU24RkqWsxg5+f28kHAgMBAAGjUDBOMB0GA1UdDgQWBBSEhUcQ
-        hKQ8s+r4P6shYqCVAM4sejAfBgNVHSMEGDAWgBSEhUcQhKQ8s+r4P6shYqCVAM4s
-        ejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAHOWILon0qD1SIQ60b
-        YI4cKdkBKIHq/D/WKF9fYmqXPvBX5pfusqxcouYFyj0z9ZCZa4sAMsRH5lAPJb0X
-        yvmVAzmDQMjubNy1O+3ksfJI59AgmZ6B58rqpTLP2pn+SqXtQEBORPdb79J/yts1
-        uLIblHhGXhci8nr7KwtuFY5ExKsMT2V7Gdd9j1PJz7nuLU9FtlTgEryN6YHkwuLD
-        055RkwPYrk0swchijXhXrnU/HXsCo6cFeMYF4wUcbB2pSRrOE7uI0H2BfdSUJlGX
-        hK6WlaRHNQ2J60BekPKr82auL8pY0va/Hb9LHEie4KABVN/PAiUS9aHHIp5zHePw
-        R9b4
-    </signing_certificate>
-    <signing_certificate
-        name="Android Wear"
-        package="com.google.android.wearable.app"
-        release="true">
-        MIIFYTCCA0sCBgFEnpGW0zALBgkqhkiG9w0BAQUwdjELMAkGA1UEBhMCVVMxEzAR
-        BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNV
-        BAoTC0dvb2dsZSBJbmMuMRAwDgYDVQQLEwdBbmRyb2lkMRIwEAYDVQQDEwlDbG9j
-        a1dvcmswHhcNMTQwMzA3MjIwMjI1WhcNMzgwMTE5MDMxNDA3WjB2MQswCQYDVQQG
-        EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmll
-        dzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEjAQBgNV
-        BAMTCUNsb2NrV29yazCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALo8
-        fzkL/lmKYrz8izyUxidamRXt3N03OlVqmQvi/UP3nxizAdJAJ+NyfwnO/eKcfCaw
-        iiDeNn0a3+NOp4+uN/OQ9eAmcnpOCCg773b49kO8FSc2oEg/ybeRq1I8872Ge2Yt
-        KidMANiQ550R6LAmX+2pddzI5UKZiY6QE2picYwuCy85eVHbJLFXob/nxWvOSjgL
-        Jfq5JmM+qJQEOOC2lAu5nol+LvoFPDIpm9lhb6S9loIhezdDH83Ygu0hp/LwRn/g
-        lRy8Wphi40oVa+FaF/8CF5hkRNYTsR7XX4OAGO60/ZTkj1rjHOSvpDY4tpcshVzS
-        2woBxDJhKOTFGXq+rMxtwuitpEJfD5DVpaVYJGG/eBHhLs4O6gYDP5ZUOe3gcf/E
-        bCDy374jIzp/ZMHOCa2hy85r9ryiLpuYnErAyWqdbHVP7Bhx2HsQmMGg3mC8fXfe
-        MNVOuEfOaxJ8GR6nk28KRsFG8za5NOq6Wl8cA2S3UpZVRDJQ/WOq5Xvrq+AmPwkI
-        TRlEBgw62bu6f3n03jwrLTe6sw1LuRHcUWngr5VS9NOOPbPyy4AcUgJScGG/AbBC
-        0H6J5I8RqaqgJ/BElZ7aKMXd2FNXpx45u4JRs1frb3IY/MwXGIGmMGdGMeBVlDka
-        emea8lqgYgHWIrjQCd0R1QaiAw8kJ65n2Bs0N3l5AgMBAAEwCwYJKoZIhvcNAQEF
-        A4ICAQCkxJaWNGHIlTWlsQrNASQ3aonaJ0OdrDADSGcLICut4z8vuioHZAO1C+hx
-        yiqym769u8QG2wk5QcmMF2oORv+Q/wAWFgREgG7cguEw/hCGHuMFnbd+PZ2poq00
-        qdK02hsm/VpbcBzVbP7pZHrkFDuXpnwCgGWxf54U8jKl7xfhZKFJF5KWlBwwvVo2
-        q/jzQsjjr7xvSUNzB31qnBHXOSINWte1GS+bHP6Wj0pysbhUdeDpiL5ocohmZbEr
-        9O7DIlZU9eHyK4vrVY6+ZneL1l8JkS35XoCd/u8Px+rKXQ6+HUEEH+cgyzKbMH45
-        LhOX8SA5VGkwhIt/AhdAiS32x6By5984usPXIjVv5lR/anxXit9nyT0rNYiTVDXw
-        +aETzi3szW2hncNLQYLsrtYg61KFMCXF4ATstFG8ReFIWsw2f7ZJkq9ZTFUbC8k4
-        y9Ya1WdZkCD3OmXhqcikiNusgx7rkY8MkikJXt5BBXs8rupOFsW5RUuS4lmKEbSU
-        oh8/er+DwGf0GC6YQZuk5JOKNIDwhi/tr1dySlUzV4/aX7PN/PlUgH//2MlRd+d1
-        BKZCvlzboOEAZfx8aBKc7SezqATXpM3ZDNPsywWoyIpgmtBWoE60ih4Flf05XB+n
-        e7MdpSQ0Xgq9TgG1BoJP6rpC0y3Ukmc+z8AXnYYdJunNXEbv0A==
-    </signing_certificate>
-    <signing_certificate
-        name="Android Auto Simulator"
-        package="com.google.android.autosimulator"
-        release="true">
-        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
-        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
-        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
-        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
-        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
-        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
-        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
-        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
-        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
-        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
-        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
-        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
-        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
-        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
-        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
-        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
-    </signing_certificate>
-    <signing_certificate
-        name="Google"
-        package="com.google.android.googlequicksearchbox"
-        release="false">
-        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
-        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
-        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
-        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
-        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
-        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
-        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
-        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
-        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
-        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
-        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
-        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
-        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
-        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
-        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
-        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
-        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
-        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
-        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
-        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
-        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
-        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
-        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
-        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
-        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
-    </signing_certificate>
-    <signing_certificate
-        name="Google"
-        package="com.google.android.googlequicksearchbox"
-        release="true">
-        MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNV
-        BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBW
-        aWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4G
-        A1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQx
-        CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3Vu
-        dGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9p
-        ZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgC
-        ggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JO
-        Rland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/
-        8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfY
-        wXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LW
-        uT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0z
-        OHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Yl
-        mn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14al
-        oXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-        BxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsT
-        B0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTAD
-        AQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4
-        rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCE
-        yj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh
-        5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTb
-        Qe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZM
-        cUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
-    </signing_certificate>
-</allowed_callers>

appthemehelper/src/main/res/drawable/ate_track.xml

@@ -1,40 +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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:state_enabled="true">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <stroke android:width="2dp" android:color="@color/md_white_1000" />
-            <corners android:radius="25dp" />
-            <size android:width="2dp" />
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-    <item android:state_checked="true" android:state_enabled="true">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <stroke android:width="2dp" android:color="@color/md_deep_purple_A700" />
-            <corners android:radius="25dp" />
-            <size android:width="2dp" />
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <stroke android:width="2dp" android:color="?colorOnSecondary" />
-            <corners android:radius="25dp" />
-            <size android:width="2dp" />
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-</selector>

appthemehelper/src/main/res/drawable/toggle_switch.xml

@@ -1,40 +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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:state_enabled="true">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <solid android:color="@color/md_white_1000" />
-            <corners android:radius="10dp" />
-            <size android:width="20dp" android:height="20dp" />
-            <stroke android:width="8dp" android:color="#0000ffff" />
-        </shape>
-    </item>
-    <item android:state_checked="true" android:state_enabled="true">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <solid android:color="@color/md_white_1000" />
-            <corners android:radius="10dp" />
-            <size android:width="20dp" android:height="20dp" />
-            <stroke android:width="8dp" android:color="#0000ffff" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <solid android:color="?colorOnSecondary" />
-            <corners android:radius="10dp" />
-            <size android:width="20dp" android:height="20dp" />
-            <stroke android:width="8dp" android:color="#0000ffff" />
-        </shape>
-    </item>
-</selector>

appthemehelper/src/main/res/layout/ate_preference_category.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:paddingStart="72dp"
-    android:paddingLeft="16dp"
-    android:paddingTop="16dp"
-    android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
-    android:textColor="?android:textColorSecondary"
-    tools:ignore="RtlSymmetry"
-    tools:text="@string/app_name" />

appthemehelper/src/main/res/layout/ate_preference_checkbox.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.appthemehelper.common.views.ATECheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="6dp"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false" />

appthemehelper/src/main/res/layout/two_lines_list_preference_row.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/custom_list_view_row_table_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:paddingLeft="10dip"
-    android:paddingTop="8dip"
-    android:paddingRight="10dip"
-    android:paddingBottom="8dip">
-
-    <ImageView
-        android:id="@+id/custom_list_view_row_selected_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="40dip"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="TODO"
-        android:src="@drawable/ic_toggle_switch" />
-
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:padding="0dip">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/custom_list_view_row_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textColor="#000000" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/custom_list_view_row_subtext_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textColor="#000000"
-            android:textSize="12sp" />
-    </LinearLayout>
-</TableRow>

appthemehelper/src/main/res/values/colors_material_design.xml

@@ -3,20 +3,14 @@
 
 
     <!-- Red -->
-    <color name="md_red_200">#EF9A9A</color>
     <color name="md_red_400">#EF5350</color>
     <color name="md_red_500">#F44336</color>
-    <color name="md_red_A700">#D50000</color>
     <color name="md_red_A400">#FF1744</color>
-    <color name="md_red_500A12">#30F44336</color>
 
     <!-- Pink -->
-    <color name="md_pink_500">#E91E63</color>
-    <color name="md_pink_A400">#F50057</color>
 
     <!-- Yellow -->
     <color name="md_yellow_A400">#FFD600</color>
-    <color name="md_yellow_500A12">#30FFEB3B</color>
 
 
     <!-- Deep Purple -->
@@ -27,52 +21,35 @@
     <color name="md_deep_purple_600">#5E35B1</color>
     <color name="md_deep_purple_700">#512DA8</color>
     <color name="md_deep_purple_800">#4527A0</color>
-    <color name="md_deep_purple_500A12">#30673AB7</color>
     <color name="md_deep_purple_500">#673AB7</color>
-    <color name="md_deep_purple_A700">#6200EA</color>
     <color name="md_deep_purple_A200">#7C4DFF</color>
 
     <!-- Indigo -->
-    <color name="md_indigo_500">#3F51B5</color>
-    <color name="md_indigo_300">#7986CB</color>
-    <color name="md_indigo_400">#5C6BC0</color>
-    <color name="md_indigo_600">#3949AB</color>
-    <color name="md_indigo_700">#303F9F</color>
-    <color name="md_indigo_800">#283593</color>
 
 
     <!-- Blue -->
-    <color name="md_blue_200">#90CAF9</color>
     <color name="md_blue_500">#2196F3</color>
     <color name="md_blue_A200">#448AFF</color>
     <color name="md_blue_A400">#2979FF</color>
-    <color name="md_blue_A700">#2962FF</color>
-    <color name="md_blue_500A12">#302196F3</color>
 
 
     <color name="md_green_A200">#69F0AE</color>
     <color name="md_green_A700">#00C853</color>
     <color name="md_green_500">#4CAF50</color>
-    <color name="md_green_500A12">#304CAF50</color>
 
 
     <color name="md_grey_200">#EEEEEE</color>
     <color name="md_grey_400">#BDBDBD</color>
     <color name="md_grey_500">#9E9E9E</color>
-    <color name="md_grey_700">#616161</color>
     <color name="md_grey_800">#424242</color>
     <color name="md_grey_900">#212121</color>
 
 
-    <color name="md_blue_grey_800">#37474F</color>
-
-
     <color name="md_black_1000">#000000</color>
     <color name="md_white_1000">#FFFFFF</color>
 
 
     <color name="md_teal_A400">#1DE9B6</color>
     <color name="md_deep_orange_A400">#FF3D00</color>
-    <color name="md_orange_A400">#FF9100</color>
     <color name="md_light_green_A400">#76FF03</color>
 </resources>

appthemehelper/src/main/res/values/dimens.xml

@@ -3,9 +3,6 @@
 
     <dimen name="ate_circleview_border">1dp</dimen>
 
-    <dimen name="ate_default_textsize_subheading">16sp</dimen>
-    <dimen name="ate_default_textsize_body">14sp</dimen>
-
     <dimen name="ate_preference_inset">16dp</dimen>
 
 </resources>