Merge branch 'develop' into feature/fga/fix_room_list_scroll_position

2023-07-18 23:07:10 +02:00
parent 89334a074b 9741b3df64
commit 60d0b5c134
56 changed files with 97 additions and 143 deletions
@@ -139,7 +139,9 @@ class LoggedInFlowNode @AssistedInject constructor(
                }
            },
            onResume = {
-                syncService.startSync()
+                lifecycleScope.launch {
+                    syncService.startSync()
+                }
            },
            onPause = {
                syncService.stopSync()
@@ -139,7 +139,7 @@ class InviteListPresenter @Inject constructor(
    private fun CoroutineScope.acceptInvite(roomId: RoomId, acceptedAction: MutableState<Async<RoomId>>) = launch {
        suspend {
            client.getRoom(roomId)?.use {
-                it.acceptInvitation().getOrThrow()
+                it.join().getOrThrow()
                notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId)
                analyticsService.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.Invite))
            }
@@ -150,7 +150,7 @@ class InviteListPresenter @Inject constructor(
    private fun CoroutineScope.declineInvite(roomId: RoomId, declinedAction: MutableState<Async<Unit>>) = launch {
        suspend {
            client.getRoom(roomId)?.use {
-                it.rejectInvitation().getOrThrow()
+                it.leave().getOrThrow()
                notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId)
            }
            Unit
@@ -211,7 +211,6 @@ class InviteListPresenterTests {

            skipItems(2)

-            Truth.assertThat(room.isInviteRejected).isTrue()
            Truth.assertThat(fakeNotificationDrawerManager.getClearMembershipNotificationForRoomCount(client.sessionId, A_ROOM_ID)).isEqualTo(1)
        }
    }
@@ -225,7 +224,7 @@ class InviteListPresenterTests {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
-        room.givenRejectInviteResult(Result.failure(ex))
+        room.givenLeaveRoomError(ex)
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@@ -242,7 +241,6 @@ class InviteListPresenterTests {

            val newState = awaitItem()

-            Truth.assertThat(room.isInviteRejected).isTrue()
            Truth.assertThat(newState.declinedAction).isEqualTo(Async.Failure<Unit>(ex))
        }
    }
@@ -256,7 +254,7 @@ class InviteListPresenterTests {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
-        room.givenRejectInviteResult(Result.failure(ex))
+        room.givenLeaveRoomError(ex)
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@@ -298,7 +296,6 @@ class InviteListPresenterTests {

            val newState = awaitItem()

-            Truth.assertThat(room.isInviteAccepted).isTrue()
            Truth.assertThat(newState.acceptedAction).isEqualTo(Async.Success(A_ROOM_ID))
            Truth.assertThat(fakeNotificationDrawerManager.getClearMembershipNotificationForRoomCount(client.sessionId, A_ROOM_ID)).isEqualTo(1)
        }
@@ -313,7 +310,7 @@ class InviteListPresenterTests {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
-        room.givenAcceptInviteResult(Result.failure(ex))
+        room.givenJoinRoomResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@@ -322,10 +319,7 @@ class InviteListPresenterTests {
            val originalState = awaitItem()
            originalState.eventSink(InviteListEvents.AcceptInvite(originalState.inviteList[0]))

-            val newState = awaitItem()
-
-            Truth.assertThat(room.isInviteAccepted).isTrue()
-            Truth.assertThat(newState.acceptedAction).isEqualTo(Async.Failure<RoomId>(ex))
+            Truth.assertThat(awaitItem().acceptedAction).isEqualTo(Async.Failure<RoomId>(ex))
        }
    }

@@ -338,7 +332,7 @@ class InviteListPresenterTests {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
-        room.givenAcceptInviteResult(Result.failure(ex))
+        room.givenJoinRoomResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@@ -51,8 +51,8 @@ import io.element.android.libraries.theme.ElementTheme
 private val BUBBLE_RADIUS = 12.dp
 private val BUBBLE_INCOMING_OFFSET = 16.dp

-// Design says: The maximum width of a bubble is still 3/4 of the screen width
-private const val BUBBLE_WIDTH_RATIO = 0.75f
+// Design says: The maximum width of a bubble is still 3/4 of the screen width. But try with 85% now.
+private const val BUBBLE_WIDTH_RATIO = 0.85f

@OptIn(ExperimentalFoundationApi::class)
@Composable
@@ -145,7 +145,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.31"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.34"
 sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
@@ -95,9 +95,7 @@ interface MatrixRoom : Closeable {

    suspend fun leave(): Result<Unit>

-    suspend fun acceptInvitation(): Result<Unit>
-
-    suspend fun rejectInvitation(): Result<Unit>
+    suspend fun join(): Result<Unit>

    suspend fun inviteUserById(id: UserId): Result<Unit>

@@ -22,7 +22,7 @@ interface SyncService {
    /**
     * Tries to start the sync. If already syncing it has no effect.
     */
-    fun startSync(): Result<Unit>
+    suspend fun startSync(): Result<Unit>

    /**
     * Tries to stop the sync. If service is not syncing it has no effect.
@@ -73,10 +73,12 @@ import java.io.File
 import org.matrix.rustcomponents.sdk.CreateRoomParameters as RustCreateRoomParameters
 import org.matrix.rustcomponents.sdk.RoomPreset as RustRoomPreset
 import org.matrix.rustcomponents.sdk.RoomVisibility as RustRoomVisibility
+import org.matrix.rustcomponents.sdk.SyncService as ClientSyncService

@OptIn(ExperimentalCoroutinesApi::class)
 class RustMatrixClient constructor(
    private val client: Client,
+    private val syncService: ClientSyncService,
    private val sessionStore: SessionStore,
    appCoroutineScope: CoroutineScope,
    private val dispatchers: CoroutineDispatchers,
@@ -86,14 +88,11 @@ class RustMatrixClient constructor(
 ) : MatrixClient {

    override val sessionId: UserId = UserId(client.userId())
-    private val app = client.app().use { builder ->
-        builder.finish()
-    }
-    private val roomListService = app.roomListService()
+    private val roomListService = syncService.roomListService()
    private val sessionDispatcher = dispatchers.io.limitedParallelism(64)
    private val sessionCoroutineScope = appCoroutineScope.childScope(dispatchers.main, "Session-${sessionId}")
    private val verificationService = RustSessionVerificationService()
-    private val syncService = RustSyncService(app, roomListService.stateFlow(), sessionCoroutineScope)
+    private val rustSyncService = RustSyncService(syncService, roomListService.stateFlow(), sessionCoroutineScope)
    private val pushersService = RustPushersService(
        client = client,
        dispatchers = dispatchers,
@@ -131,7 +130,7 @@ class RustMatrixClient constructor(

    init {
        client.setDelegate(clientDelegate)
-        syncService.syncState
+        rustSyncService.syncState
            .onEach { syncState ->
                if (syncState == SyncState.Syncing) {
                    onSlidingSyncUpdate()
@@ -247,7 +246,7 @@ class RustMatrixClient constructor(
            }
        }

-    override fun syncService(): SyncService = syncService
+    override fun syncService(): SyncService = rustSyncService

    override fun sessionVerificationService(): SessionVerificationService = verificationService

@@ -259,7 +258,7 @@ class RustMatrixClient constructor(
        sessionCoroutineScope.cancel()
        client.setDelegate(null)
        verificationService.destroy()
-        app.destroy()
+        syncService.destroy()
        roomListService.destroy()
        notificationClient.destroy()
        client.destroy()
@@ -181,9 +181,11 @@ class RustMatrixAuthenticationService @Inject constructor(
         */
    }

-    private fun createMatrixClient(client: Client): MatrixClient {
+    private suspend fun createMatrixClient(client: Client): MatrixClient {
+        val syncService = client.syncService().finish()
        return RustMatrixClient(
            client = client,
+            syncService = syncService,
            sessionStore = sessionStore,
            appCoroutineScope = appCoroutineScope,
            dispatchers = coroutineDispatchers,
@@ -43,7 +43,6 @@ import io.element.android.libraries.matrix.impl.timeline.RustMatrixTimeline
 import io.element.android.libraries.matrix.impl.timeline.backPaginationStatusFlow
 import io.element.android.libraries.matrix.impl.timeline.timelineDiffFlow
 import io.element.android.libraries.sessionstorage.api.SessionData
-import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -82,6 +81,7 @@ class RustMatrixRoom(

    // Create a dispatcher for all room methods...
    private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
+
    //...except getMember methods as it could quickly fill the roomDispatcher...
    private val roomMembersDispatcher = coroutineDispatchers.io.limitedParallelism(8)

@@ -257,15 +257,9 @@ class RustMatrixRoom(
        }
    }

-    override suspend fun acceptInvitation(): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun join(): Result<Unit> = withContext(roomDispatcher) {
        runCatching {
-            innerRoom.acceptInvitation()
-        }
-    }
-
-    override suspend fun rejectInvitation(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.rejectInvitation()
+            innerRoom.join()
        }
    }

@@ -17,8 +17,8 @@
 package io.element.android.libraries.matrix.impl.sync

 import io.element.android.libraries.matrix.api.sync.SyncState
-import org.matrix.rustcomponents.sdk.AppState
 import org.matrix.rustcomponents.sdk.RoomListServiceState
+import org.matrix.rustcomponents.sdk.SyncServiceState

 internal fun RoomListServiceState.toSyncState(): SyncState {
    return when (this) {
@@ -30,10 +30,11 @@ internal fun RoomListServiceState.toSyncState(): SyncState {
    }
 }

-internal fun AppState.toSyncState(): SyncState {
+internal fun SyncServiceState.toSyncState(): SyncState {
    return when (this) {
-        AppState.RUNNING -> SyncState.Syncing
-        AppState.TERMINATED -> SyncState.Terminated
-        AppState.ERROR -> SyncState.InError
+        SyncServiceState.IDLE -> SyncState.Idle
+        SyncServiceState.RUNNING -> SyncState.Syncing
+        SyncServiceState.TERMINATED -> SyncState.Terminated
+        SyncServiceState.ERROR -> SyncState.InError
    }
 }
@@ -26,24 +26,24 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
-import org.matrix.rustcomponents.sdk.App
 import org.matrix.rustcomponents.sdk.RoomListServiceState
+import org.matrix.rustcomponents.sdk.SyncServiceInterface
 import timber.log.Timber

 class RustSyncService(
-    private val app: App,
+    private val innerSyncService: SyncServiceInterface,
    roomListStateFlow: Flow<RoomListServiceState>,
    sessionCoroutineScope: CoroutineScope
 ) : SyncService {

-    override fun startSync() = runCatching {
+    override suspend fun startSync() = runCatching {
        Timber.v("Start sync")
-        app.start()
+        innerSyncService.start()
    }

    override fun stopSync() = runCatching {
        Timber.v("Stop sync")
-        app.pause()
+        innerSyncService.pause()
    }

    override val syncState: StateFlow<SyncState> =
@@ -21,14 +21,14 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.buffer
-import org.matrix.rustcomponents.sdk.App
-import org.matrix.rustcomponents.sdk.AppState
-import org.matrix.rustcomponents.sdk.AppStateObserver
+import org.matrix.rustcomponents.sdk.SyncService
+import org.matrix.rustcomponents.sdk.SyncServiceState
+import org.matrix.rustcomponents.sdk.SyncServiceStateObserver

-fun App.stateFlow(): Flow<AppState> =
+fun SyncService.stateFlow(): Flow<SyncServiceState> =
    mxCallbackFlow {
-        val listener = object : AppStateObserver {
-            override fun onUpdate(state: AppState) {
+        val listener = object : SyncServiceStateObserver {
+            override fun onUpdate(state: SyncServiceState) {
                trySendBlocking(state)
            }
        }
@@ -63,8 +63,7 @@ class FakeMatrixRoom(
    private var userDisplayNameResult = Result.success<String?>(null)
    private var userAvatarUrlResult = Result.success<String?>(null)
    private var updateMembersResult: Result<Unit> = Result.success(Unit)
-    private var acceptInviteResult = Result.success(Unit)
-    private var rejectInviteResult = Result.success(Unit)
+    private var joinRoomResult = Result.success(Unit)
    private var inviteUserResult = Result.success(Unit)
    private var canInviteResult = Result.success(true)
    private val canSendStateResults = mutableMapOf<StateEventType, Result<Boolean>>()
@@ -101,11 +100,6 @@ class FakeMatrixRoom(
    var sendLocationCount: Int = 0
        private set

-    var isInviteAccepted: Boolean = false
-        private set
-
-    var isInviteRejected: Boolean = false
-        private set

    var invitedUserId: UserId? = null
        private set
@@ -196,16 +190,11 @@ class FakeMatrixRoom(
        return Result.success(Unit)
    }

-    override suspend fun leave(): Result<Unit> = leaveRoomError?.let { Result.failure(it) } ?: Result.success(Unit)
+    override suspend fun leave(): Result<Unit> =
+        leaveRoomError?.let { Result.failure(it) } ?: Result.success(Unit)

-    override suspend fun acceptInvitation(): Result<Unit> {
-        isInviteAccepted = true
-        return acceptInviteResult
-    }
-
-    override suspend fun rejectInvitation(): Result<Unit> {
-        isInviteRejected = true
-        return rejectInviteResult
+    override suspend fun join(): Result<Unit> {
+        return joinRoomResult
    }

    override suspend fun inviteUserById(id: UserId): Result<Unit> = simulateLongTask {
@@ -316,12 +305,8 @@ class FakeMatrixRoom(
        userAvatarUrlResult = avatarUrl
    }

-    fun givenAcceptInviteResult(result: Result<Unit>) {
-        acceptInviteResult = result
-    }
-
-    fun givenRejectInviteResult(result: Result<Unit>) {
-        rejectInviteResult = result
+    fun givenJoinRoomResult(result: Result<Unit>) {
+        joinRoomResult = result
    }

    fun givenInviteUserResult(result: Result<Unit>) {
@@ -29,7 +29,7 @@ class FakeSyncService : SyncService {
        syncStateFlow.value = SyncState.InError
    }

-    override fun startSync(): Result<Unit> {
+    override suspend fun startSync(): Result<Unit> {
        syncStateFlow.value = SyncState.Syncing
        return Result.success(Unit)
    }
@@ -41,6 +41,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
@@ -108,7 +109,9 @@ class RoomListScreen(

        DisposableEffect(Unit) {
            Timber.w("Start sync!")
-            matrixClient.syncService().startSync()
+            runBlocking {
+                matrixClient.syncService().startSync()
+            }
            onDispose {
                Timber.w("Stop sync!")
                matrixClient.syncService().stopSync()
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b83378cdfb20b5ffc781fc514c5a4d3aaa0714101b12a572f032f92ec13180c
-size 9776
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40d1ea7620f7f830f52b87fbe32d39d4c01ddeeeb10535da17f7207acc80a1d6
-size 11821
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11e2a8b0a79c56b379d387a3987362d5309e7f30903b940994ed43217de1380d
-size 21441
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e00510a5f35eb33aaef15c30e6caac62045d8e4c37c032a24922bbb749ad0375
-size 9817
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:229d83ed02804137ab1dad4114eecc6d52d6a0e3ccbad436cf226f6cfc628cf7
-size 12200
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27fff9f0ea88cf06934298ea6155cbf4dd49c370cc5d0a14b4d387ac8a7e7c39
-size 23203
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c806ee0293d94ab1c882b0f0ceaac2c7ac69d587f47cc22b4d16bc331351a2e
-size 14711
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77c97c6c99943858530219234356459a7f0a88774332a4f11cd738b92ee15c91
-size 14200
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:341bd6a72040547c9f8e30574dcf4cf416bca3f2581c8ecd460d4291d3eb1974
-size 138376
+oid sha256:38c6d3f4a47ed89c3deb4150024b49c0a533a859f21a1592a82309b8c7316ea4
+size 152242
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e86c185d1b669c3c15614054f877fbf2219a2e700d36a765664ac132d148fe7
-size 142142
+oid sha256:f82840398e396e038ad68a5fe855394a0088c413e7aade339998b8ed63fb1c09
+size 157273
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2531a3845cd5136fd543a90ad05d497eda31a9bd8662a1e0ea7d503d6cbe76a9
-size 62525
+oid sha256:527dcf9001131276820a7853ae40a91e906ce9398609e439328991beb75bdcbc
+size 62184
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aab12d61c532d72ce9b2cae609c4161976500032b2b432b961cda5652595e9fc
-size 64624
+oid sha256:116d47547b64ac8f5403acfb79b1e1f0cdb6f8de6dafb3a5ca59351a6fa8cc4e
+size 64207
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec8841fe56779bd507a130cb527a045ea2cad4da922f7828f5795dda4d10445d
-size 68965
+oid sha256:ab3ce102aa2a3be65e52d26f261c5860f022bd0755c8069ff86c7e75bfe6952c
+size 68744
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef0bb4d881ed1113c8c0ad320cf3c8f220624514afae63ce82364e3b2c98c907
-size 70923
+oid sha256:08479dcbaaa215af9df4d8bf2d257b0eb3a33da55dcb449ea5b6441972765636
+size 70616
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c8fbdf767801956f2211c6b3425dd48e0c891ceda7c32d8e932cc4e68bba188
-size 64393
+oid sha256:37fadb92faac0c5f85e1e198170d4e10b2b7d54bb3d97e3efd3a0c02e4e6f609
+size 63795
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38d8b6b08174f0735c3e1ad0aa48ea4eed5d3c59d2ef58f1eb6016af454e51fa
-size 66925
+oid sha256:90d0cb45a49afc59df03cd4caa6bab215560cbd13c259d25a7ec7990e551df91
+size 66397
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c48bd869248350abe61e639a9201a68905364aa9ac94c5205daa27e31500614e
-size 71261
+oid sha256:86b912e31d126699fa2e7858d78e703676ed220f159994b2e8ea885c07054a43
+size 70816
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:984a26ad164ef50fd356184662b9e25c8d9e1d7a277e47fdb6222877a52edc26
-size 74019
+oid sha256:e830ca620428646fc06ff1682354445bf4afc9566c55c7ec56fa87aca4cb4167
+size 73556
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10ca9141ab5b383d5fdc73ffff878663706d56cf96bfc3f4dfb47a5c102e460b
-size 84109
+oid sha256:7c5ef7519aef3badeda3983b2ec5474f31404bc06b4b46b9829848dc7884fe1d
+size 81749
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccd377cc8c709cc6dc963224ce1937b3d72a39281327ed917791441817df979b
-size 87831
+oid sha256:c9e9b769422e4714e87ace97058e5a8f064e3b927e3a7c6042494de8381d6b09
+size 85856
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63fb78f8b81e7a621223b6fb9d133cd66edde2dd837e8213d0195d253abb5d93
-size 119401
+oid sha256:4970830b042e7b6588c03bf632ae3ade5b39de7339e27618ee341cbd9861c0e9
+size 129351
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c04acca24e2da6eb9b04e63d9ec4db7f9620e85a6ceb65190a8ab96dd6fee51
-size 124793
+oid sha256:4aba48e03e8424e5ff131c22fd5a606280745dd318f5822e2167f3b39794ff41
+size 134569
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14ecdfd226a25743e3fac8850318216d6ec193755fa7559fd5523236b7835bc6
-size 89754
+oid sha256:dc695bfc589e8e5a852eeb9b2828ce968d17519bb5be957cf2734a7d6d9cc356
+size 89482
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d08de923f29ec6c3c2bf735ca0d015ca1097c95484119d1d39bb8c3f93f31100
-size 363776
+oid sha256:9efb4310c2eed085f8f72be66d725c628e07373cd18c262c18be510d7b042f69
+size 393373
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e8832da336aea6c7ebb3621668569ff16238042fb9650afcd938594a59fd3ae
-size 322771
+oid sha256:19982d091ffcb15a422e75461adb3d039775645eaf74b6bfd4a3ee617dd4555f
+size 347932
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f729f89dce978bb9e061826389e0db1af0e18835e4cd1ab6cbfaa31f4fd3152f
-size 84942
+oid sha256:167f8368e0b94aa05e5d1cc30055e3b0c2c910752d719092ef2d34aae09dc832
+size 84649
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03a4b62920af61098e850cfca6a6f43acd7b310094fb70e1c3e4b7e29465e244
-size 173851
+oid sha256:6ee754e789926bfd12212a21b6ff882ffca337d6903125ba5e1d7cd0c1c218ec
+size 189364
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebcbb40acf19fb489f6a8068a22af0b79c304be46863e77fa12b3b333065a1b2
-size 164622
+oid sha256:29f9ba8c19287b037f67aec5af4469174eb878b7ed5baf222f66e159faee6e16
+size 178410