From 779660f6155aa3bf6fadc5c0850be2c9483cdf71 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sun, 6 Mar 2022 18:30:20 -0500 Subject: [PATCH] For #24246 - Refactor Tab from HomeFragmentStore --- .../collections/CollectionCreationController.kt | 1 - .../collections/CollectionCreationInteractor.kt | 1 - .../fenix/collections/CollectionCreationStore.kt | 1 - .../CollectionCreationTabListAdapter.kt | 1 - .../fenix/collections/CollectionCreationView.kt | 1 - .../collections/SaveCollectionListAdapter.kt | 1 - .../java/org/mozilla/fenix/collections/Tab.kt | 16 ++++++++++++++++ .../org/mozilla/fenix/collections/TabDiffUtil.kt | 1 - .../org/mozilla/fenix/home/HomeFragmentStore.kt | 10 ---------- .../CollectionCreationBottomBarViewTest.kt | 1 - .../collections/CollectionCreationStoreTest.kt | 1 - .../CollectionCreationTabListAdapterTest.kt | 1 - .../DefaultCollectionCreationControllerTest.kt | 1 - .../mozilla/fenix/collections/TabDiffUtilTest.kt | 1 - 14 files changed, 16 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/org/mozilla/fenix/collections/Tab.kt diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt index a55e65957a..ae8d779f1a 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationController.kt @@ -18,7 +18,6 @@ import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.getDefaultCollectionNumber -import org.mozilla.fenix.home.Tab interface CollectionCreationController { diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationInteractor.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationInteractor.kt index 962bc3196c..18d5d78398 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationInteractor.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.collections import mozilla.components.feature.tab.collections.TabCollection -import org.mozilla.fenix.home.Tab interface CollectionCreationInteractor { diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt index 0b732de151..46f837a897 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationStore.kt @@ -15,7 +15,6 @@ import mozilla.components.lib.state.State import mozilla.components.lib.state.Store import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.ext.toShortUrl -import org.mozilla.fenix.home.Tab class CollectionCreationStore( initialState: CollectionCreationState diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapter.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapter.kt index f5842b3464..45f5d7efa2 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapter.kt @@ -14,7 +14,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.databinding.CollectionTabListRowBinding import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.loadIntoView -import org.mozilla.fenix.home.Tab import org.mozilla.fenix.utils.view.ViewHolder class CollectionCreationTabListAdapter( diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt index 6645082c5d..731e648f4a 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt @@ -25,7 +25,6 @@ import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.databinding.ComponentCollectionCreationBinding import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.toShortUrl -import org.mozilla.fenix.home.Tab class CollectionCreationView( private val container: ViewGroup, diff --git a/app/src/main/java/org/mozilla/fenix/collections/SaveCollectionListAdapter.kt b/app/src/main/java/org/mozilla/fenix/collections/SaveCollectionListAdapter.kt index c7dcc0c9a8..d72100ff2b 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/SaveCollectionListAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/SaveCollectionListAdapter.kt @@ -14,7 +14,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.description import org.mozilla.fenix.databinding.CollectionsListItemBinding import org.mozilla.fenix.ext.getIconColor -import org.mozilla.fenix.home.Tab import org.mozilla.fenix.utils.view.ViewHolder class SaveCollectionListAdapter( diff --git a/app/src/main/java/org/mozilla/fenix/collections/Tab.kt b/app/src/main/java/org/mozilla/fenix/collections/Tab.kt new file mode 100644 index 0000000000..0b843d5fd3 --- /dev/null +++ b/app/src/main/java/org/mozilla/fenix/collections/Tab.kt @@ -0,0 +1,16 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * 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.collections + +import android.graphics.Bitmap + +data class Tab( + val sessionId: String, + val url: String, + val hostname: String, + val title: String, + val selected: Boolean? = null, + val icon: Bitmap? = null +) diff --git a/app/src/main/java/org/mozilla/fenix/collections/TabDiffUtil.kt b/app/src/main/java/org/mozilla/fenix/collections/TabDiffUtil.kt index a555dd8f08..001917e2e2 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/TabDiffUtil.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/TabDiffUtil.kt @@ -5,7 +5,6 @@ package org.mozilla.fenix.collections import androidx.recyclerview.widget.DiffUtil -import org.mozilla.fenix.home.Tab /** * Diff callback for comparing tab lists with selected state. diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt index bf03328535..f11f582048 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragmentStore.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.home -import android.graphics.Bitmap import androidx.annotation.VisibleForTesting import mozilla.components.concept.storage.BookmarkNode import mozilla.components.feature.tab.collections.TabCollection @@ -38,15 +37,6 @@ class HomeFragmentStore( initialState, ::homeFragmentStateReducer, middlewares ) -data class Tab( - val sessionId: String, - val url: String, - val hostname: String, - val title: String, - val selected: Boolean? = null, - val icon: Bitmap? = null -) - /** * The state for the [HomeFragment]. * diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationBottomBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationBottomBarViewTest.kt index c98f09d1ca..466f67a1e0 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationBottomBarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationBottomBarViewTest.kt @@ -22,7 +22,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -import org.mozilla.fenix.home.Tab @RunWith(FenixRobolectricTestRunner::class) class CollectionCreationBottomBarViewTest { diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt index 86d2c5d812..e4e2ed8d67 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt @@ -20,7 +20,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -import org.mozilla.fenix.home.Tab private const val URL_MOZILLA = "www.mozilla.org" private const val SESSION_ID_MOZILLA = "0" diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapterTest.kt index 491b0c1370..b1d4a19f99 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapterTest.kt @@ -23,7 +23,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.databinding.CollectionTabListRowBinding import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -import org.mozilla.fenix.home.Tab @RunWith(FenixRobolectricTestRunner::class) class CollectionCreationTabListAdapterTest { diff --git a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt index 167f7f903a..75f3ad8be3 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt @@ -28,7 +28,6 @@ import org.junit.Test import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController -import org.mozilla.fenix.home.Tab class DefaultCollectionCreationControllerTest { diff --git a/app/src/test/java/org/mozilla/fenix/collections/TabDiffUtilTest.kt b/app/src/test/java/org/mozilla/fenix/collections/TabDiffUtilTest.kt index 748dbde127..68f9a6e238 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/TabDiffUtilTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/TabDiffUtilTest.kt @@ -10,7 +10,6 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -import org.mozilla.fenix.home.Tab class TabDiffUtilTest {