interfect
4 years ago
committed by
GitHub
commit
1b355a83b8
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
/* 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.settings.account
|
||||
|
||||
import android.content.DialogInterface
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.provider.Settings
|
||||
import android.text.SpannableString
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.settings.SupportUtils
|
||||
|
||||
interface SyncController {
|
||||
fun handleCameraPermissionsNeeded()
|
||||
}
|
||||
|
||||
/**
|
||||
* Controller for handling [DefaultSyncInteractor] requests.
|
||||
*/
|
||||
class DefaultSyncController(
|
||||
private val activity: HomeActivity
|
||||
) : SyncController {
|
||||
|
||||
/**
|
||||
* Creates and shows an [AlertDialog] when camera permissions are needed.
|
||||
*
|
||||
* In versions above M, [AlertDialog.BUTTON_POSITIVE] takes the user to the app settings. This
|
||||
* intent only exists in M and above. Below M, [AlertDialog.BUTTON_POSITIVE] routes to a SUMO
|
||||
* help page to find the app settings.
|
||||
*
|
||||
* [AlertDialog.BUTTON_NEGATIVE] dismisses the dialog.
|
||||
*/
|
||||
override fun handleCameraPermissionsNeeded() {
|
||||
val dialog = buildDialog()
|
||||
dialog.show()
|
||||
}
|
||||
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
fun buildDialog(): AlertDialog.Builder {
|
||||
return AlertDialog.Builder(activity).apply {
|
||||
val spannableText = SpannableString(
|
||||
activity.resources.getString(R.string.camera_permissions_needed_message)
|
||||
)
|
||||
setMessage(spannableText)
|
||||
setNegativeButton(R.string.camera_permissions_needed_negative_button_text) { dialog: DialogInterface, _ ->
|
||||
dialog.cancel()
|
||||
}
|
||||
setPositiveButton(R.string.camera_permissions_needed_positive_button_text) { dialog: DialogInterface, _ ->
|
||||
val intent: Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
|
||||
} else {
|
||||
SupportUtils.createCustomTabIntent(
|
||||
activity,
|
||||
SupportUtils.getSumoURLForTopic(
|
||||
activity,
|
||||
SupportUtils.SumoTopic.QR_CAMERA_ACCESS
|
||||
)
|
||||
)
|
||||
}
|
||||
val uri = Uri.fromParts("package", activity.packageName, null)
|
||||
intent.data = uri
|
||||
dialog.cancel()
|
||||
activity.startActivity(intent)
|
||||
}
|
||||
create()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
/* 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.settings.account
|
||||
|
||||
interface SyncInteractor {
|
||||
fun onCameraPermissionsNeeded()
|
||||
}
|
||||
|
||||
/**
|
||||
* Interactor for [TurnOnSyncFragment].
|
||||
*
|
||||
* @param syncController Handles the interactions
|
||||
*/
|
||||
class DefaultSyncInteractor(private val syncController: DefaultSyncController) : SyncInteractor {
|
||||
override fun onCameraPermissionsNeeded() {
|
||||
syncController.handleCameraPermissionsNeeded()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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/. -->
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/library_item_height"
|
||||
android:importantForAccessibility="no">
|
||||
<View
|
||||
android:id="@+id/separator"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="2dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_gravity="center"
|
||||
android:background="?neutralFaded"/>
|
||||
</FrameLayout>
|
||||
@ -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())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
/* 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.settings.account
|
||||
|
||||
import io.mockk.MockKAnnotations
|
||||
import io.mockk.every
|
||||
import io.mockk.impl.annotations.MockK
|
||||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.mockk.verify
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.mozilla.fenix.HomeActivity
|
||||
import org.mozilla.fenix.search.AlertDialogBuilder
|
||||
|
||||
class DefaultSyncControllerTest {
|
||||
|
||||
private lateinit var syncController: DefaultSyncController
|
||||
@MockK(relaxed = true) private lateinit var activity: HomeActivity
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
MockKAnnotations.init(this)
|
||||
syncController = DefaultSyncController(activity)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `show camera permissions needed dialog`() {
|
||||
val dialogBuilder: AlertDialogBuilder = mockk(relaxed = true)
|
||||
|
||||
val spyController = spyk(syncController)
|
||||
every { spyController.buildDialog() } returns dialogBuilder
|
||||
|
||||
spyController.handleCameraPermissionsNeeded()
|
||||
|
||||
verify { dialogBuilder.show() }
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
/* 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.settings.account
|
||||
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
class DefaultSyncInteractorTest {
|
||||
|
||||
private lateinit var syncInteractor: DefaultSyncInteractor
|
||||
private lateinit var syncController: DefaultSyncController
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
syncController = mockk(relaxed = true)
|
||||
syncInteractor = DefaultSyncInteractor(syncController)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun onCameraPermissionsNeeded() {
|
||||
syncInteractor.onCameraPermissionsNeeded()
|
||||
|
||||
verify {
|
||||
syncController.handleCameraPermissionsNeeded()
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue