Merge pull request #190 from ouchadam/release-candidate

[Auto] Release Candidate

dependencies.gradle

@@ -100,7 +100,7 @@ ext.Dependencies.with {
     def kotlinVer = "1.7.10"
     def sqldelightVer = "1.5.3"
     def composeVer = "1.2.1"
-    def ktorVer = "2.1.1"
+    def ktorVer = "2.1.2"
 
     google = new DependenciesContainer()
     google.with {
@@ -140,7 +140,7 @@ ext.Dependencies.with {
         ktorJava = "io.ktor:ktor-client-java:${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"
 
         junit = "junit:junit:4.13.2"

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

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

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

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

tools/beta-release/app.js

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

version.json

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