devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from ouchadam/release-candidate 

[Auto] Release Candidate
This commit is contained in:
Adam Brown 2022-10-27 20:08:51 +01:00 committed by GitHub
parent 02e8743b81 e0f094393b
commit b884ecb69a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies.gradle
View File

@ -146,7 +146,7 @@ ext.Dependencies.with {
accompanistSystemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:0.25.1" accompanistSystemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:0.25.1"
junit = "junit:junit:4.13.2" junit = "junit:junit:4.13.2"
kluent = "org.amshove.kluent:kluent:1.71" kluent = "org.amshove.kluent:kluent:1.72"
mockk = 'io.mockk:mockk:1.13.2' mockk = 'io.mockk:mockk:1.13.2'
matrixOlm = "org.matrix.android:olm-sdk:3.2.12" matrixOlm = "org.matrix.android:olm-sdk:3.2.12"

11
features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
View File

@ -8,7 +8,6 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.* import androidx.compose.foundation.lazy.*
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
@ -200,16 +199,17 @@ private fun ColumnScope.RoomContent(self: UserId, state: RoomState, messageActio
wasPreviousMessageSameSender = wasPreviousMessageSameSender, wasPreviousMessageSameSender = wasPreviousMessageSameSender,
onReply = { messageActions.onReply(item) }, onReply = { messageActions.onReply(item) },
) { ) {
val event = BubbleModel.Event(item.author.id.value, item.author.displayName ?: item.author.id.value, item.edited, item.time)
val status = @Composable { SendStatus(item) } val status = @Composable { SendStatus(item) }
MessageBubble(this, item.toModel(event), status, onLongClick = messageActions.onLongClick) MessageBubble(this, item.toModel(), status, onLongClick = messageActions.onLongClick)
} }
} }
} }
} }
@Composable @Composable
private fun RoomEvent.toModel(event: BubbleModel.Event): BubbleModel = when (this) { private fun RoomEvent.toModel(): BubbleModel {
val event = BubbleModel.Event(this.author.id.value, this.author.displayName ?: this.author.id.value, this.edited, this.time)
return when (this) {
is RoomEvent.Message -> BubbleModel.Text(this.content, event) is RoomEvent.Message -> BubbleModel.Text(this.content, event)
is RoomEvent.Encrypted -> BubbleModel.Encrypted(event) is RoomEvent.Encrypted -> BubbleModel.Encrypted(event)
is RoomEvent.Image -> { is RoomEvent.Image -> {
@ -222,7 +222,8 @@ private fun RoomEvent.toModel(event: BubbleModel.Event): BubbleModel = when (thi
} }
is RoomEvent.Reply -> { is RoomEvent.Reply -> {
BubbleModel.Reply(this.replyingTo.toModel(event), this.message.toModel(event)) BubbleModel.Reply(this.replyingTo.toModel(), this.message.toModel())
}
} }
} }

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"code": 23, "code": 24,
"name": "24/10/2022-V1" "name": "27/10/2022-V1"
} }