[fenix] For https://github.com/mozilla-mobile/fenix/issues/24246 - Refactor Tab from HomeFragmentStore

pull/600/head
Gabriel Luong 2 years ago committed by mergify[bot]
parent 5609576572
commit 63d7796407

@ -18,7 +18,6 @@ import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.getDefaultCollectionNumber import org.mozilla.fenix.ext.getDefaultCollectionNumber
import org.mozilla.fenix.home.Tab
interface CollectionCreationController { interface CollectionCreationController {

@ -7,7 +7,6 @@
package org.mozilla.fenix.collections package org.mozilla.fenix.collections
import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tab.collections.TabCollection
import org.mozilla.fenix.home.Tab
interface CollectionCreationInteractor { interface CollectionCreationInteractor {

@ -15,7 +15,6 @@ import mozilla.components.lib.state.State
import mozilla.components.lib.state.Store import mozilla.components.lib.state.Store
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.ext.toShortUrl
import org.mozilla.fenix.home.Tab
class CollectionCreationStore( class CollectionCreationStore(
initialState: CollectionCreationState initialState: CollectionCreationState

@ -14,7 +14,6 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.databinding.CollectionTabListRowBinding import org.mozilla.fenix.databinding.CollectionTabListRowBinding
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.loadIntoView import org.mozilla.fenix.ext.loadIntoView
import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.utils.view.ViewHolder import org.mozilla.fenix.utils.view.ViewHolder
class CollectionCreationTabListAdapter( class CollectionCreationTabListAdapter(

@ -25,7 +25,6 @@ import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.databinding.ComponentCollectionCreationBinding import org.mozilla.fenix.databinding.ComponentCollectionCreationBinding
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.ext.toShortUrl
import org.mozilla.fenix.home.Tab
class CollectionCreationView( class CollectionCreationView(
private val container: ViewGroup, private val container: ViewGroup,

@ -14,7 +14,6 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.components.description import org.mozilla.fenix.components.description
import org.mozilla.fenix.databinding.CollectionsListItemBinding import org.mozilla.fenix.databinding.CollectionsListItemBinding
import org.mozilla.fenix.ext.getIconColor import org.mozilla.fenix.ext.getIconColor
import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.utils.view.ViewHolder import org.mozilla.fenix.utils.view.ViewHolder
class SaveCollectionListAdapter( class SaveCollectionListAdapter(

@ -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
)

@ -5,7 +5,6 @@
package org.mozilla.fenix.collections package org.mozilla.fenix.collections
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import org.mozilla.fenix.home.Tab
/** /**
* Diff callback for comparing tab lists with selected state. * Diff callback for comparing tab lists with selected state.

@ -4,7 +4,6 @@
package org.mozilla.fenix.home package org.mozilla.fenix.home
import android.graphics.Bitmap
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tab.collections.TabCollection
@ -38,15 +37,6 @@ class HomeFragmentStore(
initialState, ::homeFragmentStateReducer, middlewares 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]. * The state for the [HomeFragment].
* *

@ -22,7 +22,6 @@ import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.home.Tab
@RunWith(FenixRobolectricTestRunner::class) @RunWith(FenixRobolectricTestRunner::class)
class CollectionCreationBottomBarViewTest { class CollectionCreationBottomBarViewTest {

@ -20,7 +20,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.home.Tab
private const val URL_MOZILLA = "www.mozilla.org" private const val URL_MOZILLA = "www.mozilla.org"
private const val SESSION_ID_MOZILLA = "0" private const val SESSION_ID_MOZILLA = "0"

@ -23,7 +23,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.databinding.CollectionTabListRowBinding import org.mozilla.fenix.databinding.CollectionTabListRowBinding
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.home.Tab
@RunWith(FenixRobolectricTestRunner::class) @RunWith(FenixRobolectricTestRunner::class)
class CollectionCreationTabListAdapterTest { class CollectionCreationTabListAdapterTest {

@ -28,7 +28,6 @@ import org.junit.Test
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.home.Tab
class DefaultCollectionCreationControllerTest { class DefaultCollectionCreationControllerTest {

@ -10,7 +10,6 @@ import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.Test import org.junit.Test
import org.mozilla.fenix.home.Tab
class TabDiffUtilTest { class TabDiffUtilTest {

Loading…
Cancel
Save