diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt index 527619c02ca9..afdff4cbe59b 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TrayPagerAdapter.kt @@ -42,7 +42,7 @@ class TrayPagerAdapter( ConcatAdapter( InactiveTabsAdapter(context, browserInteractor, INACTIVE_TABS_FEATURE_NAME), TabGroupAdapter(context, browserInteractor, tabsTrayStore, TAB_GROUP_FEATURE_NAME), - TitleHeaderAdapter(browserStore, R.string.tab_tray_header_title), + TitleHeaderAdapter(browserStore), BrowserTabsAdapter(context, browserInteractor, tabsTrayStore, TABS_TRAY_FEATURE_NAME) ) } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TitleHeaderAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TitleHeaderAdapter.kt index fc8f99d1b6c3..445e7b7932f2 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TitleHeaderAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TitleHeaderAdapter.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.tabstray.browser import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.annotation.StringRes import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView @@ -17,21 +16,18 @@ import org.mozilla.fenix.databinding.TabTrayTitleHeaderItemBinding /** * A [RecyclerView.Adapter] for tab header. - * - * @param title [String] used for the title */ class TitleHeaderAdapter( - private val browserStore: BrowserStore, - @StringRes val title: Int + browserStore: BrowserStore ) : ListAdapter(DiffCallback) { - object Header + class Header private val normalTabsHeaderBinding = TitleHeaderBinding(browserStore, ::handleListChanges) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HeaderViewHolder { val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false) - return HeaderViewHolder(view, title) + return HeaderViewHolder(view) } override fun getItemViewType(position: Int) = HeaderViewHolder.LAYOUT_ID @@ -49,7 +45,7 @@ class TitleHeaderAdapter( private fun handleListChanges(showHeader: Boolean) { val header = if (showHeader) { - listOf(Header) + listOf(Header()) } else { emptyList() } @@ -57,14 +53,12 @@ class TitleHeaderAdapter( submitList(header) } - class HeaderViewHolder( - itemView: View, - @StringRes val title: Int - ) : RecyclerView.ViewHolder(itemView) { + class HeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private val binding = TabTrayTitleHeaderItemBinding.bind(itemView) fun bind() { - binding.tabTrayHeaderTitle.text = itemView.context.getString(title) + binding.tabTrayHeaderTitle.text = + itemView.context.getString(R.string.tab_tray_header_title) } companion object { diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBindingTest.kt index 5120b854d0ee..c4db0c65b17e 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBindingTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectedItemAdapterBindingTest.kt @@ -32,18 +32,6 @@ class SelectedItemAdapterBindingTest { every { adapter.itemCount }.answers { 1 } } - @Test - fun `WHEN observing on start THEN ignore the initial state update`() { - val store = TabsTrayStore() - val binding = SelectedItemAdapterBinding(store, adapter) - - binding.start() - - verify(exactly = 0) { - adapter.notifyItemRangeChanged(any(), any(), any()) - } - } - @Test fun `WHEN mode changes THEN notify the adapter`() { val store = TabsTrayStore()