mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-06 07:24:49 +00:00
feat(call): Active call timeline rendering
This commit is contained in:
+2
-1
@@ -79,5 +79,6 @@ enum class AvatarSize(val dp: Dp) {
|
||||
LeaveSpaceRoom(32.dp),
|
||||
SelectParentSpace(32.dp),
|
||||
AccountItem(32.dp),
|
||||
LocationPin(32.dp)
|
||||
LocationPin(32.dp),
|
||||
ActiveCallItem(20.dp)
|
||||
}
|
||||
|
||||
+4
-1
@@ -120,7 +120,10 @@ data object LegacyCallInviteContent : EventContent
|
||||
|
||||
data class CallNotifyContent(
|
||||
val callIntent: CallIntent,
|
||||
val declinedBy: List<UserId>
|
||||
val declinedBy: List<UserId>,
|
||||
val activeMembers: List<UserId>,
|
||||
val isJoined: Boolean,
|
||||
val callStartTsMillis: Long,
|
||||
) : EventContent
|
||||
|
||||
data object UnknownContent : EventContent
|
||||
|
||||
+4
-1
@@ -154,7 +154,10 @@ class TimelineEventContentMapper(
|
||||
} else {
|
||||
CallIntent.VIDEO
|
||||
},
|
||||
declinedBy = it.declinedBy.map(::UserId)
|
||||
declinedBy = it.declinedBy.map(::UserId),
|
||||
activeMembers = it.activeMembers.map(::UserId),
|
||||
callStartTsMillis = it.callStartTsMillis?.toLong() ?: 0,
|
||||
isJoined = it.isJoined
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,6 +214,7 @@
|
||||
<string name="common_blocked_users">"Blocked users"</string>
|
||||
<string name="common_bubbles">"Bubbles"</string>
|
||||
<string name="common_call_declined">"Call declined"</string>
|
||||
<string name="common_call_in_progress">"Call in progress"</string>
|
||||
<string name="common_call_started">"Call started"</string>
|
||||
<string name="common_call_you_declined">"You declined a call"</string>
|
||||
<string name="common_chat_backup">"Chat backup"</string>
|
||||
@@ -258,6 +259,7 @@ Reason: %1$s."</string>
|
||||
<string name="common_forward_message">"Forward message"</string>
|
||||
<string name="common_frequently_used">"Frequently used"</string>
|
||||
<string name="common_gif">"GIF"</string>
|
||||
<string name="common_group_call_in_progress">"Group call in progress"</string>
|
||||
<string name="common_image">"Image"</string>
|
||||
<string name="common_in_reply_to">"In reply to %1$s"</string>
|
||||
<string name="common_install_apk_android">"Install APK"</string>
|
||||
@@ -400,6 +402,7 @@ Reason: %1$s."</string>
|
||||
<string name="common_unmute">"Unmute"</string>
|
||||
<string name="common_unsupported_call">"Unsupported call"</string>
|
||||
<string name="common_unsupported_event">"Unsupported event"</string>
|
||||
<string name="common_user_started_a_call">"%1$s started a call"</string>
|
||||
<string name="common_username">"Username"</string>
|
||||
<string name="common_verification_cancelled">"Verification cancelled"</string>
|
||||
<string name="common_verification_complete">"Verification complete"</string>
|
||||
@@ -534,6 +537,10 @@ Are you sure you want to continue?"</string>
|
||||
<string name="screen_space_list_title">"Spaces"</string>
|
||||
<string name="screen_static_location_sheet_timestamp_description">"Shared %1$s"</string>
|
||||
<string name="screen_static_location_sheet_title">"On the map"</string>
|
||||
<plurals name="screen_timeline_active_call_extra_joined_count">
|
||||
<item quantity="one">"+ %1$d joined"</item>
|
||||
<item quantity="other">"+ %1$d joined"</item>
|
||||
</plurals>
|
||||
<string name="screen_timeline_item_menu_send_failure_changed_identity">"Message not sent because %1$s’s verified digital identity was reset."</string>
|
||||
<string name="screen_timeline_item_menu_send_failure_unsigned_device">"Message not sent because %1$s has not verified all devices."</string>
|
||||
<string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Message not sent because you have not verified one or more of your devices."</string>
|
||||
|
||||
Reference in New Issue
Block a user