Issue #19002: Correct browser viewholder naming

app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt

@@ -44,7 +44,7 @@ import org.mozilla.fenix.tabstray.ext.isSelect
 /**
  * A RecyclerView ViewHolder implementation for "tab" items.
  */
-abstract class TabsTrayViewHolder(
+abstract class AbstractBrowserTabViewHolder(
     itemView: View,
     private val imageLoader: ImageLoader,
     private val trayStore: TabsTrayStore,

app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabGridViewHolder.kt

@@ -22,13 +22,13 @@ import org.mozilla.fenix.tabstray.TabsTrayStore
 /**
  * A RecyclerView ViewHolder implementation for "tab" items with grid layout.
  */
-class TabsTrayGridViewHolder(
+class BrowserTabGridViewHolder(
     imageLoader: ImageLoader,
     override val browserTrayInteractor: BrowserTrayInteractor,
     store: TabsTrayStore,
     selectionHolder: SelectionHolder<Tab>? = null,
     itemView: View
-) : TabsTrayViewHolder(itemView, imageLoader, store, selectionHolder) {
+) : AbstractBrowserTabViewHolder(itemView, imageLoader, store, selectionHolder) {
 
     private val closeButton: AppCompatImageButton = itemView.findViewById(R.id.mozac_browser_tabstray_close)
 

app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabListViewHolder.kt

@@ -16,13 +16,13 @@ import kotlin.math.max
 /**
  * A RecyclerView ViewHolder implementation for "tab" items with list layout.
  */
-class TabsTrayListViewHolder(
+class BrowserTabListViewHolder(
     imageLoader: ImageLoader,
     override val browserTrayInteractor: BrowserTrayInteractor,
     store: TabsTrayStore,
     selectionHolder: SelectionHolder<Tab>? = null,
     itemView: View
-) : TabsTrayViewHolder(itemView, imageLoader, store, selectionHolder) {
+) : AbstractBrowserTabViewHolder(itemView, imageLoader, store, selectionHolder) {
     override val thumbnailSize: Int
         get() = max(
             itemView.resources.getDimensionPixelSize(R.dimen.tab_tray_list_item_thumbnail_height),

app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt

@@ -29,7 +29,7 @@ class BrowserTabsAdapter(
     private val interactor: BrowserTrayInteractor,
     private val store: TabsTrayStore,
     delegate: Observable<TabsTray.Observer> = ObserverRegistry()
-) : TabsAdapter<TabsTrayViewHolder>(delegate) {
+) : TabsAdapter<AbstractBrowserTabViewHolder>(delegate) {
 
     /**
      * The layout types for the tabs.
@@ -55,18 +55,18 @@ class BrowserTabsAdapter(
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabsTrayViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractBrowserTabViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
 
         return when (viewType) {
             ViewType.GRID.layoutRes ->
-                TabsTrayGridViewHolder(imageLoader, interactor, store, selectionHolder, view)
+                BrowserTabGridViewHolder(imageLoader, interactor, store, selectionHolder, view)
             else ->
-                TabsTrayListViewHolder(imageLoader, interactor, store, selectionHolder, view)
+                BrowserTabListViewHolder(imageLoader, interactor, store, selectionHolder, view)
         }
     }
 
-    override fun onBindViewHolder(holder: TabsTrayViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int) {
         super.onBindViewHolder(holder, position)
 
         holder.tab?.let { tab ->
@@ -84,7 +84,7 @@ class BrowserTabsAdapter(
      * Over-ridden [onBindViewHolder] that uses the payloads to notify the selected tab how to
      * display itself.
      */
-    override fun onBindViewHolder(holder: TabsTrayViewHolder, position: Int, payloads: List<Any>) {
+    override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int, payloads: List<Any>) {
         val tabs = tabs ?: return
 
         if (tabs.list.isEmpty()) return

app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt

@@ -22,7 +22,7 @@ import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
 
 @RunWith(FenixRobolectricTestRunner::class)
-class TabsTrayViewHolderTest {
+class AbstractBrowserTabViewHolderTest {
     val store = TabsTrayStore()
     val browserStore = BrowserStore()
     val interactor = mockk<BrowserTrayInteractor>(relaxed = true)
@@ -78,7 +78,7 @@ class TabsTrayViewHolderTest {
         store: BrowserStore,
         metrics: MetricController,
         override val browserTrayInteractor: BrowserTrayInteractor
-    ) : TabsTrayViewHolder(itemView, imageLoader, trayStore, selectionHolder, store, metrics) {
+    ) : AbstractBrowserTabViewHolder(itemView, imageLoader, trayStore, selectionHolder, store, metrics) {
         override val thumbnailSize: Int
             get() = 30
 

app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt

@@ -28,7 +28,7 @@ class BrowserTabsAdapterTest {
     @Test
     fun `WHEN bind with payloads is called THEN update the holder`() {
         val adapter = BrowserTabsAdapter(context, interactor, store)
-        val holder = mockk<TabsTrayViewHolder>(relaxed = true)
+        val holder = mockk<AbstractBrowserTabViewHolder>(relaxed = true)
 
         adapter.updateTabs(Tabs(
             list = listOf(
@@ -49,7 +49,7 @@ class BrowserTabsAdapterTest {
     @Test
     fun `WHEN the selection holder is set THEN update the selected tab`() {
         val adapter = BrowserTabsAdapter(context, interactor, store)
-        val holder = mockk<TabsTrayViewHolder>(relaxed = true)
+        val holder = mockk<AbstractBrowserTabViewHolder>(relaxed = true)
         val tab = createTab("tab1")
 
         every { holder.tab }.answers { tab }