Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Use new BlankDragShadowBuilder and DraggableItemAnimator to handle tab movement

Browse Source
drag-tabs
Steven Knipe 3 years ago
parent 1db1c7d82f
commit 5a715fda9e
4 changed files with 117 additions and 54 deletions
Show Stats Download Patch File Download Diff File

9
app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolder.kt
Unescape Escape View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.tabstray.browser
import android.annotation.SuppressLint
import android.graphics.PointF
import android.view.MotionEvent
import android.view.View
import android.widget.ImageButton
@ -79,6 +80,7 @@ abstract class AbstractBrowserTabViewHolder(
abstract val thumbnailSize: Int
override var tab: TabSessionState? = null
internal var beingDragged: Boolean = false
/**
* Displays the data of the given session and notifies the given observable about events.
@ -91,6 +93,7 @@ abstract class AbstractBrowserTabViewHolder(
delegate: TabsTray.Delegate
) {
this.tab = tab
beingDragged = false
updateTitle(tab)
updateUrl(tab)
@ -241,10 +244,12 @@ abstract class AbstractBrowserTabViewHolder(
// Exit selection mode by deselecting everything
interactor.deselect(tabSelected)
}
val shadow = View.DragShadowBuilder(itemView)
val shadow = BlankDragShadowBuilder()
beingDragged = true
val point = PointF(motionEvent.x, motionEvent.y)
// startDragAndDrop is the non-deprecated version, but requires API 24
@Suppress("DEPRECATION")
itemView.startDrag(null, shadow, item, 0)
view.startDrag(null, shadow, Pair(item, point), 0)
}
}
else -> view.onTouchEvent(motionEvent)

114
app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTrayList.kt
Unescape Escape View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.tabstray.browser
import android.content.Context
import android.graphics.PointF
import android.graphics.Rect
import android.util.AttributeSet
import android.view.DragEvent
@ -12,8 +13,6 @@ import android.view.View
import androidx.recyclerview.widget.RecyclerView
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.browser.tabstray.TabViewHolder
import mozilla.components.feature.tabs.tabstray.TabsFeature
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.tabstray.TabsTrayInteractor
import org.mozilla.fenix.tabstray.TabsTrayStore
import kotlin.math.abs
@ -41,6 +40,7 @@ abstract class AbstractBrowserTrayList @JvmOverloads constructor(
adapter?.onAttachedToRecyclerView(this)
this.setOnDragListener(dragListen)
itemAnimator = DraggableItemAnimator()
}
override fun onDetachedFromWindow() {
@ -80,67 +80,77 @@ abstract class AbstractBrowserTrayList @JvmOverloads constructor(
}
return bestOut
}
private fun findSourceView(id: String): View? {
private fun findSourceViewAndHolder(id: String): Pair<View, AbstractBrowserTabViewHolder>? {
for (i in 0 until childCount) {
val proposed = getChildAt(i)
val targetHolder = findContainingViewHolder(proposed)
if (targetHolder is TabViewHolder && targetHolder.tab?.id == id) {
return proposed
if (targetHolder is AbstractBrowserTabViewHolder && targetHolder.tab?.id == id) {
return Pair(proposed, targetHolder)
}
}
return null
}
private val dragListen = OnDragListener { _, event ->
when (event.action) {
DragEvent.ACTION_DRAG_STARTED -> {
if (event.localState is TabSessionState) {
val id = (event.localState as TabSessionState).id
val sourceView = findSourceView(id)
if (sourceView != null) {
sourceView.alpha = DRAG_TRANSPARENCY
if (event.localState is Pair<*, *>) {
val (tab, dragOffset) = event.localState as Pair<*, *>
if (tab is TabSessionState && dragOffset is PointF) {
val sourceId = tab.id
val sources = findSourceViewAndHolder(sourceId)
when (event.action) {
DragEvent.ACTION_DRAG_STARTED -> {
// Put the dragged tab on top of all other tabs
if (sources != null) {
val (sourceView, _) = sources
sourceView.elevation += DRAGGED_TAB_ELEVATION
}
true
}
DragEvent.ACTION_DRAG_ENTERED -> {
true
}
DragEvent.ACTION_DRAG_LOCATION -> {
val target = getDropPosition(event.x, event.y, tab.id)
if (target != null) {
val (targetId, placeAfter) = target
interactor.onTabsMove(tab.id, targetId, placeAfter)
}
// Move the tab's visual position
if (sources != null) {
val (sourceView, _) = sources
sourceView.x = event.x - dragOffset.x
sourceView.y = event.y - dragOffset.y
}
true
}
DragEvent.ACTION_DRAG_EXITED -> {
true
}
DragEvent.ACTION_DROP -> {
true
}
DragEvent.ACTION_DRAG_ENDED -> {
// Move tab to center, set dragging to false, return tab to normal height
if (sources != null) {
val (sourceView, sourceViewHolder) = sources
sourceView.elevation -= DRAGGED_TAB_ELEVATION
sourceView.animate()
.translationX(0f).translationY(0f)
.setDuration(itemAnimator?.moveDuration ?: 0)
sourceViewHolder.beingDragged = false
}
true
}
else -> { // Unknown action
false
}
true
} else false
}
DragEvent.ACTION_DRAG_ENTERED -> {
true
}
DragEvent.ACTION_DRAG_LOCATION -> {
val source = (event.localState as TabSessionState)
val target = getDropPosition(event.x, event.y, source.id)
if (target != null) {
val (id, placeAfter) = target
interactor.onTabsMove(source.id, id, placeAfter)
}
true
}
DragEvent.ACTION_DRAG_EXITED -> {
true
}
DragEvent.ACTION_DROP -> {
val source = (event.localState as TabSessionState)
val target = getDropPosition(event.x, event.y, source.id)
if (target != null) {
val (id, placeAfter) = target
interactor.onTabsMove(source.id, id, placeAfter)
}
true
}
DragEvent.ACTION_DRAG_ENDED -> {
// Revert the invisibility
val id = (event.localState as TabSessionState).id
val sourceView = findSourceView(id)
if (sourceView != null) {
sourceView.alpha = 1f
}
true
}
else -> { // Unknown action
false
}
}
} else false
} else false
}
companion object {
internal const val DRAG_TRANSPARENCY = 0.2f
internal const val DRAGGED_TAB_ELEVATION = 10f
}
}

22
app/src/main/java/org/mozilla/fenix/tabstray/browser/BlankDragShadowBuilder.kt
Unescape Escape View File

@ -0,0 +1,22 @@
/* 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.tabstray.browser
import android.graphics.Canvas
import android.graphics.Point
import android.view.View
class BlankDragShadowBuilder : View.DragShadowBuilder() {
override fun onProvideShadowMetrics(outShadowSize: Point?, outShadowTouchPoint: Point?) {
outShadowSize?.x = 1
outShadowSize?.y = 1
outShadowTouchPoint?.x = 0
outShadowTouchPoint?.y = 0
}
override fun onDrawShadow(canvas: Canvas?) {
// Do nothing
}
}

26
app/src/main/java/org/mozilla/fenix/tabstray/browser/DraggableItemAnimator.kt
Unescape Escape View File

@ -0,0 +1,26 @@
/* 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.tabstray.browser
import androidx.annotation.NonNull
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.RecyclerView
class DraggableItemAnimator : DefaultItemAnimator() {
override fun animatePersistence(
@NonNull viewHolder: RecyclerView.ViewHolder,
@NonNull preLayoutInfo: RecyclerView.ItemAnimator.ItemHolderInfo,
@NonNull postLayoutInfo: RecyclerView.ItemAnimator.ItemHolderInfo
): Boolean {
// While being dragged, keep the tab visually in place
if (viewHolder is AbstractBrowserTabViewHolder && viewHolder.beingDragged) {
viewHolder.itemView.translationX -= postLayoutInfo.left - preLayoutInfo.left
viewHolder.itemView.translationY -= postLayoutInfo.top - preLayoutInfo.top
dispatchAnimationFinished(viewHolder)
return false
}
return super.animatePersistence(viewHolder, preLayoutInfo, postLayoutInfo)
}
}
Write Preview
Loading…
Cancel
Save