feat: display received location messages - default placeholder (WPB-5483)

app/src/main/kotlin/com/wire/android/mapper/MessagePreviewContentMapper.kt

@@ -267,6 +267,13 @@ fun MessagePreview.uiLastMessageContent(): UILastMessageContent {
 
                 is WithUser.MembersCreationAdded -> UILastMessageContent.None
                 is WithUser.MembersFailedToAdd -> UILastMessageContent.None
+                is WithUser.Location -> UILastMessageContent.SenderWithMessage(
+                    userUIText,
+                    UIText.StringResource(
+                        if (isSelfMessage) R.string.last_message_self_user_shared_location
+                        else R.string.last_message_other_user_shared_location
+                    )
+                )
             }
         }
 

app/src/main/kotlin/com/wire/android/mapper/RegularMessageContentMapper.kt

@@ -23,6 +23,7 @@
 import com.wire.android.R
 import com.wire.android.model.ImageAsset
 import com.wire.android.ui.home.conversations.findUser
+import com.wire.android.ui.home.conversations.model.DEFAULT_LOCATION_ZOOM
 import com.wire.android.ui.home.conversations.model.DeliveryStatusContent
 import com.wire.android.ui.home.conversations.model.MessageBody
 import com.wire.android.ui.home.conversations.model.MessageButton
@@ -121,9 +122,23 @@
             )
         }
 
+        is MessageContent.Location -> toLocation(content, userList, message)
+
         else -> toText(message.conversationId, content, userList, message.deliveryStatus)
     }
 
+    private fun toLocation(
+        content: MessageContent.Location,
+        userList: List<User>,
+        message: Message.Regular
+    ) = UIMessageContent.Location(
+        latitude = content.latitude,
+        longitude = content.longitude,
+        name = content.name.orEmpty(),
+        zoom = content.zoom ?: DEFAULT_LOCATION_ZOOM,
+        deliveryStatus = mapRecipientsFailure(userList, message.deliveryStatus)
+    )
+
     private fun mapAudio(
         assetContent: AssetContent,
         metadata: AssetContent.AssetMetadata.Audio,

app/src/main/kotlin/com/wire/android/notification/Models.kt

@@ -141,6 +141,7 @@
     MISSED_CALL(R.string.notification_missed_call),
     NOT_SUPPORTED(R.string.notification_not_supported_issue),
     KNOCK(R.string.notification_knock),
+    LOCATION(R.string.notification_shared_location),
 }
 
 fun LocalNotification.Conversation.intoNotificationConversation(): NotificationConversation {
@@ -233,4 +234,5 @@
         LocalNotificationCommentType.REACTION -> CommentResId.REACTION
         LocalNotificationCommentType.MISSED_CALL -> CommentResId.MISSED_CALL
         LocalNotificationCommentType.NOT_SUPPORTED_YET -> CommentResId.NOT_SUPPORTED
+        LocalNotificationCommentType.LOCATION -> CommentResId.LOCATION
     }

app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt

@@ -84,6 +84,7 @@ import com.wire.android.ui.home.conversations.model.messagetypes.asset.Restricte
 import com.wire.android.ui.home.conversations.model.messagetypes.asset.RestrictedGenericFileMessage
 import com.wire.android.ui.home.conversations.model.messagetypes.audio.AudioMessage
 import com.wire.android.ui.home.conversations.model.messagetypes.image.ImageMessageParams
+import com.wire.android.ui.home.conversations.model.messagetypes.location.LocationMessageContent
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireTypography
 import com.wire.kalium.logic.data.message.Message
@@ -635,6 +636,22 @@ private fun MessageContent(
             }
         }
 
+        is UIMessageContent.Location -> with(messageContent) {
+            val locationUrl = stringResource(urlCoordinates, zoom, latitude, longitude)
+            Column {
+                LocationMessageContent(
+                    locationName = name,
+                    locationUrl = locationUrl,
+                    onLocationClick = Clickable(
+                        enabled = message.isAvailable,
+                        onClick = { onLinkClick(locationUrl) },
+                        onLongClick = onLongClick
+                    )
+                )
+                PartialDeliveryInformation(deliveryStatus)
+            }
+        }
+
         UIMessageContent.Deleted -> {}
         null -> {
             throw NullPointerException("messageContent is null")

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt

@@ -267,6 +267,16 @@
         override val deliveryStatus: DeliveryStatusContent = DeliveryStatusContent.CompleteDelivery
     ) : Regular(), PartialDeliverable
 
+    @Stable
+    data class Location(
+        val latitude: Float,
+        val longitude: Float,
+        val name: String,
+        val zoom: Int = DEFAULT_LOCATION_ZOOM,
+        @StringRes val urlCoordinates: Int = R.string.url_maps_location_coordinates,
+        override val deliveryStatus: DeliveryStatusContent = DeliveryStatusContent.CompleteDelivery
+    ) : Regular(), PartialDeliverable
+
     sealed class SystemMessage(
         @DrawableRes val iconResId: Int?,
         @StringRes open val stringResId: Int,
@@ -558,3 +568,5 @@
     val text: String,
     val isSelected: Boolean,
 )
+
+const val DEFAULT_LOCATION_ZOOM = 20

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/location/LocationMessageType.kt

@@ -0,0 +1,121 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.ui.home.conversations.model.messagetypes.location
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.sp
+import com.wire.android.R
+import com.wire.android.model.Clickable
+import com.wire.android.ui.common.clickable
+import com.wire.android.ui.common.dimensions
+import com.wire.android.ui.theme.wireColorScheme
+import com.wire.android.ui.theme.wireDimensions
+import com.wire.android.ui.theme.wireTypography
+import com.wire.android.util.ui.PreviewMultipleThemes
+
+@Composable
+fun LocationMessageContent(
+    locationName: String,
+    locationUrl: String,
+    onLocationClick: Clickable
+) {
+    Column(
+        modifier = Modifier
+            .clickable(onLocationClick)
+            .padding(top = dimensions().spacing4x)
+            .clip(shape = RoundedCornerShape(dimensions().messageAssetBorderRadius))
+            .border(
+                width = dimensions().spacing1x,
+                color = MaterialTheme.wireColorScheme.secondaryButtonDisabledOutline,
+                shape = RoundedCornerShape(dimensions().messageAssetBorderRadius)
+            )
+            .background(
+                color = MaterialTheme.wireColorScheme.surfaceVariant,
+                shape = RoundedCornerShape(dimensions().messageAssetBorderRadius)
+            )
+            .height(dimensions().spacing64x),
+        verticalArrangement = Arrangement.SpaceEvenly,
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(PaddingValues(horizontal = dimensions().spacing8x)),
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_location),
+                contentDescription = stringResource(id = R.string.content_description_location_icon),
+                modifier = Modifier.size(MaterialTheme.wireDimensions.wireIconButtonSize)
+            )
+            Spacer(modifier = Modifier.width(dimensions().spacing4x))
+            Text(
+                text = locationName,
+                style = MaterialTheme.wireTypography.body02,
+                fontSize = 15.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+        Text(
+            text = locationUrl,
+            style = MaterialTheme.wireTypography.subline01.copy(color = MaterialTheme.wireColorScheme.secondaryText),
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 1,
+            modifier = Modifier.padding(
+                PaddingValues(
+                    bottom = dimensions().spacing8x,
+                    start = dimensions().spacing8x,
+                    end = dimensions().spacing8x
+                )
+            )
+        )
+    }
+}
+
+@Composable
+@PreviewMultipleThemes
+fun PreviewLocationMessageContent() {
+    LocationMessageContent(
+        locationName = "Rapa Nui",
+        locationUrl = "https://www.google.com/maps/place/Rapa+Nui",
+        onLocationClick = Clickable()
+    )
+}

app/src/main/res/values/strings.xml

@@ -174,6 +174,7 @@
     <string name="content_description_mls_certificate_valid">All devices of all participants have a valid MLS certificate</string>
     <string name="content_description_proteus_certificate_valid">All of all participants are verified (Proteus)</string>
     <string name="content_description_jump_to_last_message">Scroll down to last message, button</string>
+    <string name="content_description_location_icon">Location item</string>
     <!-- Non translatable strings-->
     <string name="url_support" translatable="false">https://support.wire.com</string>
     <string name="url_decryption_failure_learn_more" translatable="false">https://support.wire.com/hc/articles/207948115-Why-was-I-notified-that-a-message-from-a-contact-was-not-received-</string>
@@ -186,6 +187,7 @@
     <string name="url_federation_support" translatable="false">https://support.wire.com/hc/categories/4719917054365-Federation</string>
     <string name="url_create_account_learn_more" translatable="false">https://support.wire.com/hc/articles/115004082129</string>
     <string name="url_android_release_notes" translatable="false">https://medium.com/wire-news/android-updates/home</string>
+    <string name="url_maps_location_coordinates" translatable="false">http://maps.google.com/maps?z=%1d&amp;q=loc:%2f+%2f</string>
     <!-- Navigation -->
     <string name="vault_screen_title">Vault</string>
     <string name="archive_screen_title">Archive</string>
@@ -659,6 +661,8 @@
     <string name="last_message_other_user_shared_video">shared a video.</string>
     <string name="last_message_self_user_shared_audio">shared an audio message.</string>
     <string name="last_message_other_user_shared_audio">shared an audio message.</string>
+    <string name="last_message_self_user_shared_location">shared a location.</string>
+    <string name="last_message_other_user_shared_location">shared a location.</string>
     <string name="last_message_self_user_knock">pinged.</string>
     <string name="last_message_other_user_knock">pinged.</string>
     <string name="last_message_call">called.</string>
@@ -775,6 +779,7 @@
     <string name="phone_label">Phone</string>
     <!-- Notifications -->
     <string name="notification_shared_picture">Shared a picture</string>
+    <string name="notification_shared_location">Shared a location</string>
     <string name="notification_shared_file">Shared a file</string>
     <string name="notification_reacted">Added a reaction</string>
     <string name="notification_missed_call">Missed call</string>