TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix padding and ordering

Browse Source
This commit is contained in:
andrew 2023-10-31 12:32:42 +10:30
parent a108e3b9c1
commit e3011c52c2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
View File

@ -267,6 +267,7 @@ class VisibleMessageView : LinearLayout {
binding.messageStatusImageView.isVisible = binding.messageStatusImageView.isVisible =
iconID != null && (!message.isSent || isLastMessage || disappearing) iconID != null && (!message.isSent || isLastMessage || disappearing)
binding.messageStatusImageView.bringToFront()
if (disappearing && !message.isPending) updateExpirationTimer(message, iconColor) if (disappearing && !message.isPending) updateExpirationTimer(message, iconColor)
} else { } else {
binding.messageStatusTextView.isVisible = false binding.messageStatusTextView.isVisible = false
@ -344,6 +345,8 @@ class VisibleMessageView : LinearLayout {
private fun updateExpirationTimer(message: MessageRecord, iconColor: Int?) { private fun updateExpirationTimer(message: MessageRecord, iconColor: Int?) {
val expirationTimerView = ExpirationTimerView(binding.messageStatusImageView, iconColor) val expirationTimerView = ExpirationTimerView(binding.messageStatusImageView, iconColor)
if (!message.isOutgoing) binding.messageStatusTextView.bringToFront()
if (message.expiresIn > 0) { if (message.expiresIn > 0) {
expirationTimerView.setPercentComplete(0.0f) expirationTimerView.setPercentComplete(0.0f)
if (message.expireStarted > 0) { if (message.expireStarted > 0) {

1
app/src/main/res/layout/view_visible_message.xml
View File

@ -152,6 +152,7 @@
android:id="@+id/messageStatusTextView" android:id="@+id/messageStatusTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="2dp"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="@dimen/very_small_font_size" android:textSize="@dimen/very_small_font_size"
tools:text="Sent" /> tools:text="Sent" />