Noop ordered list

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -247,6 +247,7 @@ class AppModule {
         val res = context.resources
         return SpannableConfiguration.builder(context)
             .theme(SpannableTheme.builder()
+                .blockMargin(0)
                 .linkColor(res.getColor(R.color.colorAccent))
                 .build())
             .build()

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -10,6 +10,7 @@ import androidx.core.content.res.ResourcesCompat
 import android.text.Spanned
 import android.text.style.ClickableSpan
 import android.text.style.ReplacementSpan
+import android.text.style.StyleSpan
 import android.util.Patterns
 import android.view.View
 import chat.rocket.android.R
@@ -23,6 +24,10 @@ import chat.rocket.common.model.SimpleUser
 import chat.rocket.core.model.Message
 import org.commonmark.node.AbstractVisitor
 import org.commonmark.node.Document
+import org.commonmark.node.ListItem
+import org.commonmark.node.Node
+import org.commonmark.node.OrderedList
+import org.commonmark.node.Paragraph
 import org.commonmark.node.Text
 import ru.noties.markwon.Markwon
 import ru.noties.markwon.SpannableBuilder
@@ -59,7 +64,7 @@ class MessageParser @Inject constructor(
         val builder = SpannableBuilder()
         val content = EmojiRepository.shortnameToUnicode(text, true)
         val parentNode = parser.parse(toLenientMarkdown(content))
-        parentNode.accept(SpannableMarkdownVisitor(configuration, builder))
+        parentNode.accept(MarkdownVisitor(configuration, builder))
         parentNode.accept(LinkVisitor(builder))
         parentNode.accept(EmojiVisitor(configuration, builder))
         message.mentions?.let {
@@ -138,6 +143,37 @@ class MessageParser @Inject constructor(
         }
     }
 
+    class MarkdownVisitor(
+        configuration: SpannableConfiguration,
+        val builder: SpannableBuilder
+    ) : SpannableMarkdownVisitor(configuration, builder) {
+
+        /**
+         * NOOP
+         */
+        override fun visit(orderedList: OrderedList) {
+            var number = orderedList.startNumber
+            val delimiter = orderedList.delimiter
+            var node: Node? = orderedList.firstChild
+            while (node != null) {
+                if (node is ListItem) {
+                    newLine()
+                    builder.append("$number$delimiter ")
+                    super.visit(node.firstChild as Paragraph)
+                    newLine()
+                }
+                number++
+                node = node.next
+            }
+        }
+
+        private fun newLine() {
+            if (builder.length() > 0 && '\n' != builder.lastChar()) {
+                builder.append('\n')
+            }
+        }
+    }
+
     class LinkVisitor(private val builder: SpannableBuilder) : AbstractVisitor() {
 
         override fun visit(text: Text) {

app/src/main/res/layout/item_message.xml

@@ -8,10 +8,10 @@
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:paddingBottom="@dimen/message_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/message_item_top_and_bottom_padding">
+    android:paddingTop="@dimen/message_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="@dimen/message_item_top_and_bottom_padding">
 
     <LinearLayout
         android:id="@+id/new_messages_notif"
@@ -19,8 +19,8 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible">
 
@@ -56,20 +56,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/new_messages_notif" />
 
-    <LinearLayout
-        android:id="@+id/top_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:orientation="horizontal"
-        app:layout_constraintStart_toEndOf="@+id/layout_avatar"
-        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif">
-
     <TextView
         android:id="@+id/text_sender"
         style="@style/Sender.Name.TextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/layout_avatar"
+        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif"
         tools:text="Ronald Perkins" />
 
     <TextView
@@ -77,17 +72,23 @@
         style="@style/Timestamp.TextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
+        android:layout_marginStart="4dp"
+        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/text_sender"
         tools:text="11:45 PM" />
 
     <TextView
         android:id="@+id/text_edit_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:text="@string/msg_edited"
         android:textStyle="italic"
         android:visibility="gone"
+        app:layout_constraintBaseline_toBaselineOf="@+id/text_sender"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/text_message_time"
         tools:visibility="visible" />
 
     <ImageView
@@ -95,24 +96,27 @@
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="2dp"
         android:src="@drawable/ic_action_message_star_24dp"
         android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/text_edit_indicator"
+        app:layout_constraintTop_toTopOf="@+id/text_sender"
         tools:visibility="visible" />
-    </LinearLayout>
 
     <TextView
         android:id="@+id/text_content"
         style="@style/Message.TextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="2dp"
         android:layout_marginTop="5dp"
-        app:layout_constraintStart_toStartOf="@+id/top_container"
+        android:layout_marginBottom="2dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/top_container"
-        android:textDirection="locale"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintStart_toStartOf="@+id/text_sender"
+        app:layout_constraintTop_toBottomOf="@+id/text_sender"
         tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
 
     <include

dependencies.gradle

@@ -33,7 +33,7 @@ ext {
             fresco                : '1.9.0',
             kotshi                : '1.0.2',
             frescoImageViewer     : '0.5.1',
-            markwon               : '1.0.3',
+            markwon               : '1.0.6',
             aVLoadingIndicatorView: '2.1.3',
             flexbox               : '0.3.2',