For #24246 - Refactor Tab from HomeFragmentStore

2 years ago · 779660f615
parent 10d5bf0e66
commit 779660f615
14 changed files with 16 additions and 22 deletions
--- 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 {

--- 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 {

--- 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
--- 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(
--- 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,
--- 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(
--- a/app/src/main/java/org/mozilla/fenix/collections/Tab.kt
+++ 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
+)
--- 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.
--- 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].
 *
--- 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 {
--- 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"
--- 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 {
--- 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 {

--- 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 {