Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into wallet

Browse source 
# Conflicts:
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
#	libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt
This commit is contained in:
Cobb 2026-04-16 22:05:16 -07:00
commit 0ef6b69a79
912 changed files with 17051 additions and 4425 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
View file

@ -118,15 +118,6 @@ class StateContentFormatter(
"PolicyRuleUser"
}
}
OtherState.RoomAliases -> when (renderingMode) {
RenderingMode.RoomList -> {
Timber.v("Filtering timeline item for room state change: $content")
null
}
RenderingMode.Timeline -> {
"RoomAliases"
}
}
OtherState.RoomCanonicalAlias -> when (renderingMode) {
RenderingMode.RoomList -> {
Timber.v("Filtering timeline item for room state change: $content")

73
libraries/eventformatter/impl/src/main/res/values-ja/translations.xml Normal file
View file

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="state_event_avatar_changed_too">"(アバターも変更)"</string>
<string name="state_event_avatar_url_changed">"%1$s がアバターを変更"</string>
<string name="state_event_avatar_url_changed_by_you">"あなたがアバターを変更"</string>
<string name="state_event_demoted_to_member">"%1$s がメンバーに降格"</string>
<string name="state_event_demoted_to_moderator">"%1$s がモデレーターに降格"</string>
<string name="state_event_display_name_changed_from">"%1$sが表示名を変更: %2$s &gt; %3$s"</string>
<string name="state_event_display_name_changed_from_by_you">"あなたが表示名を変更: %1$s &gt; %2$s"</string>
<string name="state_event_display_name_removed">"%1$sが表示名を削除 (%2$s)"</string>
<string name="state_event_display_name_removed_by_you">"表示名を削除 (%1$s)"</string>
<string name="state_event_display_name_set">"%1$sが表示名を設定: %2$s"</string>
<string name="state_event_display_name_set_by_you">"あなたが表示名を設定: %1$s"</string>
<string name="state_event_promoted_to_administrator">"%1$s が管理者に昇格"</string>
<string name="state_event_promoted_to_moderator">"%1$s がモデレーターに昇格"</string>
<string name="state_event_room_avatar_changed">"%1$sがルームアバターを変更"</string>
<string name="state_event_room_avatar_changed_by_you">"あなたがルームアバターを変更"</string>
<string name="state_event_room_avatar_removed">"%1$sがルームアバターを削除"</string>
<string name="state_event_room_avatar_removed_by_you">"あなたがルームアバターを削除"</string>
<string name="state_event_room_ban">"%1$s が %2$s を追放"</string>
<string name="state_event_room_ban_by_you">"あなたが %1$s を追放"</string>
<string name="state_event_room_ban_by_you_with_reason">"あなたが %1$s を追放: %2$s"</string>
<string name="state_event_room_ban_with_reason">"%1$s が %2$s を追放: %3$s"</string>
<string name="state_event_room_created">"%1$s がルームを作成"</string>
<string name="state_event_room_created_by_you">"あなたがルームを作成"</string>
<string name="state_event_room_invite">"%1$s が %2$s を招待"</string>
<string name="state_event_room_invite_accepted">"%1$s が招待を受諾"</string>
<string name="state_event_room_invite_accepted_by_you">"あなたが招待を受諾"</string>
<string name="state_event_room_invite_by_you">"あなたが %1$s を招待"</string>
<string name="state_event_room_invite_you">"%1$s があなたを招待"</string>
<string name="state_event_room_join">"%1$s がルームに参加"</string>
<string name="state_event_room_join_by_you">"あなたがルームに参加"</string>
<string name="state_event_room_knock">"%1$s が参加をリクエスト"</string>
<string name="state_event_room_knock_accepted">"%1$s が %2$s の参加を許可"</string>
<string name="state_event_room_knock_accepted_by_you">"あなたが %1$s の参加を許可"</string>
<string name="state_event_room_knock_by_you">"あなたが参加をリクエスト"</string>
<string name="state_event_room_knock_denied">"%1$s が %2$s の参加リクエストを拒否"</string>
<string name="state_event_room_knock_denied_by_you">"あなたが %1$s の参加リクエストを拒否"</string>
<string name="state_event_room_knock_denied_you">"%1$s があなたの参加リクエストを拒否"</string>
<string name="state_event_room_knock_retracted">"%1$s が参加リクエストを取り消し"</string>
<string name="state_event_room_knock_retracted_by_you">"あなたが参加リクエストを取り消し"</string>
<string name="state_event_room_leave">"%1$s がルームを退出"</string>
<string name="state_event_room_leave_by_you">"あなたがルームを退出"</string>
<string name="state_event_room_name_changed">"%1$s がルーム名を変更: %2$s"</string>
<string name="state_event_room_name_changed_by_you">"あなたがルーム名を変更: %1$s"</string>
<string name="state_event_room_name_removed">"%1$s がルーム名を削除"</string>
<string name="state_event_room_name_removed_by_you">"あなたがルーム名を削除"</string>
<string name="state_event_room_none">"%1$s による変更はありません"</string>
<string name="state_event_room_none_by_you">"あなたによる変更はありません"</string>
<string name="state_event_room_pinned_events_changed">"%1$s はピン留めメッセージを変更しました"</string>
<string name="state_event_room_pinned_events_changed_by_you">"あなたがピン留めメッセージを変更しました"</string>
<string name="state_event_room_pinned_events_pinned">"%1$s がメッセージをピン留め"</string>
<string name="state_event_room_pinned_events_pinned_by_you">"あなたがメッセージをピン留め"</string>
<string name="state_event_room_pinned_events_unpinned">"%1$s がメッセージのピン留めを解除"</string>
<string name="state_event_room_pinned_events_unpinned_by_you">"あなたがメッセージのピン留めを解除"</string>
<string name="state_event_room_reject">"%1$s が招待を拒否"</string>
<string name="state_event_room_reject_by_you">"あなたが招待を拒否"</string>
<string name="state_event_room_remove">"%1$s が %2$s を削除"</string>
<string name="state_event_room_remove_by_you">"あなたが %1$s を削除"</string>
<string name="state_event_room_remove_by_you_with_reason">"あなたが%1$s を削除: %2$s"</string>
<string name="state_event_room_remove_with_reason">"%1$s が %2$s を削除: %3$s"</string>
<string name="state_event_room_third_party_invite">"%1$s が %2$s をルームに招待"</string>
<string name="state_event_room_third_party_invite_by_you">"あなたが %1$s をルームに招待"</string>
<string name="state_event_room_third_party_revoked_invite">"%1$s が %2$s へのルームの招待を取り消し"</string>
<string name="state_event_room_third_party_revoked_invite_by_you">"あなたが %1$s へのルームの招待を取り消し"</string>
<string name="state_event_room_topic_changed">"%1$s がトピックを変更: %2$s"</string>
<string name="state_event_room_topic_changed_by_you">"あなたがトピックを変更: %1$s"</string>
<string name="state_event_room_topic_removed">"%1$s がルームのトピックを削除"</string>
<string name="state_event_room_topic_removed_by_you">"あなたがルームのトピックを削除"</string>
<string name="state_event_room_unban">"%1$s が %2$s の追放を解除"</string>
<string name="state_event_room_unban_by_you">"あなたが %1$s の追放を解除"</string>
<string name="state_event_room_unknown_membership_change">"%1$s がメンバーシップに未知の変更を追加"</string>
</resources>

8
libraries/eventformatter/impl/src/main/res/values-lt/translations.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="state_event_avatar_changed_too">"(taip pat buvo pakeistas ir avataras)"</string>
<string name="state_event_avatar_url_changed">"%1$s pakeitė savo avatarą"</string>
<string name="state_event_avatar_url_changed_by_you">"Jūs pakeitėte savo avatarą"</string>
<string name="state_event_avatar_url_changed">"%1$s pakeitė savo pseudoportretą"</string>
<string name="state_event_avatar_url_changed_by_you">"Jūs pakeitėte savo pseudoportretą"</string>
<string name="state_event_display_name_changed_from">"%1$s pakeitė savo slapyvardį iš %2$s į %3$s"</string>
<string name="state_event_display_name_changed_from_by_you">"Jūs pakeitėte savo slapyvardį iš %1$s į %2$s"</string>
<string name="state_event_display_name_removed">"%1$s pašalino savo slapyvardį (jis buvo %2$s)"</string>
<string name="state_event_display_name_removed_by_you">"Jūs pašalinote savo slapyvardį (jis buvo %1$s)"</string>
<string name="state_event_display_name_set">"%1$s pakeitė savo slapyvardį į %2$s"</string>
<string name="state_event_display_name_set">"%1$s nustatė savo rodomą vardą į %2$s"</string>
<string name="state_event_display_name_set_by_you">"Jūs nustatėte savo slapyvardį į %1$s"</string>
<string name="state_event_room_avatar_changed">"%1$s pakeitė kambario avatarą"</string>
<string name="state_event_room_avatar_changed_by_you">"Jūs pakeitėte kambario avatarą"</string>
@ -21,7 +21,7 @@
<string name="state_event_room_invite_accepted">"%1$s priėmė kvietimą"</string>
<string name="state_event_room_invite_accepted_by_you">"Priėmėte kvietimą"</string>
<string name="state_event_room_invite_by_you">"Jūs pakvietėte %1$s"</string>
<string name="state_event_room_invite_you">"%1$s pakvietė Jus"</string>
<string name="state_event_room_invite_you">"%1$s pakvietė jus"</string>
<string name="state_event_room_join">"%1$s prisijungė prie kambario"</string>
<string name="state_event_room_join_by_you">"Jūs prisijungėte prie kambario"</string>
<string name="state_event_room_knock">"%1$s prašo prisijungti"</string>

64
libraries/eventformatter/impl/src/main/res/values-vi/translations.xml Normal file
View file

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="state_event_avatar_changed_too">"(ảnh hồ sơ cũng được thay)"</string>
<string name="state_event_avatar_url_changed">"%1$s đổi ảnh hồ sơ"</string>
<string name="state_event_avatar_url_changed_by_you">"Bạn đổi ảnh hồ sơ"</string>
<string name="state_event_demoted_to_member">"%1$s bị giáng cấp xuống thành thành viên"</string>
<string name="state_event_demoted_to_moderator">"%1$s bị giáng chức xuống làm người điều hành"</string>
<string name="state_event_display_name_changed_from">"%1$s đổi tên hiển thị từ %2$s sang %3$s"</string>
<string name="state_event_display_name_changed_from_by_you">"Bạn đổi tên hiển thị từ %1$s sang %2$s"</string>
<string name="state_event_display_name_removed">"%1$s xoá tên hiển thị (trước kia là %2$s)"</string>
<string name="state_event_display_name_removed_by_you">"Bạn xoá tên hiển thị (trước kia là %1$s)"</string>
<string name="state_event_display_name_set">"%1$s đặt tên hiển thị thành %2$s"</string>
<string name="state_event_display_name_set_by_you">"Bạn đặt tên hiển thị thành %1$s"</string>
<string name="state_event_promoted_to_administrator">"%1$s đã được thăng chức lên quản trị viên"</string>
<string name="state_event_promoted_to_moderator">"%1$s đã được thăng chức lên làm người điều hành"</string>
<string name="state_event_room_avatar_changed">"%1$s đổi ảnh phòng"</string>
<string name="state_event_room_avatar_changed_by_you">"Bạn đổi ảnh phòng"</string>
<string name="state_event_room_avatar_removed">"%1$s đã xóa ảnh đại diện của phòng."</string>
<string name="state_event_room_avatar_removed_by_you">"Bạn đã xóa hình đại diện của phòng trò chuyện"</string>
<string name="state_event_room_ban">"%1$s cấm %2$s vào phòng"</string>
<string name="state_event_room_ban_by_you">"Bạn cấm %1$s vào phòng"</string>
<string name="state_event_room_created">"%1$s tạo phòng này"</string>
<string name="state_event_room_created_by_you">"Bạn tạo phòng này"</string>
<string name="state_event_room_invite">"%1$s mời %2$s"</string>
<string name="state_event_room_invite_accepted">"%1$s đã chấp nhận lời mời"</string>
<string name="state_event_room_invite_accepted_by_you">"Bạn đã chấp nhận lời mời"</string>
<string name="state_event_room_invite_by_you">"Bạn mời %1$s"</string>
<string name="state_event_room_invite_you">"%1$s mời bạn"</string>
<string name="state_event_room_join">"%1$s vào phòng"</string>
<string name="state_event_room_join_by_you">"Bạn vào phòng"</string>
<string name="state_event_room_knock">"%1$s đang yêu cầu tham gia"</string>
<string name="state_event_room_knock_accepted">"%1$s được cấp quyền truy cập vào %2$s"</string>
<string name="state_event_room_knock_accepted_by_you">"Bạn đã cho phép %1$s tham gia"</string>
<string name="state_event_room_knock_by_you">"Bạn đã yêu cầu tham gia"</string>
<string name="state_event_room_knock_denied">"%1$s đã từ chối yêu cầu tham gia của %2$s"</string>
<string name="state_event_room_knock_denied_by_you">"Bạn đã từ chối yêu cầu tham gia của %1$s"</string>
<string name="state_event_room_knock_denied_you">"%1$s đã từ chối yêu cầu tham gia của bạn"</string>
<string name="state_event_room_knock_retracted">"%1$s không còn mong muốn tham gia"</string>
<string name="state_event_room_knock_retracted_by_you">"Bạn đã hủy yêu cầu tham gia"</string>
<string name="state_event_room_leave">"%1$s rời phòng"</string>
<string name="state_event_room_leave_by_you">"Bạn rời phòng"</string>
<string name="state_event_room_name_changed">"%1$s đổi tên phòng thành %2$s"</string>
<string name="state_event_room_name_changed_by_you">"Bạn đổi tên phòng thành %1$s"</string>
<string name="state_event_room_name_removed">"%1$s xóa tên phòng"</string>
<string name="state_event_room_name_removed_by_you">"Bạn xóa tên phòng"</string>
<string name="state_event_room_none">"%1$s không có thay đổi nào"</string>
<string name="state_event_room_none_by_you">"Bạn chưa thực hiện thay đổi nào"</string>
<string name="state_event_room_pinned_events_changed_by_you">"Bạn đã thay đổi tin nhắn được ghim"</string>
<string name="state_event_room_reject">"%1$s từ chối lời mời"</string>
<string name="state_event_room_reject_by_you">"Bạn từ chối lời mời"</string>
<string name="state_event_room_remove">"%1$s cho %2$s cút khỏi phòng"</string>
<string name="state_event_room_remove_by_you">"Bạn cho %1$s cút khỏi phòng"</string>
<string name="state_event_room_third_party_invite">"%1$s đã gửi lời mời đến %2$s để tham gia phòng trò chuyện"</string>
<string name="state_event_room_third_party_invite_by_you">"Bạn đã gửi lời mời đến %1$s để tham gia phòng trò chuyện"</string>
<string name="state_event_room_third_party_revoked_invite">"%1$s đã thu hồi lời mời tham gia phòng trò chuyện của %2$s "</string>
<string name="state_event_room_third_party_revoked_invite_by_you">"Bạn đã thu hồi lời mời tham gia phòng trò chuyện của %1$s "</string>
<string name="state_event_room_topic_changed">"%1$s đổi chủ đề sang: %2$s"</string>
<string name="state_event_room_topic_changed_by_you">"Bạn đổi chủ đề sang: %1$s"</string>
<string name="state_event_room_topic_removed">"%1$s đã xóa chủ đề phòng"</string>
<string name="state_event_room_topic_removed_by_you">"Bạn đã xóa chủ đề của phòng."</string>
<string name="state_event_room_unban">"%1$s hủy lệnh cấm với %2$s"</string>
<string name="state_event_room_unban_by_you">"Bạn hủy lệnh cấm với %1$s"</string>
<string name="state_event_room_unknown_membership_change">"%1$s đã thực hiện một thay đổi không xác định đối với tư cách thành viên của họ"</string>
</resources>

10
libraries/eventformatter/impl/src/main/res/values-zh/translations.xml
View file

@ -54,11 +54,11 @@
<string name="state_event_room_pinned_events_unpinned">"%1$s 取消置顶了一条消息"</string>
<string name="state_event_room_pinned_events_unpinned_by_you">"您取消置顶了一条消息"</string>
<string name="state_event_room_reject">"%1$s 拒绝了邀请"</string>
<string name="state_event_room_reject_by_you">"你拒绝了邀请"</string>
<string name="state_event_room_remove">"%1$s 移除了 %2$s"</string>
<string name="state_event_room_remove_by_you">"你移除了 %1$s"</string>
<string name="state_event_room_remove_by_you_with_reason">"您已删除%1$s ：%2$s"</string>
<string name="state_event_room_remove_with_reason">"%1$s已移除%2$s：%3$s"</string>
<string name="state_event_room_reject_by_you">"您拒绝了邀请"</string>
<string name="state_event_room_remove">"%1$s 已移除 %2$s"</string>
<string name="state_event_room_remove_by_you">"您移除了 %1$s"</string>
<string name="state_event_room_remove_by_you_with_reason">"您移除了 %1$s：%2$s"</string>
<string name="state_event_room_remove_with_reason">"%1$s 移除了 %2$s：%3$s"</string>
<string name="state_event_room_third_party_invite">"%1$s 向 %2$s 发送了加入聊天室的邀请"</string>
<string name="state_event_room_third_party_invite_by_you">"你邀请 %1$s 加入聊天室"</string>
<string name="state_event_room_third_party_revoked_invite">"%1$s 撤销了 %2$s 加入聊天室的邀请"</string>

1
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
View file

@ -601,7 +601,6 @@ class DefaultPinnedMessagesBannerFormatterTest {
OtherState.PolicyRuleRoom,
OtherState.PolicyRuleServer,
OtherState.PolicyRuleUser,
OtherState.RoomAliases,
OtherState.RoomCanonicalAlias,
OtherState.RoomGuestAccess,
OtherState.RoomHistoryVisibility,

1
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
View file

@ -746,7 +746,6 @@ class DefaultRoomLatestEventFormatterTest {
OtherState.PolicyRuleRoom,
OtherState.PolicyRuleServer,
OtherState.PolicyRuleUser,
OtherState.RoomAliases,
OtherState.RoomCanonicalAlias,
OtherState.RoomGuestAccess,
OtherState.RoomHistoryVisibility,