rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dnd enhancement

Browse Source 
+ klint fix
This commit is contained in:
Valere 2021-06-17 15:53:35 +02:00
parent 944c9641a9
commit 682e926965
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SpaceOrderTest.kt
View File

@ -241,7 +241,7 @@ class SpaceOrderTest {
"roomId2" to "a", "roomId2" to "a",
"roomId1" to "b", "roomId1" to "b",
"roomId3" to null, "roomId3" to null,
"roomId4" to null, "roomId4" to null
).assertSpaceOrdered() ).assertSpaceOrdered()
} }

18
vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
View File

@ -17,6 +17,7 @@
package im.vector.app.features.spaces package im.vector.app.features.spaces
import android.os.Bundle import android.os.Bundle
import android.view.HapticFeedbackConstants
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -62,28 +63,38 @@ class SpaceListFragment @Inject constructor(
.andCallbacks(object : EpoxyTouchHelper.DragCallbacks<SpaceSummaryItem>() { .andCallbacks(object : EpoxyTouchHelper.DragCallbacks<SpaceSummaryItem>() {
var toPositionM: Int? = null var toPositionM: Int? = null
var fromPositionM: Int? = null var fromPositionM: Int? = null
var initialElevation: Float? = null
override fun onDragStarted(model: SpaceSummaryItem?, itemView: View?, adapterPosition: Int) { override fun onDragStarted(model: SpaceSummaryItem?, itemView: View?, adapterPosition: Int) {
super.onDragStarted(model, itemView, adapterPosition)
toPositionM = null toPositionM = null
fromPositionM = null fromPositionM = null
model?.matrixItem?.id?.let { model?.matrixItem?.id?.let {
viewModel.handle(SpaceListAction.OnStartDragging(it, model.expanded)) viewModel.handle(SpaceListAction.OnStartDragging(it, model.expanded))
} }
itemView?.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
initialElevation = itemView?.elevation
itemView?.elevation = 6f
} }
override fun onDragReleased(model: SpaceSummaryItem?, itemView: View?) { override fun onDragReleased(model: SpaceSummaryItem?, itemView: View?) {
// Timber.v("VAL: onModelMoved from $fromPositionM to $toPositionM ${model?.matrixItem?.getBestName()}") // Timber.v("VAL: onModelMoved from $fromPositionM to $toPositionM ${model?.matrixItem?.getBestName()}")
if (toPositionM == null || fromPositionM == null) return if (toPositionM == null || fromPositionM == null) return
val movingSpace = model?.matrixItem?.id ?: return val movingSpace = model?.matrixItem?.id ?: return
viewModel.handle(SpaceListAction.MoveSpace(movingSpace, toPositionM!! - fromPositionM!!)) viewModel.handle(SpaceListAction.MoveSpace(movingSpace, toPositionM!! - fromPositionM!!))
} }
override fun clearView(model: SpaceSummaryItem?, itemView: View?) {
// Timber.v("VAL: clearView ${model?.matrixItem?.getBestName()}")
itemView?.elevation = initialElevation ?: 0f
}
override fun onModelMoved(fromPosition: Int, toPosition: Int, modelBeingMoved: SpaceSummaryItem?, itemView: View?) { override fun onModelMoved(fromPosition: Int, toPosition: Int, modelBeingMoved: SpaceSummaryItem?, itemView: View?) {
// Timber.v("VAL: onModelMoved incremental from $fromPosition to $toPosition ${modelBeingMoved?.matrixItem?.getBestName()}") // Timber.v("VAL: onModelMoved incremental from $fromPosition to $toPosition ${modelBeingMoved?.matrixItem?.getBestName()}")
if (fromPositionM == null) { if (fromPositionM == null) {
fromPositionM = fromPosition fromPositionM = fromPosition
} }
toPositionM = toPosition toPositionM = toPosition
itemView?.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
} }
override fun isDragEnabledForModel(model: SpaceSummaryItem?): Boolean { override fun isDragEnabledForModel(model: SpaceSummaryItem?): Boolean {
@ -112,7 +123,7 @@ class SpaceListFragment @Inject constructor(
override fun invalidate() = withState(viewModel) { state -> override fun invalidate() = withState(viewModel) { state ->
when (state.asyncSpaces) { when (state.asyncSpaces) {
is Incomplete -> views.stateView.state = StateView.State.Loading is Incomplete -> views.stateView.state = StateView.State.Loading
is Success -> views.stateView.state = StateView.State.Content is Success -> views.stateView.state = StateView.State.Content
} }
spaceController.update(state) spaceController.update(state)
} }
@ -124,6 +135,7 @@ class SpaceListFragment @Inject constructor(
override fun onSpaceInviteSelected(spaceSummary: RoomSummary) { override fun onSpaceInviteSelected(spaceSummary: RoomSummary) {
viewModel.handle(SpaceListAction.OpenSpaceInvite(spaceSummary)) viewModel.handle(SpaceListAction.OpenSpaceInvite(spaceSummary))
} }
override fun onSpaceSettings(spaceSummary: RoomSummary) { override fun onSpaceSettings(spaceSummary: RoomSummary) {
sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId)) sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
} }

2
vector/src/main/res/drawable/bg_space_item.xml
View File

@ -20,7 +20,7 @@
<item> <item>
<shape> <shape>
<solid android:color="@android:color/transparent" /> <solid android:color="?android:colorBackground" />
</shape> </shape>
</item> </item>