From 5f81f48b7f2a1848658624d41cdd6abd51221ff3 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Sun, 23 Jun 2019 22:53:50 +0530 Subject: [PATCH] Change section headers in home to chip --- .../monkey/retromusic/adapter/HomeAdapter.kt | 23 ++++++------ .../layout/metal_section_recycler_view.xml | 35 +++++++------------ .../main/res/layout/section_recycler_view.xml | 35 +++++++------------ app/src/main/res/values/styles_parents.xml | 2 +- 4 files changed, 36 insertions(+), 59 deletions(-) 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 3d770904..c0f30216 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 @@ -4,7 +4,6 @@ import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.annotation.IntDef import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.GridLayoutManager @@ -17,7 +16,8 @@ import code.name.monkey.retromusic.adapter.song.SongAdapter import code.name.monkey.retromusic.loaders.PlaylistSongsLoader import code.name.monkey.retromusic.model.* import code.name.monkey.retromusic.util.PreferenceUtil -import code.name.monkey.retromusic.views.IconImageView +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() { @@ -91,8 +91,8 @@ class HomeAdapter(private val activity: AppCompatActivity, private var homes: Li recyclerView.apply { adapter = AlbumFullWidthAdapter(activity, home.arrayList as ArrayList, displayMetrics) } - title.text = activity.getString(home.title) - icon.setImageResource(home.icon) + chip.text = activity.getString(home.title) + chip.setChipIconResource(home.icon) } } @@ -103,8 +103,8 @@ class HomeAdapter(private val activity: AppCompatActivity, private var homes: Li val artistAdapter = ArtistAdapter(activity, home.arrayList as ArrayList, PreferenceUtil.getInstance().getHomeGridStyle(context!!), false, null) adapter = artistAdapter } - title.text = activity.getString(home.title) - icon.setImageResource(home.icon) + chip.text = activity.getString(home.title) + chip.setChipIconResource(home.icon) } } @@ -116,8 +116,8 @@ class HomeAdapter(private val activity: AppCompatActivity, private var homes: Li adapter = genreAdapter } - title.text = activity.getString(home.title) - icon.setImageResource(home.icon) + chip.text = activity.getString(home.title) + chip.setChipIconResource(home.icon) } } @@ -130,14 +130,13 @@ class HomeAdapter(private val activity: AppCompatActivity, private var homes: Li adapter = songAdapter } - title.text = activity.getString(home.title) - icon.setImageResource(home.icon) + chip.text = activity.getString(home.title) + chip.setChipIconResource(home.icon) } } private open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) { val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView) - val title: TextView = itemView.findViewById(R.id.sectionTitle) - val icon: IconImageView = itemView.findViewById(R.id.sectionIcon) + val chip: Chip = itemView.findViewById(R.id.chipHead) } } \ No newline at end of file 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 af2d7e36..800ef49e 100644 --- a/app/src/main/res/layout/metal_section_recycler_view.xml +++ b/app/src/main/res/layout/metal_section_recycler_view.xml @@ -1,37 +1,26 @@ - - - - - - - + android:fontFamily="@font/circular" + android:textColor="?android:textColorSecondary" + app:chipBackgroundColor="?colorPrimary" + app:chipIconTint="?iconColor" + app:chipStrokeColor="?dividerColor" + app:chipStrokeWidth="1dp" + app:iconStartPadding="8dp" + tools:chipIcon="@drawable/ic_person_white_24dp" + tools:text="@string/for_you" /> - - - - - - - + android:fontFamily="@font/circular" + android:textColor="?android:textColorSecondary" + app:chipBackgroundColor="?colorPrimary" + app:chipIconTint="?iconColor" + app:chipStrokeColor="?dividerColor" + app:chipStrokeWidth="1dp" + app:iconStartPadding="8dp" + tools:chipIcon="@drawable/ic_person_white_24dp" + tools:text="@string/for_you" /> @color/card_dark_color @color/dark_color - @color/dark_color + @color/md_grey_800 @color/ate_secondary_text_dark