Skip to content

Commit 2df8559

Browse files
committed
use proper naming + plugins
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent 7966c1e commit 2df8559

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

app/src/main/java/com/nextcloud/talk/utils/MarkwonUtils.kt renamed to app/src/main/java/com/nextcloud/talk/utils/MarkdownUtils.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package com.nextcloud.talk.utils
99

1010
import android.content.Context
1111
import android.content.Intent
12-
import android.text.method.ScrollingMovementMethod
12+
import android.util.Log
1313
import android.view.View
1414
import androidx.core.net.toUri
1515
import com.nextcloud.talk.R
@@ -19,12 +19,12 @@ import io.noties.markwon.Markwon
1919
import io.noties.markwon.MarkwonConfiguration
2020
import io.noties.markwon.core.MarkwonTheme
2121
import io.noties.markwon.ext.strikethrough.StrikethroughPlugin
22+
import io.noties.markwon.ext.tables.TablePlugin
2223
import io.noties.markwon.ext.tasklist.TaskListDrawable
2324
import io.noties.markwon.ext.tasklist.TaskListPlugin
24-
import io.noties.markwon.movement.MovementMethodPlugin
2525

26-
object MarkwonUtils {
27-
private const val TAG = "MarkwonUtils"
26+
object MarkdownUtils {
27+
private const val TAG = "MarkdownUtils"
2828

2929
fun build(context: Context, textColor: Int): Markwon {
3030
val drawable = TaskListDrawable(textColor, textColor, context.getColor(R.color.bg_default))
@@ -37,6 +37,7 @@ object MarkwonUtils {
3737
override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
3838
builder.linkResolver(object : LinkResolverDef() {
3939
override fun resolve(view: View, link: String) {
40+
Log.i(TAG, "Link - $view / $link")
4041
var linkToOpen = link
4142
if (!(linkToOpen.contains("http://") || linkToOpen.contains("https://"))) {
4243
linkToOpen = "https://$link"
@@ -52,7 +53,7 @@ object MarkwonUtils {
5253
})
5354
.usePlugin(TaskListPlugin.create(drawable))
5455
.usePlugin(StrikethroughPlugin.create())
55-
.usePlugin(MovementMethodPlugin.create(ScrollingMovementMethod.getInstance()))
56+
.usePlugin(TablePlugin.create { _ -> })
5657
.build()
5758
}
5859
}

app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.nextcloud.talk.R
2020
import com.nextcloud.talk.chat.data.model.ChatMessage
2121
import com.nextcloud.talk.ui.theme.ViewThemeUtils
2222
import com.nextcloud.talk.utils.DisplayUtils
23-
import com.nextcloud.talk.utils.MarkwonUtils
23+
import com.nextcloud.talk.utils.MarkdownUtils
2424

2525
class MessageUtils(val context: Context) {
2626
fun enrichChatReplyMessageText(
@@ -196,7 +196,7 @@ class MessageUtils(val context: Context) {
196196
}
197197

198198
fun getRenderedMarkdownText(context: Context, markdown: String, textColor: Int): Spanned {
199-
val markwon = MarkwonUtils.build(context, textColor)
199+
val markwon = MarkdownUtils.build(context, textColor)
200200
return markwon.toMarkdown(markdown)
201201
}
202202

0 commit comments

Comments
 (0)