Use same non-sticky heading style as Browse for Updates/History (closes #4822)

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupHolder.kt

@@ -4,12 +4,12 @@ import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.viewholders.FlexibleViewHolder
-import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
+import eu.kanade.tachiyomi.databinding.SectionHeaderItemBinding
 
 class ExtensionGroupHolder(view: View, adapter: FlexibleAdapter<*>) :
     FlexibleViewHolder(view, adapter) {
 
-    private val binding = SourceMainControllerCardHeaderBinding.bind(view)
+    private val binding = SectionHeaderItemBinding.bind(view)
 
     @SuppressLint("SetTextI18n")
     fun bind(item: ExtensionGroupItem) {

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt

@@ -19,7 +19,7 @@ data class ExtensionGroupItem(val name: String, val size: Int, val showSize: Boo
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card_header
+        return R.layout.section_header_item
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt

@@ -7,7 +7,7 @@ import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
+import eu.kanade.tachiyomi.databinding.SectionHeaderItemBinding
 
 /**
  * Item that contains the selection header.
@@ -18,7 +18,7 @@ class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card_header
+        return R.layout.section_header_item
     }
 
     /**
@@ -45,7 +45,7 @@ class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        private val binding = SourceMainControllerCardHeaderBinding.bind(view)
+        private val binding = SectionHeaderItemBinding.bind(view)
 
         init {
             binding.title.text = view.context.getString(R.string.migration_selection_prompt)

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangHolder.kt

@@ -3,13 +3,13 @@ package eu.kanade.tachiyomi.ui.browse.source
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.viewholders.FlexibleViewHolder
-import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
+import eu.kanade.tachiyomi.databinding.SectionHeaderItemBinding
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 
 class LangHolder(view: View, adapter: FlexibleAdapter<*>) :
     FlexibleViewHolder(view, adapter) {
 
-    private val binding = SourceMainControllerCardHeaderBinding.bind(view)
+    private val binding = SectionHeaderItemBinding.bind(view)
 
     fun bind(item: LangItem) {
         binding.title.text = LocaleHelper.getSourceDisplayName(item.code, itemView.context)

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt

@@ -18,7 +18,7 @@ data class LangItem(val code: String) : AbstractHeaderItem<LangHolder>() {
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card_header
+        return R.layout.section_header_item
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/recent/DateSectionItem.kt

@@ -8,13 +8,13 @@ import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.databinding.RecentSectionItemBinding
+import eu.kanade.tachiyomi.databinding.SectionHeaderItemBinding
 import java.util.Date
 
 class DateSectionItem(val date: Date) : AbstractHeaderItem<DateSectionItem.DateSectionItemHolder>() {
 
     override fun getLayoutRes(): Int {
-        return R.layout.recent_section_item
+        return R.layout.section_header_item
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): DateSectionItemHolder {
@@ -39,12 +39,12 @@ class DateSectionItem(val date: Date) : AbstractHeaderItem<DateSectionItem.DateS
 
     inner class DateSectionItemHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter, true) {
 
-        private val binding = RecentSectionItemBinding.bind(view)
+        private val binding = SectionHeaderItemBinding.bind(view)
 
         private val now = Date().time
 
         fun bind(item: DateSectionItem) {
-            binding.sectionText.text = DateUtils.getRelativeTimeSpanString(item.date.time, now, DateUtils.DAY_IN_MILLIS)
+            binding.title.text = DateUtils.getRelativeTimeSpanString(item.date.time, now, DateUtils.DAY_IN_MILLIS)
         }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt

@@ -35,7 +35,6 @@ class HistoryAdapter(controller: HistoryController) :
 
     init {
         setDisplayHeadersAtStartUp(true)
-        setStickyHeaders(true)
     }
 
     interface OnResumeClickListener {

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt

@@ -18,7 +18,6 @@ class UpdatesAdapter(
 
     init {
         setDisplayHeadersAtStartUp(true)
-        setStickyHeaders(true)
     }
 
     interface OnCoverClickListener {

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

@@ -17,7 +17,7 @@
             android:clipToPadding="false"
             android:paddingTop="8dp"
             android:paddingBottom="@dimen/action_toolbar_list_padding"
-            tools:listitem="@layout/source_main_controller_card_header" />
+            tools:listitem="@layout/section_header_item" />
 
     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout>
 

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

@@ -1,21 +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="32dp"
-    android:background="?attr/colorPrimary"
-    android:elevation="4dp"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <TextView
-        android:id="@+id/section_text"
-        style="@style/TextAppearance.Regular.SubHeading"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:maxLines="1"
-        android:textColor="?attr/colorOnPrimary"
-        android:textStyle="bold" />
-
-</FrameLayout>

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

@@ -12,7 +12,7 @@
         android:clipToPadding="false"
         android:paddingTop="8dp"
         android:paddingBottom="@dimen/action_toolbar_list_padding"
-        tools:listitem="@layout/source_main_controller_card_header" />
+        tools:listitem="@layout/section_header_item" />
 
     <eu.kanade.tachiyomi.widget.MaterialFastScroll
         android:id="@+id/fast_scroller"