From 8ccc4648a9369e9e167c434da8f4b451a0c373cc Mon Sep 17 00:00:00 2001 From: Jonathan Almeida Date: Tue, 30 Mar 2021 11:40:47 -0400 Subject: [PATCH] Issue #18535: Move list/grid viewholders to browser package --- .../org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt | 2 -- .../fenix/tabstray/{ => browser}/TabsTrayGridViewHolder.kt | 4 ++-- .../fenix/tabstray/{ => browser}/TabsTrayListViewHolder.kt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) rename app/src/main/java/org/mozilla/fenix/tabstray/{ => browser}/TabsTrayGridViewHolder.kt (95%) rename app/src/main/java/org/mozilla/fenix/tabstray/{ => browser}/TabsTrayListViewHolder.kt (93%) diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt index 7a9fd4672..3eb31fba6 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt @@ -16,8 +16,6 @@ import mozilla.components.support.base.observer.Observable import mozilla.components.support.base.observer.ObserverRegistry import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.tabstray.TabsTrayGridViewHolder -import org.mozilla.fenix.tabstray.TabsTrayListViewHolder import org.mozilla.fenix.tabstray.TabsTrayViewHolder /** diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayGridViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt similarity index 95% rename from app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayGridViewHolder.kt rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt index 15cdfbc79..8a6d4b953 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayGridViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.tabstray +package org.mozilla.fenix.tabstray.browser import android.view.LayoutInflater import android.view.View @@ -18,7 +18,7 @@ import org.mozilla.fenix.R import org.mozilla.fenix.ext.increaseTapArea import kotlin.math.max import kotlinx.android.synthetic.main.tab_tray_grid_item.view.tab_tray_grid_item -import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor +import org.mozilla.fenix.tabstray.TabsTrayViewHolder /** * A RecyclerView ViewHolder implementation for "tab" items with grid layout. diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayListViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt similarity index 93% rename from app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayListViewHolder.kt rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt index c57362de2..2332a02ff 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayListViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.tabstray +package org.mozilla.fenix.tabstray.browser import android.view.LayoutInflater import android.view.View @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import mozilla.components.concept.base.images.ImageLoader import org.mozilla.fenix.R -import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor +import org.mozilla.fenix.tabstray.TabsTrayViewHolder import kotlin.math.max /**