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

Merge branch 'develop' into feature/fga/live_location_rendering

Browse source
This commit is contained in:
ganfra 2026-04-20 19:12:21 +02:00
commit 51733ec6fe
248 changed files with 2702 additions and 1913 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListPresenter.kt
View file

@ -8,12 +8,10 @@
package io.element.android.features.messages.impl.threads.list
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.produceState
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import dev.zacsweers.metro.Inject
import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFactory
import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter
@ -97,12 +95,6 @@ class ThreadsListPresenter(
val roomInfo by room.roomInfoFlow.collectAsState()
DisposableEffect(Unit) {
onDispose {
threadsListService.destroy()
}
}
fun handleEvent(event: ThreadsListEvents) {
when (event) {
ThreadsListEvents.Paginate -> if ((paginationStatus as? ThreadListPaginationStatus.Idle)?.hasMoreToLoad == true) {

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedView.kt
View file

@ -26,6 +26,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.theme.Theme
import io.element.android.features.messages.impl.timeline.components.event.TimelineItemAspectRatioBox
import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
import io.element.android.libraries.designsystem.preview.ElementPreview
@ -49,7 +50,7 @@ fun ProtectedView(
.background(Color(0x99000000)),
contentAlignment = Alignment.Center,
) {
ElementTheme(darkTheme = false, applySystemBarsUpdate = false) {
ElementTheme(theme = Theme.Light, applySystemBarsUpdate = false) {
// Not using a button to be able to have correct size
Text(
modifier = Modifier

2
features/messages/impl/src/main/res/values-de/translations.xml
View file

@ -35,7 +35,7 @@
<string name="screen_room_attachment_source_camera_video">"Video aufnehmen"</string>
<string name="screen_room_attachment_source_files">"Anhang"</string>
<string name="screen_room_attachment_source_gallery">"Foto- und Videogalerie"</string>
<string name="screen_room_attachment_source_location">"Standort"</string>
<string name="screen_room_attachment_source_location">"Standort teilen"</string>
<string name="screen_room_attachment_source_poll">"Umfrage"</string>
<string name="screen_room_attachment_text_formatting">"Textformatierung"</string>
<string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist derzeit nicht verfügbar"</string>

2
features/messages/impl/src/main/res/values-hr/translations.xml
View file

@ -35,7 +35,7 @@
<string name="screen_room_attachment_source_camera_video">"Snimi videozapis"</string>
<string name="screen_room_attachment_source_files">"Privitak"</string>
<string name="screen_room_attachment_source_gallery">"Biblioteka fotografija i videozapisa"</string>
<string name="screen_room_attachment_source_location">"Lokacija"</string>
<string name="screen_room_attachment_source_location">"Dijeli lokaciju"</string>
<string name="screen_room_attachment_source_poll">"Anketa"</string>
<string name="screen_room_attachment_text_formatting">"Oblikovanje teksta"</string>
<string name="screen_room_encrypted_history_banner">"Povijest poruka trenutačno nije dostupna."</string>

7
features/messages/impl/src/main/res/values-vi/translations.xml
View file

@ -14,6 +14,7 @@
<string name="emoji_picker_category_objects">"Đồ vật"</string>
<string name="emoji_picker_category_people">"Mặt cười &amp; mọi người"</string>
<string name="emoji_picker_category_places">"Du lịch và địa danh"</string>
<string name="emoji_picker_category_recent">"Biểu tượng cảm xúc gần đây"</string>
<string name="emoji_picker_category_symbols">"Biểu tượng"</string>
<string name="screen_media_upload_preview_error_failed_processing">"Xử lý phương tiện tải lên không thành công, vui lòng thử lại."</string>
<string name="screen_media_upload_preview_error_failed_sending">"Không thể tải lên tệp phương tiện. Vui lòng thử lại."</string>
@ -44,6 +45,12 @@
<string name="screen_room_timeline_less_reactions">"Thu gọn"</string>
<string name="screen_room_timeline_message_copied">"Đã sao chép tin nhắn"</string>
<string name="screen_room_timeline_no_permission_to_post">"Bạn không có quyền gửi tin nhắn trong phòng này"</string>
<plurals name="screen_room_timeline_reaction_a11y">
<item quantity="other">"%1$d thành viên đã phản ứng với %2$s"</item>
</plurals>
<plurals name="screen_room_timeline_reaction_including_you_a11y">
<item quantity="other">"Bạn và thành viên %1$d đã phản ứng với%2$s"</item>
</plurals>
<string name="screen_room_timeline_reactions_show_less">"Thu gọn"</string>
<string name="screen_room_timeline_reactions_show_more">"Xem thêm"</string>
<string name="screen_room_timeline_read_marker_title">"Mới"</string>

2
features/messages/impl/src/main/res/values-zh-rTW/translations.xml
View file

@ -35,7 +35,7 @@
<string name="screen_room_attachment_source_camera_video">"錄影"</string>
<string name="screen_room_attachment_source_files">"附件"</string>
<string name="screen_room_attachment_source_gallery">"照片與影片庫"</string>
<string name="screen_room_attachment_source_location">"位置"</string>
<string name="screen_room_attachment_source_location">"分享位置"</string>
<string name="screen_room_attachment_source_poll">"投票"</string>
<string name="screen_room_attachment_text_formatting">"格式化文字"</string>
<string name="screen_room_encrypted_history_banner">"目前無法檢視訊息歷史紀錄。"</string>