Feature/fga/message bubbles

changelog.d/4937.feature

@@ -0,0 +1 @@
+Support message bubbles in timeline.

library/ui-styles/src/main/res/values/bools.xml

@@ -4,6 +4,4 @@
     <!-- Created to detect what has to be implemented (especially in the settings) -->
     <bool name="false_not_implemented">false</bool>
 
-    <bool name="is_rtl">false</bool>
-
 </resources>

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt

@@ -57,7 +57,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
 ) : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 23L
+        const val SESSION_STORE_SCHEMA_VERSION = 24L
     }
 
     /**
@@ -93,6 +93,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion <= 20) migrateTo21(realm)
         if (oldVersion <= 21) migrateTo22(realm)
         if (oldVersion <= 22) migrateTo23(realm)
+        if (oldVersion <= 23) migrateTo24(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -480,8 +481,8 @@ internal class RealmSessionStoreMigration @Inject constructor(
                 ?.addRealmObjectField(EventEntityFields.THREAD_SUMMARY_LATEST_MESSAGE.`$`, eventEntity)
     }
 
-    private fun migrateTo23(realm: DynamicRealm) {
-        Timber.d("Step 22 -> 23")
+    private fun migrateTo24(realm: DynamicRealm) {
+        Timber.d("Step 23 -> 24")
         realm.schema.get("PreviewUrlCacheEntity")
                 ?.addField(PreviewUrlCacheEntityFields.IMAGE_WIDTH, Int::class.java)
                 ?.setNullable(PreviewUrlCacheEntityFields.IMAGE_WIDTH, true)

vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt

@@ -17,6 +17,8 @@
 package im.vector.app.core.resources
 
 import android.content.res.Resources
+import android.text.TextUtils
+import android.view.View
 import androidx.core.os.ConfigurationCompat
 import java.util.Locale
 import javax.inject.Inject
@@ -29,3 +31,7 @@ class LocaleProvider @Inject constructor(private val resources: Resources) {
 }
 
 fun LocaleProvider.isEnglishSpeaking() = current().language.startsWith("en")
+
+fun LocaleProvider.getLayoutDirectionFromCurrentLocale() =  TextUtils.getLayoutDirectionFromLocale(current())
+
+fun LocaleProvider.isRTL() = getLayoutDirectionFromCurrentLocale() == View.LAYOUT_DIRECTION_RTL

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt

@@ -16,7 +16,6 @@
 
 package im.vector.app.features.home.room.detail.timeline.factory
 
-import android.content.res.Resources
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -130,7 +129,6 @@ class MessageItemFactory @Inject constructor(
         private val locationPinProvider: LocationPinProvider,
         private val vectorPreferences: VectorPreferences,
         private val urlMapProvider: UrlMapProvider,
-        private val resources: Resources
 ) {
 
     // TODO inject this properly?
@@ -225,7 +223,7 @@ class MessageItemFactory @Inject constructor(
                 .locationUrl(locationUrl)
                 .mapWidth(width)
                 .mapHeight(height)
-                .userId(informationData.senderId)
+                .userId(userId)
                 .locationPinProvider(locationPinProvider)
                 .highlighted(highlight)
                 .leftGuideline(avatarSizeProvider.leftGuideline)

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt

@@ -50,7 +50,6 @@ abstract class MessageLocationItem : AbsMessageItem<MessageLocationItem.Holder>(
         super.bind(holder)
         renderSendState(holder.view, null)
         val location = locationUrl ?: return
-        val locationOwnerId = userId ?: return
         val messageLayout = attributes.informationData.messageLayout
         val dimensionConverter = DimensionConverter(holder.view.resources)
         val imageCornerTransformation = if (messageLayout is TimelineMessageLayout.Bubble) {

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt

@@ -17,11 +17,10 @@
 package im.vector.app.features.home.room.detail.timeline.style
 
 import android.content.res.Resources
-import android.text.TextUtils
-import android.view.View
 import im.vector.app.R
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.isRTL
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
@@ -71,8 +70,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
     }
 
     private val isRTL: Boolean by lazy {
-        val currentLocale = localeProvider.current()
-        TextUtils.getLayoutDirectionFromLocale(currentLocale) == View.LAYOUT_DIRECTION_RTL
+       localeProvider.isRTL()
     }
 
     fun create(params: TimelineItemFactoryParams): TimelineMessageLayout {

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt

@@ -21,7 +21,6 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.RippleDrawable
-import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewOutlineProvider
@@ -35,6 +34,7 @@ import androidx.core.view.updateLayoutParams
 import com.google.android.material.shape.MaterialShapeDrawable
 import im.vector.app.R
 import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.getLayoutDirectionFromCurrentLocale
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewMessageBubbleBinding
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
@@ -65,8 +65,7 @@ class MessageBubbleView @JvmOverloads constructor(context: Context, attrs: Attri
     override fun onFinishInflate() {
         super.onFinishInflate()
         views = ViewMessageBubbleBinding.bind(this)
-        val currentLocale = LocaleProvider(resources).current()
-        val currentLayoutDirection = TextUtils.getLayoutDirectionFromLocale(currentLocale)
+        val currentLayoutDirection = LocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
         val layoutDirectionToSet = if (isIncoming) {
             currentLayoutDirection
         } else {

vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt

@@ -16,13 +16,13 @@
 
 package im.vector.app.features.location
 
-import android.content.res.Resources
 import im.vector.app.BuildConfig
-import im.vector.app.R
+import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.isRTL
 import javax.inject.Inject
 
 class UrlMapProvider @Inject constructor(
-        private val resources: Resources
+        private val localeProvider: LocaleProvider
 ) {
     private val keyParam = "?key=${BuildConfig.mapTilerKey}"
 
@@ -49,7 +49,7 @@ class UrlMapProvider @Inject constructor(
             append(height)
             append(".png")
             append(keyParam)
-            if (!resources.getBoolean(R.bool.is_rtl)) {
+            if (!localeProvider.isRTL()) {
                 // On LTR languages we want the legal mentions to be displayed on the bottom left of the image
                 append("&attribution=bottomleft")
             }