Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix live location share item description

Browse source
This commit is contained in:
ganfra 2026-04-13 11:51:48 +02:00
parent f6eeea2134
commit 8f9072f9bd
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
View file

@ -91,9 +91,9 @@ fun LocationShareRow(
) )
} }
Text( Text(
text = item.description, text = if (item.isLive) "Sharing live location" else item.formattedTimestamp,
style = ElementTheme.typography.fontBodySmRegular, style = ElementTheme.typography.fontBodySmRegular,
color = ElementTheme.colors.textSecondary, color = if(item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )
@ -123,7 +123,7 @@ internal fun LocationShareRowPreview() = ElementPreview {
url = null, url = null,
size = AvatarSize.UserListItem, size = AvatarSize.UserListItem,
), ),
description = "Shared 1 min ago", formattedTimestamp = "Shared 1 min ago",
isLive = true, isLive = true,
assetType = AssetType.SENDER, assetType = AssetType.SENDER,
location = Location(0.0, 0.0) location = Location(0.0, 0.0)
@ -142,7 +142,7 @@ internal fun LocationShareRowPreview() = ElementPreview {
), ),
isLive = false, isLive = false,
assetType = AssetType.PIN, assetType = AssetType.PIN,
description = "Shared 5 hours ago", formattedTimestamp = "Shared 5 hours ago",
location = Location(0.0, 0.0) location = Location(0.0, 0.0)
), ),
onShareClick = {}, onShareClick = {},

9
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
View file

@ -123,7 +123,7 @@ class ShowLocationPresenter(
url = mode.senderAvatarUrl, url = mode.senderAvatarUrl,
size = AvatarSize.UserListItem, size = AvatarSize.UserListItem,
), ),
description = formattedTimestamp, formattedTimestamp = formattedTimestamp,
location = mode.location, location = mode.location,
isLive = false, isLive = false,
assetType = mode.assetType, assetType = mode.assetType,
@ -142,6 +142,11 @@ class ShowLocationPresenter(
val member = members.find { it.userId == share.userId } val member = members.find { it.userId == share.userId }
val displayName = member?.getBestName() ?: share.userId.value val displayName = member?.getBestName() ?: share.userId.value
val avatarUrl = member?.avatarUrl val avatarUrl = member?.avatarUrl
val relativeTime = dateFormatter.format(timestamp = share.lastLocation?.timestamp, mode = DateFormatterMode.Full, useRelative = true)
val formattedTimestamp = stringProvider.getString(
CommonStrings.screen_static_location_sheet_timestamp_description,
relativeTime
)
LocationShareItem( LocationShareItem(
userId = share.userId, userId = share.userId,
displayName = displayName, displayName = displayName,
@ -151,7 +156,7 @@ class ShowLocationPresenter(
url = avatarUrl, url = avatarUrl,
size = AvatarSize.UserListItem, size = AvatarSize.UserListItem,
), ),
description = "Sharing live location", formattedTimestamp = formattedTimestamp,
location = location, location = location,
isLive = true, isLive = true,
assetType = lastLocation.assetType, assetType = lastLocation.assetType,

2
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationState.kt
View file

@ -34,7 +34,7 @@ data class LocationShareItem(
val userId: UserId, val userId: UserId,
val displayName: String, val displayName: String,
val avatarData: AvatarData, val avatarData: AvatarData,
val description: String, val formattedTimestamp: String,
val location: Location, val location: Location,
val isLive: Boolean, val isLive: Boolean,
val assetType: AssetType?, val assetType: AssetType?,

7
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationStateProvider.kt
View file

@ -10,7 +10,6 @@ package io.element.android.features.location.impl.show
import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.features.location.api.Location import io.element.android.features.location.api.Location
import io.element.android.features.location.api.ShowLocationMode
import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@ -77,15 +76,15 @@ fun aLocationShareItem(
url = null, url = null,
size = AvatarSize.UserListItem, size = AvatarSize.UserListItem,
), ),
formattedTimestamp: String = "Shared 1 min ago",
location: Location = Location(1.23, 2.34, 4f),
isLive: Boolean = false, isLive: Boolean = false,
assetType: AssetType? = null, assetType: AssetType? = null,
formattedTimestamp: String = "Shared 1 min ago",
location: Location = Location(1.23, 2.34, 4f),
) = LocationShareItem( ) = LocationShareItem(
userId = userId, userId = userId,
displayName = displayName, displayName = displayName,
avatarData = avatarData, avatarData = avatarData,
description = formattedTimestamp, formattedTimestamp = formattedTimestamp,
location = location, location = location,
isLive = isLive, isLive = isLive,
assetType = assetType, assetType = assetType,