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/pinned_event_feature_flag

Browse source
This commit is contained in:
ganfra 2024-07-29 12:50:02 +02:00
commit 8ab74a7e9c
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gradle/libs.versions.toml
View file

@ -20,7 +20,7 @@ constraintlayout = "2.1.4"
constraintlayout_compose = "1.0.1" constraintlayout_compose = "1.0.1"
lifecycle = "2.7.0" lifecycle = "2.7.0"
activity = "1.9.1" activity = "1.9.1"
media3 = "1.3.1" media3 = "1.4.0"
camera = "1.3.4" camera = "1.3.4"
# Compose # Compose
@ -39,7 +39,7 @@ test_core = "1.6.1"
#other #other
coil = "2.7.0" coil = "2.7.0"
datetime = "0.6.0" datetime = "0.6.0"
dependencyAnalysis = "1.32.0" dependencyAnalysis = "1.33.0"
serialization_json = "1.6.3" serialization_json = "1.6.3"
showkase = "1.0.3" showkase = "1.0.3"
appyx = "1.4.0" appyx = "1.4.0"
@ -75,7 +75,7 @@ oss_licenses_plugin = "com.google.android.gms:oss-licenses-plugin:0.10.6"
# AndroidX # AndroidX
androidx_core = { module = "androidx.core:core", version.ref = "core" } androidx_core = { module = "androidx.core:core", version.ref = "core" }
androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" } androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" }
androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.8.0" androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.8.1"
androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" } androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
androidx_exifinterface = "androidx.exifinterface:exifinterface:1.3.7" androidx_exifinterface = "androidx.exifinterface:exifinterface:1.3.7"
@ -163,7 +163,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0" molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.34" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.35"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" } matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" } matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

4
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
View file

@ -221,6 +221,7 @@ private fun aRustRoomInfo(
numUnreadMessages: ULong = 0uL, numUnreadMessages: ULong = 0uL,
numUnreadNotifications: ULong = 0uL, numUnreadNotifications: ULong = 0uL,
numUnreadMentions: ULong = 0uL, numUnreadMentions: ULong = 0uL,
pinnedEventIds: List<String> = listOf(),
) = RoomInfo( ) = RoomInfo(
id = id, id = id,
displayName = displayName, displayName = displayName,
@ -249,7 +250,8 @@ private fun aRustRoomInfo(
isMarkedUnread = isMarkedUnread, isMarkedUnread = isMarkedUnread,
numUnreadMessages = numUnreadMessages, numUnreadMessages = numUnreadMessages,
numUnreadNotifications = numUnreadNotifications, numUnreadNotifications = numUnreadNotifications,
numUnreadMentions = numUnreadMentions numUnreadMentions = numUnreadMentions,
pinnedEventIds = pinnedEventIds,
) )
class FakeRoomListItem( class FakeRoomListItem(