devol/smalltalk-matrix
1
0
Fork 0
mirror of https://github.com/ouchadam/small-talk.git synced 2025-02-09 16:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from ouchadam/release-candidate

Browse Source 
[Auto] Release Candidate
This commit is contained in:
Adam Brown 2022-10-06 20:10:39 +01:00 committed by GitHub
commit e2f7b935d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dependencies.gradle
View File

@ -100,7 +100,7 @@ ext.Dependencies.with {
def kotlinVer = "1.7.10" def kotlinVer = "1.7.10"
def sqldelightVer = "1.5.3" def sqldelightVer = "1.5.3"
def composeVer = "1.2.1" def composeVer = "1.2.1"
def ktorVer = "2.1.1" def ktorVer = "2.1.2"
google = new DependenciesContainer() google = new DependenciesContainer()
google.with { google.with {
@ -140,7 +140,7 @@ ext.Dependencies.with {
ktorJava = "io.ktor:ktor-client-java:${ktorVer}" ktorJava = "io.ktor:ktor-client-java:${ktorVer}"
ktorContentNegotiation = "io.ktor:ktor-client-content-negotiation:${ktorVer}" ktorContentNegotiation = "io.ktor:ktor-client-content-negotiation:${ktorVer}"
coil = "io.coil-kt:coil-compose:2.2.1" coil = "io.coil-kt:coil-compose:2.2.2"
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"

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

@ -674,12 +674,12 @@ private fun TextComposer(state: ComposerState.Text, onTextChange: (String) -> Un
fontSize = 11.sp, fontSize = 11.sp,
text = replyName, text = replyName,
maxLines = 1, maxLines = 1,
color = SmallTalkTheme.extendedColors.onSelfBubble color = SmallTalkTheme.extendedColors.onOthersBubble
) )
Text( Text(
text = it.content, text = it.content,
color = SmallTalkTheme.extendedColors.onSelfBubble, color = SmallTalkTheme.extendedColors.onOthersBubble,
fontSize = 14.sp, fontSize = 14.sp,
maxLines = 2, maxLines = 2,
modifier = Modifier.wrapContentSize(), modifier = Modifier.wrapContentSize(),

11
matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomEventFactory.kt
View File

@ -64,10 +64,17 @@ fun String.stripTags() = this
} }
.trim() .trim()
.replaceLinks() .replaceLinks()
.replace("<em>", "") .removeTag("p")
.replace("</em>", "") .removeTag("em")
.removeTag("strong")
.removeTag("code")
.removeTag("pre")
.replace("&quot;", "\"") .replace("&quot;", "\"")
.replace("&#39;", "'") .replace("&#39;", "'")
.replace("<br />", "\n")
.replace("<br/>", "\n")
private fun String.removeTag(name: String) = this.replace("<$name>", "").replace("/$name>", "")
private fun String.replaceLinks(): String { private fun String.replaceLinks(): String {
return this.indexOfOrNull("<a href=")?.let { start -> return this.indexOfOrNull("<a href=")?.let { start ->

2
tools/beta-release/app.js
View File

@ -113,7 +113,7 @@ const enablePrAutoMerge = async (github, prNodeId) => {
`, `,
{ {
pullRequestId: prNodeId, pullRequestId: prNodeId,
mergeMethod: "REBASE" mergeMethod: "MERGE"
} }
) )
} }

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"code": 20, "code": 21,
"name": "03/10/2022-V1" "name": "06/10/2022-V1"
} }