Fix formatting
This commit is contained in:
parent
6b933b6506
commit
fbfeeae084
14 changed files with 31 additions and 52 deletions
|
|
@ -93,7 +93,7 @@ fun LocationShareRow(
|
|||
Text(
|
||||
text = if (item.isLive) stringResource(CommonStrings.screen_room_live_location_banner) else item.formattedTimestamp,
|
||||
style = ElementTheme.typography.fontBodySmRegular,
|
||||
color = if(item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
|
||||
color = if (item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ import io.element.android.libraries.matrix.api.room.joinedRoomMembers
|
|||
import io.element.android.libraries.ui.strings.CommonStrings
|
||||
import io.element.android.services.toolbox.api.strings.StringProvider
|
||||
import kotlinx.collections.immutable.persistentListOf
|
||||
import kotlinx.collections.immutable.toPersistentList
|
||||
import kotlinx.collections.immutable.toImmutableList
|
||||
import kotlinx.coroutines.flow.combine
|
||||
|
||||
@AssistedInject
|
||||
|
|
@ -161,7 +161,7 @@ class ShowLocationPresenter(
|
|||
isLive = true,
|
||||
assetType = lastLocation.assetType,
|
||||
)
|
||||
}.toPersistentList()
|
||||
}.toImmutableList()
|
||||
}.collect { value = it }
|
||||
}.value
|
||||
}
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ class ShowLocationPresenterTest {
|
|||
senderName = senderName,
|
||||
senderId = senderId,
|
||||
senderAvatarUrl = avatarUrl,
|
||||
timestamp = 1234567890L,
|
||||
timestamp = 0L,
|
||||
assetType = AssetType.SENDER,
|
||||
)
|
||||
|
||||
|
|
@ -468,7 +468,7 @@ class ShowLocationPresenterTest {
|
|||
private fun aLiveLocationShare(
|
||||
userId: UserId,
|
||||
geoUri: String = "geo:48.8584,2.2945",
|
||||
timestamp: Long = 1234567890L,
|
||||
timestamp: Long = 0L,
|
||||
endTimestamp: Long = Long.MAX_VALUE,
|
||||
assetType: AssetType = AssetType.SENDER,
|
||||
): LiveLocationShare {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue