mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-16 03:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Redacted messages better go in bubbles for both sides style

Browse source
This commit is contained in:
SpiritCroc 2020-05-28 12:40:31 +02:00
parent 3b5c092759
commit 37a64004e4
6 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
View file

@ -152,7 +152,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
return infoInBubbles(context) && attributes.informationData.sentByMe
}
open fun messageBubbleAllowed(): Boolean {
open fun messageBubbleAllowed(context: Context): Boolean {
return false
}
@ -169,11 +169,11 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
}
fun infoInBubbles(context: Context): Boolean {
return messageBubbleAllowed() && BubbleThemeUtils.getBubbleStyle(context) == BubbleThemeUtils.BUBBLE_STYLE_BOTH
return messageBubbleAllowed(context) && BubbleThemeUtils.getBubbleStyle(context) == BubbleThemeUtils.BUBBLE_STYLE_BOTH
}
fun updateMessageBubble(holder: H) {
val bubbleStyle = if (messageBubbleAllowed()) BubbleThemeUtils.getBubbleStyle(holder.eventBaseView.context) else BubbleThemeUtils.BUBBLE_STYLE_NONE
val bubbleStyle = if (messageBubbleAllowed(holder.eventBaseView.context)) BubbleThemeUtils.getBubbleStyle(holder.eventBaseView.context) else BubbleThemeUtils.BUBBLE_STYLE_NONE
val reverseBubble = attributes.informationData.sentByMe && bubbleStyle == BubbleThemeUtils.BUBBLE_STYLE_BOTH
//val bubbleView = holder.eventBaseView

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
View file

@ -16,6 +16,7 @@
package im.vector.riotx.features.home.room.detail.timeline.item
import android.content.Context
import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass
@ -52,7 +53,7 @@ abstract class MessageBlockCodeItem : AbsMessageItem<MessageBlockCodeItem.Holder
private const val STUB_ID = R.id.messageContentCodeBlockStub
}
override fun messageBubbleAllowed(): Boolean {
override fun messageBubbleAllowed(context: Context): Boolean {
return true
}
}

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
View file

@ -16,6 +16,7 @@
package im.vector.riotx.features.home.room.detail.timeline.item
import android.content.Context
import android.graphics.Paint
import android.view.View
import android.view.ViewGroup
@ -66,7 +67,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
override fun getViewType() = STUB_ID
override fun messageBubbleAllowed(): Boolean {
override fun messageBubbleAllowed(context: Context): Boolean {
return true
}

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
View file

@ -16,6 +16,7 @@
package im.vector.riotx.features.home.room.detail.timeline.item
import android.content.Context
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
@ -70,7 +71,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
override fun getViewType() = STUB_ID
override fun messageBubbleAllowed(): Boolean {
override fun messageBubbleAllowed(context: Context): Boolean {
return true
}

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
View file

@ -16,6 +16,7 @@
package im.vector.riotx.features.home.room.detail.timeline.item
import android.content.Context
import android.text.method.MovementMethod
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.text.PrecomputedTextCompat
@ -68,7 +69,7 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
private const val STUB_ID = R.id.messageContentTextStub
}
override fun messageBubbleAllowed(): Boolean {
override fun messageBubbleAllowed(context: Context): Boolean {
return true
}
}

6
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
View file

@ -16,8 +16,10 @@
package im.vector.riotx.features.home.room.detail.timeline.item
import android.content.Context
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R
import im.vector.riotx.features.themes.BubbleThemeUtils
@EpoxyModelClass(layout = R.layout.item_timeline_event_base)
abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
@ -31,4 +33,8 @@ abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>(
companion object {
private const val STUB_ID = R.id.messageContentRedactedStub
}
override fun messageBubbleAllowed(context: Context): Boolean {
return BubbleThemeUtils.getBubbleStyle(context) == BubbleThemeUtils.BUBBLE_STYLE_BOTH
}
}