From 98e37547784f4c84abcb64baad69baa6ecf5c799 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 1 Jul 2021 13:27:12 +1000 Subject: [PATCH 1/3] Update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index cf772c0a75..eb62e88b65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,7 +143,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 186 +def canonicalVersionCode = 187 def canonicalVersionName = "1.11.0" def postFixSize = 10 From c11c4ea7ad7f55af32bc03eadb87b82574057e57 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 1 Jul 2021 14:19:12 +1000 Subject: [PATCH 2/3] Fix slight alignment issue --- .../conversation/v2/messages/VisibleMessageView.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt index 347ec53d25..ad90bd5328 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt @@ -195,13 +195,14 @@ class VisibleMessageView : LinearLayout { private fun updateExpirationTimer(message: MessageRecord) { val expirationTimerViewLayoutParams = expirationTimerView.layoutParams as RelativeLayout.LayoutParams - val ruleToAdd = if (message.isOutgoing) RelativeLayout.ALIGN_PARENT_START else RelativeLayout.ALIGN_PARENT_END - val ruleToRemove = if (message.isOutgoing) RelativeLayout.ALIGN_PARENT_END else RelativeLayout.ALIGN_PARENT_START + val ruleToAdd = if (message.isOutgoing) RelativeLayout.ALIGN_START else RelativeLayout.ALIGN_END + val ruleToRemove = if (message.isOutgoing) RelativeLayout.ALIGN_END else RelativeLayout.ALIGN_START expirationTimerViewLayoutParams.removeRule(ruleToRemove) - expirationTimerViewLayoutParams.addRule(ruleToAdd) + expirationTimerViewLayoutParams.addRule(ruleToAdd, R.id.messageContentView) val expirationTimerViewSize = toPx(12, resources) - expirationTimerViewLayoutParams.marginStart = -(messageContentContainer.paddingStart / 2 + expirationTimerViewSize / 2) - expirationTimerViewLayoutParams.marginEnd = -(messageContentContainer.paddingEnd / 2 + expirationTimerViewSize / 2) + val smallSpacing = resources.getDimension(R.dimen.small_spacing).roundToInt() + expirationTimerViewLayoutParams.marginStart = if (message.isOutgoing) -(smallSpacing + expirationTimerViewSize) else 0 + expirationTimerViewLayoutParams.marginEnd = if (message.isOutgoing) 0 else -(smallSpacing + expirationTimerViewSize) expirationTimerView.layoutParams = expirationTimerViewLayoutParams if (message.expiresIn > 0 && !message.isPending) { expirationTimerView.setColorFilter(ResourcesCompat.getColor(resources, R.color.text, context.theme)) From 0a0f7e44f6325e597153c7156f795ebc253622fb Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 1 Jul 2021 14:19:31 +1000 Subject: [PATCH 3/3] Update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index eb62e88b65..6723dfeddb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,7 +143,7 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 187 +def canonicalVersionCode = 188 def canonicalVersionName = "1.11.0" def postFixSize = 10