diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index c0f30216..28f2ea3a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.adapter +import android.content.res.ColorStateList import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View @@ -9,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter import code.name.monkey.retromusic.adapter.artist.ArtistAdapter @@ -17,7 +19,6 @@ import code.name.monkey.retromusic.loaders.PlaylistSongsLoader import code.name.monkey.retromusic.model.* import code.name.monkey.retromusic.util.PreferenceUtil import com.google.android.material.chip.Chip -import kotlinx.android.synthetic.main.item_option_menu.view.* class HomeAdapter(private val activity: AppCompatActivity, private var homes: List, private val displayMetrics: DisplayMetrics) : RecyclerView.Adapter() { @@ -138,5 +139,9 @@ class HomeAdapter(private val activity: AppCompatActivity, private var homes: Li private open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) { val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView) val chip: Chip = itemView.findViewById(R.id.chipHead) + + init { + chip.apply { chipBackgroundColor = ColorStateList.valueOf(ThemeStore.primaryColor(context)) } + } } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java index 8548a049..a95e6042 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java @@ -147,8 +147,6 @@ public final class PreferenceUtil { return R.style.Theme_RetroMusic_Light; case "color": return R.style.Theme_RetroMusic_Color; - case "acolor": - return R.style.Theme_RetroMusic_Black; case "black": return R.style.Theme_RetroMusic_Black; case "daynight": diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java index b961ae67..220b4fc3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java @@ -37,7 +37,7 @@ import code.name.monkey.retromusic.R; public class RetroColorUtil { public static int toolbarColor(@NonNull Context context) { int color = ThemeStore.Companion.primaryColor(context); - if (ATHUtil.INSTANCE.isWindowBackgroundDark(context)) { + if (ATHUtil.INSTANCE.isWindowBackgroundDark(context) && PreferenceUtil.getInstance().getGeneralTheme() != R.style.Theme_RetroMusic_Color) { return ATHUtil.INSTANCE.resolveColor(context, R.attr.cardBackgroundColor); } else { return color; diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt b/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt new file mode 100644 index 00000000..5b92fb71 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2019 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ + +package code.name.monkey.retromusic.views + +import android.content.Context +import android.content.res.ColorStateList +import android.util.AttributeSet +import code.name.monkey.appthemehelper.ThemeStore +import code.name.monkey.appthemehelper.util.ATHUtil +import code.name.monkey.retromusic.R +import com.google.android.material.chip.Chip + +class RetroChip @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + Chip(context, attrs, defStyleAttr) { + init { + chipBackgroundColor = ColorStateList.valueOf(ThemeStore.primaryColor(context)) + val iconColor = ATHUtil.resolveColor(context, R.attr.iconColor) + val dividerColor = ATHUtil.resolveColor(context, R.attr.dividerColor) + chipIcon?.setTintList(ColorStateList.valueOf(iconColor)) + setTextColor(iconColor) + chipStrokeColor = ColorStateList.valueOf(dividerColor) + } +} diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml index 800ef49e..e4340502 100644 --- a/app/src/main/res/layout/metal_section_recycler_view.xml +++ b/app/src/main/res/layout/metal_section_recycler_view.xml @@ -7,14 +7,13 @@ android:orientation="vertical" android:paddingBottom="12dp"> - -