Delegate direction chars to bitmap builder

Author: tuanchauict

libs/monobitmap-manager/src/main/kotlin/mono/bitmap/manager/factory/LineBitmapFactory.kt

@@ -4,6 +4,7 @@
 
 package mono.bitmap.manager.factory
 
+import mono.common.Characters
 import mono.graphics.bitmap.MonoBitmap
 import mono.graphics.geo.Point
 import mono.shape.extra.LineExtra
@@ -26,8 +27,8 @@ object LineBitmapFactory {
         val strokeStyle = lineExtra.strokeStyle ?: PredefinedStraightStrokeStyle.NO_STROKE
         createCharPoints(jointPoints, strokeStyle)
             .forEachIndexed { index, pointChar ->
-                val char = if (dashPattern.isGap(index)) ' ' else pointChar.char
-                bitmapBuilder.put(pointChar.top, pointChar.left, char)
+                val visualChar = if (dashPattern.isGap(index)) ' ' else pointChar.char
+                bitmapBuilder.put(pointChar.top, pointChar.left, visualChar, pointChar.char)
             }
 
         val startAnchor = lineExtra.startAnchor
@@ -124,7 +125,13 @@ object LineBitmapFactory {
         } else {
             if (anchor.top < previousPoint.top) anchorChar.top else anchorChar.bottom
         }
-        put(anchor.row, anchor.column, char)
+        // Anchor point won't override the direction char.
+        put(
+            row = anchor.row,
+            column = anchor.column,
+            visualChar = char,
+            directionChar = Characters.TRANSPARENT_CHAR
+        )
     }
 
     private fun isHorizontal(point1: Point, point2: Point): Boolean = point1.top == point2.top
@@ -137,8 +144,8 @@ object LineBitmapFactory {
     ) {
         private val builder = MonoBitmap.Builder(width, height)
 
-        fun put(row: Int, column: Int, char: Char) =
-            builder.put(row - row0, column - column0, char)
+        fun put(row: Int, column: Int, visualChar: Char, directionChar: Char) =
+            builder.put(row - row0, column - column0, visualChar, directionChar)
 
         fun toBitmap(): MonoBitmap = builder.toBitmap()
 

libs/monobitmap-manager/src/main/kotlin/mono/bitmap/manager/factory/RectangleBitmapFactory.kt

@@ -48,7 +48,12 @@ object RectangleBitmapFactory {
         dashPattern: StraightStrokeDashPattern
     ) {
         if (size.width == 1 && size.height == 1) {
-            put(0, 0, '▫')
+            put(
+                row = 0,
+                column = 0,
+                visualChar = '▫',
+                directionChar = '▫',
+            )
             return
         }
 
@@ -83,8 +88,13 @@ object RectangleBitmapFactory {
         pointChars
             .flatMap { it }
             .forEachIndexed { index, pointChar ->
-                val char = if (dashPattern.isGap(index)) ' ' else pointChar.char
-                put(pointChar.top, pointChar.left, char)
+                val visualChar = if (dashPattern.isGap(index)) ' ' else pointChar.char
+                put(
+                    row = pointChar.top,
+                    column = pointChar.left,
+                    visualChar = visualChar,
+                    directionChar = pointChar.char
+                )
             }
     }
 }

libs/monobitmap-manager/src/main/kotlin/mono/bitmap/manager/factory/TextBitmapFactory.kt

@@ -48,6 +48,7 @@ object TextBitmapFactory {
                 } else {
                     (maxTextHeight - renderableText.size) / 2 + rowOffset
                 }
+
             TextAlign.VerticalAlign.BOTTOM ->
                 if (maxTextHeight < renderableText.size) {
                     rowOffset
@@ -67,7 +68,12 @@ object TextBitmapFactory {
             for (colIndex in row.indices) {
                 val char = row[colIndex]
                 if (char != ' ') {
-                    put(row0 + rowIndex, col0 + colIndex, char)
+                    put(
+                        row = row0 + rowIndex,
+                        column = col0 + colIndex,
+                        visualChar = char,
+                        directionChar = char
+                    )
                 }
             }
         }

libs/monobitmap/src/main/kotlin/mono/graphics/bitmap/MonoBitmap.kt

@@ -52,11 +52,14 @@ class MonoBitmap private constructor(val matrix: List<Row>) {
             MutableList(width) { TRANSPARENT_CHAR }
         }
 
-        fun put(row: Int, column: Int, char: Char) {
+        fun put(row: Int, column: Int, visualChar: Char, directionChar: Char) {
             if (row in 0 until height && column in 0 until width) {
-                visualMatrix[row][column] = char
-                // TODO: Delegate direction char
-                directionMatrix[row][column] = char
+                visualMatrix[row][column] = visualChar
+
+                // The direction char is only override with non-transparent chars.
+                if (directionChar != TRANSPARENT_CHAR) {
+                    directionMatrix[row][column] = directionChar
+                }
             }
         }
 

libs/monobitmap/src/main/kotlin/mono/graphics/bitmap/drawable/NinePatchDrawable.kt

@@ -26,7 +26,13 @@ class NinePatchDrawable(
         val colIndexes = horizontalRepeatableRange.toIndexes(width, pattern.width)
         for (row in 0 until height) {
             for (col in 0 until width) {
-                builder.put(row, col, pattern.getChar(rowIndexes[row], colIndexes[col]))
+                builder.put(
+                    row = row,
+                    column = col,
+                    visualChar = pattern.getChar(rowIndexes[row], colIndexes[col]),
+                    // TODO: Think about a way to support direction chars to 9-patch drawable
+                    directionChar = pattern.getChar(rowIndexes[row], colIndexes[col]),
+                )
             }
         }
         return builder.toBitmap()