Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

improved compose media long click

This commit is contained in:
Mariotaku Lee 2017-12-24 23:35:54 +08:00
parent 6bbc6b721f
commit 73777a23e3
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt
View File

@ -31,7 +31,7 @@ import org.mariotaku.twidere.model.ParcelableMedia
import org.mariotaku.twidere.model.ParcelableMediaUpdate import org.mariotaku.twidere.model.ParcelableMediaUpdate
import java.lang.Exception import java.lang.Exception
class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnLongClickListener, View.OnClickListener { class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
private val imageView = itemView.image private val imageView = itemView.image
private val videoIndicatorView = itemView.videoIndicator private val videoIndicatorView = itemView.videoIndicator
@ -58,7 +58,10 @@ class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
var adapter: MediaPreviewAdapter? = null var adapter: MediaPreviewAdapter? = null
init { init {
itemView.setOnLongClickListener(this) itemView.setOnLongClickListener listener@ {
adapter?.listener?.onStartDrag(this)
return@listener true
}
itemView.setOnClickListener(this) itemView.setOnClickListener(this)
removeView.setOnClickListener(this) removeView.setOnClickListener(this)
editView.setOnClickListener(this) editView.setOnClickListener(this)
@ -74,11 +77,6 @@ class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
} }
} }
override fun onLongClick(v: View): Boolean {
adapter?.listener?.onStartDrag(this)
return false
}
override fun onClick(v: View) { override fun onClick(v: View) {
when (v.id) { when (v.id) {
R.id.remove -> { R.id.remove -> {

31
twidere/src/main/res/layout/grid_item_media_editor.xml
View File

@ -59,18 +59,25 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
<Space
android:id="@+id/removeSpace"
android:layout_width="@dimen/element_spacing_mlarge"
android:layout_height="@dimen/element_spacing_mlarge"
android:layout_marginEnd="@dimen/element_spacing_xlarge"
android:layout_marginRight="@dimen/element_spacing_xlarge"
android:layout_marginTop="@dimen/element_spacing_xlarge"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<com.lnikkila.extendedtouchview.ExtendedTouchView <com.lnikkila.extendedtouchview.ExtendedTouchView
android:id="@+id/remove" android:id="@+id/remove"
style="?borderlessButtonStyle" style="?borderlessButtonStyle"
android:layout_width="@dimen/element_size_normal" android:layout_width="@dimen/element_size_normal"
android:layout_height="@dimen/element_size_normal" android:layout_height="@dimen/element_size_normal"
android:layout_marginEnd="@dimen/element_spacing_minus_mlarge"
android:layout_marginRight="@dimen/element_spacing_minus_mlarge"
android:layout_marginTop="@dimen/element_spacing_minus_mlarge"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/remove" android:contentDescription="@string/remove"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="@+id/removeSpace"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="@+id/removeSpace"
app:touchHeight="@dimen/element_size_normal" app:touchHeight="@dimen/element_size_normal"
app:touchWidth="@dimen/element_size_normal"> app:touchWidth="@dimen/element_size_normal">
@ -83,6 +90,16 @@
android:src="@drawable/ic_btn_grid_item_remove"/> android:src="@drawable/ic_btn_grid_item_remove"/>
</com.lnikkila.extendedtouchview.ExtendedTouchView> </com.lnikkila.extendedtouchview.ExtendedTouchView>
<Space
android:id="@+id/editSpace"
android:layout_width="@dimen/element_spacing_mlarge"
android:layout_height="@dimen/element_spacing_mlarge"
android:layout_marginBottom="@dimen/element_spacing_xlarge"
android:layout_marginEnd="@dimen/element_spacing_xlarge"
android:layout_marginRight="@dimen/element_spacing_xlarge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.lnikkila.extendedtouchview.ExtendedTouchView <com.lnikkila.extendedtouchview.ExtendedTouchView
android:id="@+id/edit" android:id="@+id/edit"
style="?borderlessButtonStyle" style="?borderlessButtonStyle"
@ -90,8 +107,8 @@
android:layout_height="@dimen/element_size_normal" android:layout_height="@dimen/element_size_normal"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/action_edit" android:contentDescription="@string/action_edit"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/editSpace"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/editSpace"
app:touchHeight="@dimen/element_size_normal" app:touchHeight="@dimen/element_size_normal"
app:touchWidth="@dimen/element_size_normal"> app:touchWidth="@dimen/element_size_normal">