Merge 0536cb43bc into abfde872f1

2025-10-03 09:49:21 +02:00 · 2025-09-22 14:16:03 +00:00 · 2025-09-22 14:16:03 +00:00 · 0fbab9c2b1
commit 0fbab9c2b1
parent abfde872f1 0536cb43bc
142 changed files with 390 additions and 530 deletions
--- a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
@ -4,7 +4,6 @@ import static org.schabi.newpipe.util.SparseItemUtil.fetchStreamInfoAndSaveToDat
 import static org.schabi.newpipe.util.external_communication.ShareUtils.shareText;

 import android.content.Context;
-import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.PopupMenu;

@ -30,10 +29,7 @@ public final class QueueItemMenuUtil {
                                     final boolean hideDetails,
                                     final FragmentManager fragmentManager,
                                     final Context context) {
-        final ContextThemeWrapper themeWrapper =
-                new ContextThemeWrapper(context, R.style.DarkPopupMenu);
-
-        final PopupMenu popupMenu = new PopupMenu(themeWrapper, view);
+        final PopupMenu popupMenu = new PopupMenu(context, view);
        popupMenu.inflate(R.menu.menu_play_queue_item);

        if (hideDetails) {
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
@ -9,9 +9,11 @@ import org.schabi.newpipe.R
 import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
 import org.schabi.newpipe.ui.screens.AboutScreen
 import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.util.ThemeHelper

 class AboutActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(ThemeHelper.getTheme(this))
        enableEdgeToEdge()
        super.onCreate(savedInstanceState)

--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@ -70,7 +70,6 @@ import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
-import org.schabi.newpipe.util.ThemeHelper;

 import java.io.File;
 import java.io.IOException;
@ -212,7 +211,6 @@ public class DownloadDialog extends DialogFragment
        // dialog is being dismissed in onViewCreated()
        context = getContext();

-        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
        Bridge.restoreInstanceState(this, savedInstanceState);

        this.audioTrackAdapter = new AudioTrackAdapter(wrappedAudioTracks);
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@ -9,8 +9,6 @@ import static com.google.android.material.tabs.TabLayout.INDICATOR_GRAVITY_TOP;

 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@ -21,7 +19,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;

-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@ -44,7 +41,6 @@ import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.ScrollableTabLayout;

 import java.util.ArrayList;
@ -242,18 +238,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte

        tabLayout.setLayoutParams(tabParams);
        viewPager.setLayoutParams(pagerParams);
-
-        // change the background and icon color of the tab layout:
-        // service-colored at the top, app-background-colored at the bottom
-        tabLayout.setBackgroundColor(ThemeHelper.resolveColorFromAttr(requireContext(),
-                bottom ? android.R.attr.windowBackground : R.attr.colorPrimary));
-
-        @ColorInt final int iconColor = bottom
-                ? ThemeHelper.resolveColorFromAttr(requireContext(), android.R.attr.colorAccent)
-                : Color.WHITE;
-        tabLayout.setTabRippleColor(ColorStateList.valueOf(iconColor).withAlpha(32));
-        tabLayout.setTabIconTint(ColorStateList.valueOf(iconColor));
-        tabLayout.setSelectedTabIndicatorColor(iconColor);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
@ -9,8 +9,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.content.pm.ActivityInfo
+import android.content.res.ColorStateList
 import android.database.ContentObserver
-import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
@ -44,6 +44,7 @@ import androidx.core.net.toUri
 import androidx.core.os.postDelayed
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
 import androidx.preference.PreferenceManager
 import coil3.util.CoilUtils
 import com.evernote.android.state.State
@ -269,7 +270,7 @@ class VideoDetailFragment :
    ): View {
        val newBinding = FragmentVideoDetailBinding.inflate(inflater, container, false)
        nullableBinding = newBinding
-        return newBinding.getRoot()
+        return newBinding.root
    }

    override fun onPause() {
@ -555,6 +556,13 @@ class VideoDetailFragment :
        binding.viewPager.setAdapter(pageAdapter)
        binding.tabLayout.setupWithViewPager(binding.viewPager)

+        val controlTint = ColorStateList.valueOf(
+            ThemeHelper.resolveColorFromAttr(activity, android.R.attr.colorPrimary)
+        )
+        ImageViewCompat.setImageTintList(binding.overlayPlayPauseButton, controlTint)
+        ImageViewCompat.setImageTintList(binding.overlayPlayQueueButton, controlTint)
+        ImageViewCompat.setImageTintList(binding.overlayCloseButton, controlTint)
+
        binding.detailThumbnailRootLayout.requestFocus()

        binding.detailControlsPlayWithKodi.isVisible =
@ -1785,9 +1793,6 @@ class VideoDetailFragment :
        }
        activity.window.decorView.systemUiVisibility = 0
        activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        activity.window.statusBarColor = ThemeHelper.resolveColorFromAttr(
-            requireContext(), android.R.attr.colorPrimary
-        )
    }

    private fun hideSystemUi() {
@ -1819,11 +1824,6 @@ class VideoDetailFragment :
            visibility = visibility or View.SYSTEM_UI_FLAG_FULLSCREEN
        }
        activity.window.decorView.systemUiVisibility = visibility
-
-        if (isInMultiWindow || this.isFullscreen) {
-            activity.window.statusBarColor = Color.TRANSPARENT
-            activity.window.navigationBarColor = Color.TRANSPARENT
-        }
        activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
    }

--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
@ -14,7 +14,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.DialogEditTextBinding;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.util.ThemeHelper;

 import java.util.List;

@ -45,30 +44,25 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
            return super.onCreateDialog(savedInstanceState);
        }

-        final DialogEditTextBinding dialogBinding =
-                DialogEditTextBinding.inflate(getLayoutInflater());
-        dialogBinding.getRoot().getContext().setTheme(ThemeHelper.getDialogTheme(requireContext()));
+        final var dialogBinding = DialogEditTextBinding.inflate(getLayoutInflater());
        dialogBinding.dialogEditText.setHint(R.string.name);
        dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);

-        final Builder dialogBuilder = new Builder(requireContext(),
-                ThemeHelper.getDialogTheme(requireContext()))
+        return new Builder(requireContext())
                .setTitle(R.string.create_playlist)
                .setView(dialogBinding.getRoot())
                .setCancelable(true)
                .setNegativeButton(R.string.cancel, null)
                .setPositiveButton(R.string.create, (dialogInterface, i) -> {
                    final String name = dialogBinding.dialogEditText.getText().toString();
-                    final LocalPlaylistManager playlistManager =
-                            new LocalPlaylistManager(NewPipeDatabase.getInstance(requireContext()));
+                    final var db = NewPipeDatabase.getInstance(requireContext());
                    final Toast successToast = Toast.makeText(getActivity(),
-                            R.string.playlist_creation_success,
-                            Toast.LENGTH_SHORT);
+                            R.string.playlist_creation_success, Toast.LENGTH_SHORT);

-                    playlistManager.createPlaylist(name, getStreamEntities())
+                    new LocalPlaylistManager(db).createPlaylist(name, getStreamEntities())
                            .observeOn(AndroidSchedulers.mainThread())
                            .subscribe(longs -> successToast.show());
-                });
-        return dialogBuilder.create();
+                })
+                .create();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@ -39,7 +39,6 @@ import org.schabi.newpipe.local.subscription.item.ImportSubscriptionsHintPlaceho
 import org.schabi.newpipe.local.subscription.item.PickerIconItem
 import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
 import org.schabi.newpipe.util.DeviceUtils
-import org.schabi.newpipe.util.ThemeHelper
 import java.io.Serializable

 class FeedGroupDialog : DialogFragment(), BackPressable {
@ -80,7 +79,6 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
        super.onCreate(savedInstanceState)
        Bridge.restoreInstanceState(this, savedInstanceState)

-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
        groupId = arguments?.getLong(KEY_GROUP_ID, NO_GROUP_SELECTED) ?: NO_GROUP_SELECTED
    }

--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt
@ -21,7 +21,6 @@ import org.schabi.newpipe.databinding.DialogFeedGroupReorderBinding
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.ProcessingEvent
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.SuccessEvent
 import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem
-import org.schabi.newpipe.util.ThemeHelper
 import java.util.Collections

 class FeedGroupReorderDialog : DialogFragment() {
@ -39,8 +38,6 @@ class FeedGroupReorderDialog : DialogFragment() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        Bridge.restoreInstanceState(this, savedInstanceState)
-
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
    }

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
--- a/app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
@ -41,7 +41,6 @@ import android.widget.SeekBar;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.graphics.BitmapCompat;
@ -179,13 +178,10 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
        binding.playbackSeekBar.getProgressDrawable()
                .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY));

-        final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(context,
-                R.style.DarkPopupMenu);
-
-        qualityPopupMenu = new PopupMenu(themeWrapper, binding.qualityTextView);
-        audioTrackPopupMenu = new PopupMenu(themeWrapper, binding.audioTrackTextView);
+        qualityPopupMenu = new PopupMenu(context, binding.qualityTextView);
+        audioTrackPopupMenu = new PopupMenu(context, binding.audioTrackTextView);
        playbackSpeedPopupMenu = new PopupMenu(context, binding.playbackSpeed);
-        captionPopupMenu = new PopupMenu(themeWrapper, binding.captionTextView);
+        captionPopupMenu = new PopupMenu(context, binding.captionTextView);

        binding.progressBarLoadingPanel.getIndeterminateDrawable()
                .setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
@ -10,7 +10,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.compose.ui.platform.ComposeView;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@ -22,7 +21,6 @@ import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
 import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
-import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.image.CoilHelper;

 import java.util.List;
@ -77,12 +75,6 @@ public class SelectChannelFragment extends DialogFragment {
    // Init
    //////////////////////////////////////////////////////////////////////////*/

-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
    @Override
    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
                             final Bundle savedInstanceState) {
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java
@ -1,6 +1,5 @@
 package org.schabi.newpipe.settings;

-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@ -10,7 +9,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -20,7 +18,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.AppDatabase;
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
 import org.schabi.newpipe.error.ErrorUtil;
-import org.schabi.newpipe.util.ThemeHelper;

 import java.util.List;
 import java.util.Vector;
@ -52,10 +49,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 */

 public class SelectFeedGroupFragment extends DialogFragment {
-
-    private OnSelectedListener onSelectedListener = null;
-    private OnCancelListener onCancelListener = null;
-
+    private OnSelectedListener onSelectedListener;
    private ProgressBar progressBar;
    private TextView emptyView;
    private RecyclerView recyclerView;
@ -66,20 +60,10 @@ public class SelectFeedGroupFragment extends DialogFragment {
        onSelectedListener = listener;
    }

-    public void setOnCancelListener(final OnCancelListener listener) {
-        onCancelListener = listener;
-    }
-
    /*//////////////////////////////////////////////////////////////////////////
    // Init
    //////////////////////////////////////////////////////////////////////////*/

-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
    @Override
    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
                             final Bundle savedInstanceState) {
@ -109,14 +93,6 @@ public class SelectFeedGroupFragment extends DialogFragment {
    // Handle actions
    //////////////////////////////////////////////////////////////////////////*/

-    @Override
-    public void onCancel(@NonNull final DialogInterface dialogInterface) {
-        super.onCancel(dialogInterface);
-        if (onCancelListener != null) {
-            onCancelListener.onCancel();
-        }
-    }
-
    private void clickedItem(final int position) {
        if (onSelectedListener != null) {
            final FeedGroupEntity entry = feedGroups.get(position);
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
@ -8,7 +8,6 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@ -20,7 +19,6 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;

 import java.util.List;
 import java.util.Vector;
@ -59,12 +57,6 @@ public class SelectKioskFragment extends DialogFragment {
    // Init
    //////////////////////////////////////////////////////////////////////////*/

-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
    @Override
    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                             final Bundle savedInstanceState) {
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@ -86,9 +86,9 @@ public class SettingsActivity extends AppCompatActivity implements

    @Override
    protected void onCreate(final Bundle savedInstanceBundle) {
-        setTheme(ThemeHelper.getSettingsThemeStyle(this));
-
+        setTheme(ThemeHelper.getTheme(this));
        super.onCreate(savedInstanceBundle);
+
        Bridge.restoreInstanceState(this, savedInstanceBundle);
        final boolean restored = savedInstanceBundle != null;

--- a/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt
@ -8,11 +8,9 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview

@ -28,14 +26,6 @@ fun ScaffoldWithToolbar(
        topBar = {
            TopAppBar(
                title = { Text(text = title) },
-                // TODO decide whether to use default colors instead
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    scrolledContainerColor = MaterialTheme.colorScheme.primaryContainer,
-                    navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-                    titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-                    actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-                ),
                navigationIcon = {
                    IconButton(onClick = onBackClick) {
                        Icon(
--- a/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
@ -44,10 +44,7 @@ fun AboutScreen(padding: PaddingValues) {
            tabIndex = pagerState.currentPage
        }

-        TabRow(
-            selectedTabIndex = tabIndex,
-            containerColor = MaterialTheme.colorScheme.primaryContainer
-        ) {
+        TabRow(selectedTabIndex = tabIndex) {
            TITLES.forEachIndexed { index, titleId ->
                Tab(
                    text = { Text(text = stringResource(titleId)) },
--- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@ -90,29 +90,6 @@ public final class ThemeHelper {
                && !isDeviceDarkThemeEnabled(context));
    }

-    /**
-     * Return a dialog theme styled according to the (default) selected theme.
-     *
-     * @param context context to get the selected theme
-     * @return the dialog style (the default one)
-     */
-    @StyleRes
-    public static int getDialogTheme(final Context context) {
-        return isLightThemeSelected(context) ? R.style.LightDialogTheme : R.style.DarkDialogTheme;
-    }
-
-    /**
-     * Return a min-width dialog theme styled according to the (default) selected theme.
-     *
-     * @param context context to get the selected theme
-     * @return the dialog style (the default one)
-     */
-    @StyleRes
-    public static int getMinWidthDialogTheme(final Context context) {
-        return isLightThemeSelected(context) ? R.style.LightDialogMinWidthTheme
-                : R.style.DarkDialogMinWidthTheme;
-    }
-
    /**
     * Return the selected theme styled according to the serviceId.
     *
@ -181,35 +158,33 @@ public final class ThemeHelper {
    }

    @StyleRes
-    public static int getSettingsThemeStyle(final Context context) {
+    public static int getTheme(@NonNull final Context context) {
        final Resources res = context.getResources();
        final String lightTheme = res.getString(R.string.light_theme_key);
        final String blackTheme = res.getString(R.string.black_theme_key);
        final String automaticDeviceTheme = res.getString(R.string.auto_device_theme_key);
-
-
        final String selectedTheme = getSelectedThemeKey(context);

        if (selectedTheme.equals(lightTheme)) {
-            return R.style.LightSettingsTheme;
+            return R.style.LightTheme;
        } else if (selectedTheme.equals(blackTheme)) {
-            return R.style.BlackSettingsTheme;
+            return R.style.BlackTheme;
        } else if (selectedTheme.equals(automaticDeviceTheme)) {
            if (isDeviceDarkThemeEnabled(context)) {
                // use the dark theme variant preferred by the user
                final String selectedNightTheme = getSelectedNightThemeKey(context);
                if (selectedNightTheme.equals(blackTheme)) {
-                    return R.style.BlackSettingsTheme;
+                    return R.style.BlackTheme;
                } else {
-                    return R.style.DarkSettingsTheme;
+                    return R.style.DarkTheme;
                }
            } else {
                // there is only one day theme
-                return R.style.LightSettingsTheme;
+                return R.style.LightTheme;
            }
        } else {
            // default to dark theme
-            return R.style.DarkSettingsTheme;
+            return R.style.DarkTheme;
        }
    }

--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_add_circle_outline.xml
+++ b/app/src/main/res/drawable/ic_add_circle_outline.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_apps.xml
+++ b/app/src/main/res/drawable/ic_apps.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_arrow_drop_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_drop_down.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_arrow_drop_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_drop_up.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_art_track.xml
+++ b/app/src/main/res/drawable/ic_art_track.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_asterisk.xml
+++ b/app/src/main/res/drawable/ic_asterisk.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_attach_money.xml
+++ b/app/src/main/res/drawable/ic_attach_money.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_backup.xml
+++ b/app/src/main/res/drawable/ic_backup.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_bookmark.xml
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_brightness_high.xml
+++ b/app/src/main/res/drawable/ic_brightness_high.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_brightness_low.xml
+++ b/app/src/main/res/drawable/ic_brightness_low.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_brightness_medium.xml
+++ b/app/src/main/res/drawable/ic_brightness_medium.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_campaign.xml
+++ b/app/src/main/res/drawable/ic_campaign.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_cast.xml
+++ b/app/src/main/res/drawable/ic_cast.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_checklist.xml
+++ b/app/src/main/res/drawable/ic_checklist.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_child_care.xml
+++ b/app/src/main/res/drawable/ic_child_care.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_circle.xml
+++ b/app/src/main/res/drawable/ic_circle.xml
@ -3,7 +3,7 @@
    android:width="24dp"
    android:viewportHeight="24"
    android:viewportWidth="24"
-    android:tint="@color/defaultIconTint" >
+    android:tint="?attr/colorAccent" >
    <path
        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.49 10,-10S17.52,2 12,2L12,2z"
        android:fillColor="#FF000000" />
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_cloud.xml
+++ b/app/src/main/res/drawable/ic_cloud.xml
@ -3,7 +3,7 @@
    android:width="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="@color/defaultIconTint">
+    android:tint="?attr/colorAccent">
    <path
        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"
        android:fillColor="#FF000000" />
--- a/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_computer.xml
+++ b/app/src/main/res/drawable/ic_computer.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_crop_portrait.xml
+++ b/app/src/main/res/drawable/ic_crop_portrait.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_description.xml
+++ b/app/src/main/res/drawable/ic_description.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_directions_bike.xml
+++ b/app/src/main/res/drawable/ic_directions_bike.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_directions_car.xml
+++ b/app/src/main/res/drawable/ic_directions_car.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_drag_handle.xml
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_expand_more.xml
+++ b/app/src/main/res/drawable/ic_expand_more.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_explore.xml
+++ b/app/src/main/res/drawable/ic_explore.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fastfood.xml
+++ b/app/src/main/res/drawable/ic_fastfood.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_favorite.xml
+++ b/app/src/main/res/drawable/ic_favorite.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_file_download.xml
+++ b/app/src/main/res/drawable/ic_file_download.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_filter_list.xml
+++ b/app/src/main/res/drawable/ic_filter_list.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fitness_center.xml
+++ b/app/src/main/res/drawable/ic_fitness_center.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fullscreen.xml
+++ b/app/src/main/res/drawable/ic_fullscreen.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_fullscreen_exit.xml
+++ b/app/src/main/res/drawable/ic_fullscreen_exit.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_headset.xml
+++ b/app/src/main/res/drawable/ic_headset.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_hourglass_top.xml
+++ b/app/src/main/res/drawable/ic_hourglass_top.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_info_outline.xml
+++ b/app/src/main/res/drawable/ic_info_outline.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_insert_emoticon.xml
+++ b/app/src/main/res/drawable/ic_insert_emoticon.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_list.xml
+++ b/app/src/main/res/drawable/ic_list.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_live_tv.xml
+++ b/app/src/main/res/drawable/ic_live_tv.xml
@ -2,7 +2,7 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_mic.xml
+++ b/app/src/main/res/drawable/ic_mic.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_motorcycle.xml
+++ b/app/src/main/res/drawable/ic_motorcycle.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_movie.xml
+++ b/app/src/main/res/drawable/ic_movie.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_music_note.xml
+++ b/app/src/main/res/drawable/ic_music_note.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_next.xml
+++ b/app/src/main/res/drawable/ic_next.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_palette.xml
+++ b/app/src/main/res/drawable/ic_palette.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_people.xml
+++ b/app/src/main/res/drawable/ic_people.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_person.xml
+++ b/app/src/main/res/drawable/ic_person.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_pets.xml
+++ b/app/src/main/res/drawable/ic_pets.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_picture_in_picture.xml
+++ b/app/src/main/res/drawable/ic_picture_in_picture.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_pin.xml
+++ b/app/src/main/res/drawable/ic_pin.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
--- a/app/src/main/res/drawable/ic_placeholder_bandcamp.xml
+++ b/app/src/main/res/drawable/ic_placeholder_bandcamp.xml
@ -3,7 +3,7 @@
    android:width="24dp"
    android:viewportHeight="97.75"
    android:viewportWidth="97.75"
-    android:tint="@color/defaultIconTint">
+    android:tint="?attr/colorAccent">
    <path
        android:pathData="M48.875,0C21.882,0 0,21.882 0,48.875S21.882,97.75 48.875,97.75 97.75,75.868 97.75,48.875 75.868,0 48.875,0zM64.835,70.857L12.593,70.857l20.32,-43.965h52.244L64.835,70.857z"
        android:fillColor="#FF000000" />
--- a/app/src/main/res/drawable/ic_placeholder_media_ccc.xml
+++ b/app/src/main/res/drawable/ic_placeholder_media_ccc.xml
@ -3,7 +3,7 @@
    android:width="24dp"
    android:viewportWidth="26.458319"
    android:viewportHeight="26.458332"
-    android:tint="@color/defaultIconTint">
+    android:tint="?attr/colorAccent">
  <path
      android:pathData="M13.23,0.302C6.07,0.302 0.264,6.107 0.264,13.267a12.965,12.965 0,0 0,0.847 4.595c0.19,-0.497 0.408,-0.982 0.682,-1.438 0.14,-0.232 0.294,-0.457 0.396,-0.707 0.103,-0.25 0.15,-0.533 0.072,-0.792a1.362,1.362 0,0 0,-0.22 -0.404c-0.092,-0.123 -0.192,-0.24 -0.275,-0.37a1.662,1.662 0,0 1,-0.255 -1.12,1.5 1.5,0 0,1 0.58,-0.987c0.28,-0.208 0.635,-0.3 0.985,-0.288a1.757,1.757 0,0 1,0.346 0.048c0.452,0.11 0.852,0.393 1.148,0.75 0.368,0.447 0.584,1.01 0.637,1.586a3.574,3.574 0,0 1,-0.275 1.693c-0.4,0.955 -1.15,1.725 -1.565,2.673 -0.338,0.775 -0.435,1.638 -0.39,2.483 0.007,0.077 0.018,0.155 0.025,0.234a12.965,12.965 0,0 0,3.62 3.18,17.63 17.63,0 0,1 -0.13,-2.11c0.002,-0.56 0.03,-1.12 0.085,-1.675 -0.34,-0.236 -0.65,-0.51 -0.87,-0.86 -0.392,-0.62 -0.466,-1.408 -0.305,-2.124 0.16,-0.717 0.54,-1.37 0.997,-1.945a7.833,7.833 0,0 1,2.835 -2.223,10.305 10.305,0 0,1 -0.09,-0.126 4.854,4.854 0,0 1,-0.702 -2.176c-0.06,-0.777 0.064,-1.554 0.115,-2.33 0.037,-0.543 0.04,-1.085 0.07,-1.627 0.038,-0.627 0.114,-1.255 0.29,-1.858a2.36,2.36 0,0 1,0.266 -0.63,1.4 1.4,0 0,1 0.594,-0.514c0.274,-0.108 0.51,-0.132 0.776,-0.087 0.22,0.046 0.425,0.156 0.604,0.294 0.18,0.138 0.335,0.304 0.48,0.477a7.298,7.298 0,0 1,1.04 1.617,3.57 3.57,0 0,1 1.09,0 7.287,7.287 0,0 1,1.04 -1.616,3.21 3.21,0 0,1 0.48,-0.476c0.18,-0.14 0.383,-0.248 0.604,-0.295a1.268,1.268 0,0 1,0.78 0.086,1.402 1.402,0 0,1 0.595,0.517c0.124,0.19 0.202,0.408 0.266,0.626 0.175,0.602 0.252,1.23 0.29,1.856 0.03,0.543 0.033,1.087 0.07,1.628 0.05,0.777 0.175,1.554 0.116,2.33a4.855,4.855 0,0 1,-0.705 2.178c-0.03,0.05 -0.07,0.096 -0.103,0.145 0.247,0.278 0.598,0.513 0.898,0.614a1.956,1.956 0,0 0,1.05 0.044,1.65 1.65,0 0,0 0.533,-0.226 1.253,1.253 0,0 0,0.397 -0.418c0.118,-0.21 0.166,-0.45 0.192,-0.687 0.067,-0.61 0,-1.224 -0.05,-1.835 -0.034,-0.396 -0.062,-0.8 0.027,-1.187 0.06,-0.26 0.177,-0.518 0.373,-0.7a1.106,1.106 0,0 1,0.465 -0.255,1.312 1.312,0 0,1 0.53,-0.03c0.38,0.057 0.736,0.274 0.948,0.594 0.12,0.18 0.194,0.39 0.238,0.604 0.044,0.213 0.06,0.43 0.072,0.648 0.04,0.76 0.04,1.522 0.018,2.284 -0.018,0.665 -0.055,1.348 -0.32,1.957 -0.343,0.782 -1.032,1.366 -1.775,1.786a7.052,7.052 0,0 1,-1.588 0.647c0.482,1.54 0.733,3.24 0.733,4.968a17.6,17.6 0,0 1,-0.135 2.125,12.964 12.964,0 0,0 6.384,-11.152c0,-7.16 -5.806,-12.965 -12.965,-12.965zM9.602,16.284v1.483a1.88,1.88 0,0 1,1.083 0.362,1.738 1.738,0 0,1 0.556,0.68c0.122,0.27 0.166,0.576 0.116,0.868a1.493,1.493 0,0 1,-0.332 0.708,1.647 1.647,0 0,1 -0.635,0.458 1.738,1.738 0,0 1,-0.787 0.122v3.73l7.762,-4.208 -7.762,-4.204z"
      android:fillColor="#FF000000" />
--- a/app/src/main/res/drawable/ic_play_arrow.xml
+++ b/app/src/main/res/drawable/ic_play_arrow.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_playlist_add.xml
+++ b/app/src/main/res/drawable/ic_playlist_add.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_playlist_add_check.xml
+++ b/app/src/main/res/drawable/ic_playlist_add_check.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_playlist_play.xml
+++ b/app/src/main/res/drawable/ic_playlist_play.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_previous.xml
+++ b/app/src/main/res/drawable/ic_previous.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_public.xml
+++ b/app/src/main/res/drawable/ic_public.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_radio.xml
+++ b/app/src/main/res/drawable/ic_radio.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_repeat.xml
+++ b/app/src/main/res/drawable/ic_repeat.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_replay.xml
+++ b/app/src/main/res/drawable/ic_replay.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_restaurant.xml
+++ b/app/src/main/res/drawable/ic_restaurant.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_rss_feed.xml
+++ b/app/src/main/res/drawable/ic_rss_feed.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_school.xml
+++ b/app/src/main/res/drawable/ic_school.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_search_add.xml
+++ b/app/src/main/res/drawable/ic_search_add.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/defaultIconTint"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/Show more
+++ b/Show more