mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-27 12:05:22 +00:00
Fix padding and ordering
This commit is contained in:
parent
a108e3b9c1
commit
e3011c52c2
@ -267,6 +267,7 @@ class VisibleMessageView : LinearLayout {
|
||||
binding.messageStatusImageView.isVisible =
|
||||
iconID != null && (!message.isSent || isLastMessage || disappearing)
|
||||
|
||||
binding.messageStatusImageView.bringToFront()
|
||||
if (disappearing && !message.isPending) updateExpirationTimer(message, iconColor)
|
||||
} else {
|
||||
binding.messageStatusTextView.isVisible = false
|
||||
@ -344,6 +345,8 @@ class VisibleMessageView : LinearLayout {
|
||||
private fun updateExpirationTimer(message: MessageRecord, iconColor: Int?) {
|
||||
val expirationTimerView = ExpirationTimerView(binding.messageStatusImageView, iconColor)
|
||||
|
||||
if (!message.isOutgoing) binding.messageStatusTextView.bringToFront()
|
||||
|
||||
if (message.expiresIn > 0) {
|
||||
expirationTimerView.setPercentComplete(0.0f)
|
||||
if (message.expireStarted > 0) {
|
||||
|
@ -152,6 +152,7 @@
|
||||
android:id="@+id/messageStatusTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="2dp"
|
||||
android:layout_gravity="center"
|
||||
android:textSize="@dimen/very_small_font_size"
|
||||
tools:text="Sent" />
|
||||
|
Loading…
Reference in New Issue
Block a user