From 438404b5ba7f0ac3a418d10e4536e8560a0be6d0 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 7 Jun 2019 13:55:32 +0200 Subject: [PATCH] code review cleaning --- .../home/room/detail/RoomDetailViewModel.kt | 8 ++++++-- .../timeline/action/MessageActionsBottomSheet.kt | 13 +------------ .../timeline/action/MessageActionsViewModel.kt | 2 +- .../features/reactions/widget/ReactionButton.kt | 4 ++-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt index 346d21c3..476ff99b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt @@ -55,8 +55,12 @@ class RoomDetailViewModel(initialState: RoomDetailViewState, private val roomId = initialState.roomId private val eventId = initialState.eventId private val displayedEventsObservable = BehaviorRelay.create() - private val timeline = room.createTimeline(eventId, - if (TimelineDisplayableEvents.DEBUG_HIDDEN_EVENT) TimelineDisplayableEvents.DEBUG_DISPLAYABLE_TYPES else TimelineDisplayableEvents.DISPLAYABLE_TYPES) + private val allowedTypes = if (TimelineDisplayableEvents.DEBUG_HIDDEN_EVENT) { + TimelineDisplayableEvents.DEBUG_DISPLAYABLE_TYPES + } else { + TimelineDisplayableEvents.DISPLAYABLE_TYPES + } + private val timeline = room.createTimeline(eventId, allowedTypes) companion object : MvRxViewModelFactory { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt index 7ea6a9b1..9c9bbc2d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt @@ -33,7 +33,6 @@ import com.airbnb.mvrx.withState import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import im.vector.riotredesign.R -import im.vector.riotredesign.core.glide.GlideApp import im.vector.riotredesign.features.home.AvatarRenderer import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.synthetic.main.bottom_sheet_message_actions.* @@ -122,17 +121,7 @@ class MessageActionsBottomSheet : BaseMvRxBottomSheetDialog() { senderNameTextView.text = it.senderName messageBodyTextView.text = it.messageBody messageTimestampText.text = it.ts - - GlideApp.with(this).clear(senderAvatarImageView) - if (it.senderAvatarPath != null) { - GlideApp.with(this) - .load(it.senderAvatarPath) - .circleCrop() - .placeholder(AvatarRenderer.getPlaceholderDrawable(requireContext(), it.userId, it.senderName)) - .into(senderAvatarImageView) - } else { - senderAvatarImageView.setImageDrawable(AvatarRenderer.getPlaceholderDrawable(requireContext(), it.userId, it.senderName)) - } + AvatarRenderer.render(it.senderAvatarPath, it.userId, it.senderName, senderAvatarImageView) } else { bottom_sheet_message_preview.isVisible = false } diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index 1c293140..d0ddb854 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -96,7 +96,7 @@ class MessageActionsViewModel(initialState: MessageActionState) : VectorViewMode ts = dateFormat.format(Date(originTs ?: 0)), showPreview = body != null, canReact = event.root.type == EventType.MESSAGE, - senderAvatarPath = currentSession.contentUrlResolver().resolveFullSize(parcel.informationData.avatarUrl) + senderAvatarPath = parcel.informationData.avatarUrl ) } else { //can this happen? diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt index c0716cf2..8250b668 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt @@ -25,7 +25,6 @@ import android.graphics.Typeface import android.graphics.drawable.Drawable import android.util.AttributeSet import android.view.LayoutInflater -import android.view.MotionEvent import android.view.View import android.view.animation.AccelerateDecelerateInterpolator import android.view.animation.DecelerateInterpolator @@ -44,7 +43,8 @@ import im.vector.riotredesign.core.utils.TextUtils * Displays a String reaction (emoji), with a count, and that can be selected or not (toggle) */ class ReactionButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0) : FrameLayout(context, attrs, defStyleAttr), View.OnClickListener, View.OnLongClickListener { + defStyleAttr: Int = 0) + : FrameLayout(context, attrs, defStyleAttr), View.OnClickListener, View.OnLongClickListener { companion object { private val DECCELERATE_INTERPOLATOR = DecelerateInterpolator()