Merge bookmark item and folder view holders
Tiger Oakes
4 years ago
committed by
ekager
parent
3059a57747
commit
b927b688c9
@ -1,81 +0,0 @@
|
|||||||
/* 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.library.bookmarks.viewholders
|
|
||||||
|
|
||||||
import android.view.View
|
|
||||||
import androidx.appcompat.content.res.AppCompatResources
|
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import mozilla.components.concept.storage.BookmarkNode
|
|
||||||
import org.mozilla.fenix.R
|
|
||||||
import org.mozilla.fenix.ext.hideAndDisable
|
|
||||||
import org.mozilla.fenix.ext.showAndEnable
|
|
||||||
import org.mozilla.fenix.library.LibrarySiteItemView
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkFragmentState
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkPayload
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkViewInteractor
|
|
||||||
import org.mozilla.fenix.library.bookmarks.inRoots
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a folder with other bookmarks inside.
|
|
||||||
*/
|
|
||||||
class BookmarkFolderViewHolder(
|
|
||||||
view: LibrarySiteItemView,
|
|
||||||
interactor: BookmarkViewInteractor
|
|
||||||
) : BookmarkNodeViewHolder(view, interactor) {
|
|
||||||
|
|
||||||
override var item: BookmarkNode? = null
|
|
||||||
|
|
||||||
init {
|
|
||||||
containerView.displayAs(LibrarySiteItemView.ItemType.FOLDER)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun bind(
|
|
||||||
item: BookmarkNode,
|
|
||||||
mode: BookmarkFragmentState.Mode
|
|
||||||
) {
|
|
||||||
bind(item, mode, BookmarkPayload(true, true, true, true))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun bind(item: BookmarkNode, mode: BookmarkFragmentState.Mode, payload: BookmarkPayload) {
|
|
||||||
this.item = item
|
|
||||||
|
|
||||||
setSelectionListeners(item, mode)
|
|
||||||
|
|
||||||
if (!item.inRoots()) {
|
|
||||||
updateMenu(item.type)
|
|
||||||
if (payload.modeChanged) {
|
|
||||||
if (mode is BookmarkFragmentState.Mode.Selecting) {
|
|
||||||
containerView.overflowView.hideAndDisable()
|
|
||||||
} else {
|
|
||||||
containerView.overflowView.showAndEnable()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
containerView.overflowView.visibility = View.GONE
|
|
||||||
}
|
|
||||||
|
|
||||||
if (payload.selectedChanged) {
|
|
||||||
containerView.changeSelected(item in mode.selectedItems)
|
|
||||||
}
|
|
||||||
|
|
||||||
containerView.iconView.setImageDrawable(
|
|
||||||
AppCompatResources.getDrawable(
|
|
||||||
containerView.context,
|
|
||||||
R.drawable.ic_folder_icon
|
|
||||||
)?.apply {
|
|
||||||
setTint(
|
|
||||||
ContextCompat.getColor(
|
|
||||||
containerView.context,
|
|
||||||
R.color.primary_text_light_theme
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
if (payload.titleChanged) {
|
|
||||||
containerView.titleView.text = item.title
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
/* 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.library.bookmarks.viewholders
|
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting
|
|
||||||
import mozilla.components.concept.storage.BookmarkNode
|
|
||||||
import org.mozilla.fenix.ext.hideAndDisable
|
|
||||||
import org.mozilla.fenix.ext.showAndEnable
|
|
||||||
import org.mozilla.fenix.library.LibrarySiteItemView
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkFragmentState
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkPayload
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkViewInteractor
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a bookmarked website in the bookmarks page.
|
|
||||||
*/
|
|
||||||
class BookmarkItemViewHolder(
|
|
||||||
view: LibrarySiteItemView,
|
|
||||||
interactor: BookmarkViewInteractor
|
|
||||||
) : BookmarkNodeViewHolder(view, interactor) {
|
|
||||||
|
|
||||||
override var item: BookmarkNode? = null
|
|
||||||
|
|
||||||
init {
|
|
||||||
containerView.displayAs(LibrarySiteItemView.ItemType.SITE)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun bind(
|
|
||||||
item: BookmarkNode,
|
|
||||||
mode: BookmarkFragmentState.Mode
|
|
||||||
) {
|
|
||||||
bind(item, mode, BookmarkPayload(true, true, true, true))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun bind(item: BookmarkNode, mode: BookmarkFragmentState.Mode, payload: BookmarkPayload) {
|
|
||||||
this.item = item
|
|
||||||
|
|
||||||
updateMenu(item.type)
|
|
||||||
|
|
||||||
if (payload.modeChanged) {
|
|
||||||
if (mode is BookmarkFragmentState.Mode.Selecting) {
|
|
||||||
containerView.overflowView.hideAndDisable()
|
|
||||||
} else {
|
|
||||||
containerView.overflowView.showAndEnable()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (payload.selectedChanged) {
|
|
||||||
containerView.changeSelected(item in mode.selectedItems)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (payload.titleChanged) {
|
|
||||||
containerView.titleView.text = if (item.title.isNullOrBlank()) item.url else item.title
|
|
||||||
} else if (payload.urlChanged && item.title.isNullOrBlank()) {
|
|
||||||
containerView.titleView.text = item.url
|
|
||||||
}
|
|
||||||
|
|
||||||
if (payload.urlChanged) {
|
|
||||||
containerView.urlView.text = item.url
|
|
||||||
setColorsAndIcons(item.url)
|
|
||||||
}
|
|
||||||
|
|
||||||
setSelectionListeners(item, mode)
|
|
||||||
}
|
|
||||||
|
|
||||||
@VisibleForTesting
|
|
||||||
internal fun setColorsAndIcons(url: String?) {
|
|
||||||
if (url != null && url.startsWith("http")) {
|
|
||||||
containerView.loadFavicon(url)
|
|
||||||
} else {
|
|
||||||
containerView.iconView.setImageDrawable(null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
/* 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.library.bookmarks.viewholders
|
|
||||||
|
|
||||||
import androidx.appcompat.content.res.AppCompatResources
|
|
||||||
import io.mockk.MockKAnnotations
|
|
||||||
import io.mockk.every
|
|
||||||
import io.mockk.impl.annotations.MockK
|
|
||||||
import io.mockk.mockk
|
|
||||||
import io.mockk.mockkStatic
|
|
||||||
import io.mockk.verify
|
|
||||||
import mozilla.components.concept.storage.BookmarkNode
|
|
||||||
import mozilla.components.concept.storage.BookmarkNodeType
|
|
||||||
import org.junit.Before
|
|
||||||
import org.junit.Test
|
|
||||||
import org.mozilla.fenix.ext.hideAndDisable
|
|
||||||
import org.mozilla.fenix.ext.showAndEnable
|
|
||||||
import org.mozilla.fenix.library.LibrarySiteItemView
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkFragmentInteractor
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkFragmentState
|
|
||||||
import org.mozilla.fenix.library.bookmarks.BookmarkPayload
|
|
||||||
|
|
||||||
class BookmarkFolderViewHolderTest {
|
|
||||||
|
|
||||||
@MockK
|
|
||||||
private lateinit var interactor: BookmarkFragmentInteractor
|
|
||||||
@MockK(relaxed = true)
|
|
||||||
private lateinit var siteItemView: LibrarySiteItemView
|
|
||||||
private lateinit var holder: BookmarkFolderViewHolder
|
|
||||||
|
|
||||||
private val folder = BookmarkNode(
|
|
||||||
type = BookmarkNodeType.FOLDER,
|
|
||||||
guid = "456",
|
|
||||||
parentGuid = "123",
|
|
||||||
position = 0,
|
|
||||||
title = "Folder",
|
|
||||||
url = null,
|
|
||||||
children = listOf()
|
|
||||||
)
|
|
||||||
|
|
||||||
@Before
|
|
||||||
fun setup() {
|
|
||||||
MockKAnnotations.init(this)
|
|
||||||
|
|
||||||
mockkStatic(AppCompatResources::class)
|
|
||||||
every { AppCompatResources.getDrawable(any(), any()) } returns mockk(relaxed = true)
|
|
||||||
|
|
||||||
holder = BookmarkFolderViewHolder(siteItemView, interactor)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `binds title and selected state`() {
|
|
||||||
holder.bind(folder, BookmarkFragmentState.Mode.Normal())
|
|
||||||
|
|
||||||
verify {
|
|
||||||
siteItemView.titleView.text = folder.title
|
|
||||||
siteItemView.overflowView.showAndEnable()
|
|
||||||
siteItemView.changeSelected(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
holder.bind(folder, BookmarkFragmentState.Mode.Selecting(setOf(folder)))
|
|
||||||
|
|
||||||
verify {
|
|
||||||
siteItemView.titleView.text = folder.title
|
|
||||||
siteItemView.overflowView.hideAndDisable()
|
|
||||||
siteItemView.changeSelected(true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `bind with payload of no changes does not rebind views`() {
|
|
||||||
holder.bind(
|
|
||||||
folder,
|
|
||||||
BookmarkFragmentState.Mode.Normal(),
|
|
||||||
BookmarkPayload(false, false, false, false)
|
|
||||||
)
|
|
||||||
|
|
||||||
verify(inverse = true) {
|
|
||||||
siteItemView.titleView.text = folder.title
|
|
||||||
siteItemView.overflowView.showAndEnable()
|
|
||||||
siteItemView.overflowView.hideAndDisable()
|
|
||||||
siteItemView.changeSelected(any())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue