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

Merge branch 'develop' into feature/fga/user_moderation_bottomsheet

Browse source
This commit is contained in:
ganfra 2025-05-23 17:28:48 +02:00
commit 03e1926e14
250 changed files with 3339 additions and 2742 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
View file

@ -17,7 +17,6 @@ import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import im.vector.app.features.analytics.plan.Interaction
import io.element.android.appconfig.MatrixConfiguration
import io.element.android.features.leaveroom.api.LeaveRoomEvent
import io.element.android.features.leaveroom.api.LeaveRoomState
import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled
@ -180,6 +179,8 @@ class RoomDetailsPresenter @Inject constructor(
.launchIn(this)
}
val canReportRoom by produceState(false) { value = client.canReportRoom() }
return RoomDetailsState(
roomId = room.roomId,
roomName = roomName,
@ -208,7 +209,7 @@ class RoomDetailsPresenter @Inject constructor(
knockRequestsCount = knockRequestsCount,
canShowSecurityAndPrivacy = canShowSecurityAndPrivacy,
hasMemberVerificationViolations = hasMemberVerificationViolations,
canReportRoom = MatrixConfiguration.CAN_REPORT_ROOM,
canReportRoom = canReportRoom,
eventSink = ::handleEvents,
)
}

8
features/roomdetails/impl/src/main/res/values-cy/translations.xml
View file

@ -67,14 +67,6 @@
<string name="screen_room_details_topic_title">"Pwnc"</string>
<string name="screen_room_details_updating_room">"Wrthi\'n diweddaru ystafell…"</string>
<string name="screen_room_member_list_banned_empty">"Nid oes unrhyw ddefnyddwyr gwaharddedig yn yr ystafell hon."</string>
<plurals name="screen_room_member_list_header_title">
<item quantity="zero">"%1$d personau"</item>
<item quantity="one">"%1$d person"</item>
<item quantity="two">"%1$d berson"</item>
<item quantity="few">"%1$d person"</item>
<item quantity="many">"%1$d pherson"</item>
<item quantity="other">"%1$d person"</item>
</plurals>
<string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Gwahardd o ystafell"</string>
<string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Dileu aelod yn unig"</string>
<string name="screen_room_member_list_manage_member_unban_action">"Adfer"</string>