From 809c82a9f9b82ddb6a9f156ddef88013d68d1637 Mon Sep 17 00:00:00 2001 From: Jonathan Almeida Date: Mon, 10 May 2021 16:24:04 -0400 Subject: [PATCH] Issue #19002: Move TabsTrayViewHolder to browser package --- .../org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt | 1 - .../mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt | 1 - .../mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt | 1 - .../fenix/tabstray/{ => browser}/TabsTrayViewHolder.kt | 5 +++-- .../mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt | 1 - .../fenix/tabstray/{ => browser}/TabsTrayViewHolderTest.kt | 5 ++--- 6 files changed, 5 insertions(+), 9 deletions(-) rename app/src/main/java/org/mozilla/fenix/tabstray/{ => browser}/TabsTrayViewHolder.kt (98%) rename app/src/test/java/org/mozilla/fenix/tabstray/{ => browser}/TabsTrayViewHolderTest.kt (95%) 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 3eb5550f3..675c1041f 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 @@ -20,7 +20,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.selection.SelectionHolder import org.mozilla.fenix.tabstray.TabsTrayStore -import org.mozilla.fenix.tabstray.TabsTrayViewHolder /** * A [RecyclerView.Adapter] for browser tabs. diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt index 51915b03d..9ef2b5c13 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayGridViewHolder.kt @@ -16,7 +16,6 @@ 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.TabsTrayViewHolder import org.mozilla.fenix.selection.SelectionHolder import org.mozilla.fenix.tabstray.TabsTrayStore diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt index cc65f6846..3363c6490 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayListViewHolder.kt @@ -9,7 +9,6 @@ import androidx.core.content.ContextCompat import mozilla.components.concept.base.images.ImageLoader import mozilla.components.concept.tabstray.Tab import org.mozilla.fenix.R -import org.mozilla.fenix.tabstray.TabsTrayViewHolder import org.mozilla.fenix.selection.SelectionHolder import org.mozilla.fenix.tabstray.TabsTrayStore import kotlin.math.max diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolder.kt similarity index 98% rename from app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt rename to app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolder.kt index e0c443526..ce783fd9d 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolder.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.View import android.widget.ImageButton @@ -37,7 +37,8 @@ import org.mozilla.fenix.ext.showAndEnable import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.selection.SelectionHolder import org.mozilla.fenix.selection.SelectionInteractor -import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor +import org.mozilla.fenix.tabstray.TabsTrayState +import org.mozilla.fenix.tabstray.TabsTrayStore import org.mozilla.fenix.tabstray.ext.isSelect /** diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt index 9e9cf6832..8fe52438d 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt @@ -17,7 +17,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.selection.SelectionHolder import org.mozilla.fenix.tabstray.TabsTrayStore -import org.mozilla.fenix.tabstray.TabsTrayViewHolder @RunWith(FenixRobolectricTestRunner::class) class BrowserTabsAdapterTest { diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolderTest.kt similarity index 95% rename from app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt rename to app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolderTest.kt index 4c9468af7..052ac1ae0 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/TabsTrayViewHolderTest.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 @@ -19,8 +19,7 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.selection.SelectionHolder -import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor -import org.mozilla.fenix.tabstray.browser.createTab +import org.mozilla.fenix.tabstray.TabsTrayStore @RunWith(FenixRobolectricTestRunner::class) class TabsTrayViewHolderTest {