feat: unify lists' gaps with Android implementation (#130)

Author: szydlovsky

ios/config/EditorConfig.h

@@ -50,7 +50,6 @@
 - (UIColor *)orderedListMarkerColor;
 - (void)setOrderedListMarkerColor:(UIColor *)newValue;
 - (UIFont *)orderedListMarkerFont;
-- (CGFloat)orderedListMarkerWidth;
 - (UIColor *)unorderedListBulletColor;
 - (void)setUnorderedListBulletColor:(UIColor *)newValue;
 - (CGFloat)unorderedListBulletSize;

ios/config/EditorConfig.mm

@@ -313,15 +313,6 @@ - (UIFont *)orderedListMarkerFont {
   return _orderedListMarkerFont;
 }
 
-- (CGFloat)orderedListMarkerWidth {
-  NSDictionary *markerAttributes = @{
-    NSFontAttributeName: [self primaryFont],
-    NSForegroundColorAttributeName: [self primaryColor]
-  };
-  // TODO: marker widths could be dynamic, for now we settle with (usually) the widest 2-digit marker
-  return [@"88." sizeWithAttributes:markerAttributes].width;
-}
-
 - (UIColor *)unorderedListBulletColor {
   return _unorderedListBulletColor;
 }

ios/styles/OrderedListStyle.mm

@@ -13,8 +13,8 @@ + (StyleType)getStyleType { return OrderedList; }
 
 - (CGFloat)getHeadIndent {
   // lists are drawn manually
-  // margin before marker + marker width + gap between marker and paragraph
-  return [_editor->config orderedListMarginLeft] + [_editor->config orderedListMarkerWidth] + [_editor->config orderedListGapWidth];
+  // margin before marker + gap between marker and paragraph
+  return [_editor->config orderedListMarginLeft] + [_editor->config orderedListGapWidth];
 }
 
 - (instancetype)initWithEditor:(id)editor {

ios/styles/UnorderedListStyle.mm

@@ -13,8 +13,8 @@ + (StyleType)getStyleType { return UnorderedList; }
 
 - (CGFloat)getHeadIndent {
   // lists are drawn manually
-  // margin before bullet + bullet size + gap between bullet and paragraph
-  return [_editor->config unorderedListMarginLeft] + [_editor->config unorderedListBulletSize] + [_editor->config unorderedListGapWidth];
+  // margin before bullet + gap between bullet and paragraph
+  return [_editor->config unorderedListMarginLeft] + [_editor->config unorderedListGapWidth];
 }
 
 - (instancetype)initWithEditor:(id)editor {

ios/utils/LayoutManagerExtension.mm

@@ -107,14 +107,13 @@ - (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(CGPoint)orig
           if(pStyle.textLists.firstObject.markerFormat == NSTextListMarkerDecimal) {
             CGFloat gapWidth = [typedEditor->config orderedListGapWidth];
             CGFloat markerWidth = [marker sizeWithAttributes:markerAttributes].width;
-            CGFloat rightEdge = usedRect.origin.x - gapWidth;
-            CGFloat numberX = rightEdge - markerWidth;
+            CGFloat markerX = usedRect.origin.x - gapWidth - markerWidth/2;
 
-            [marker drawAtPoint:CGPointMake(numberX, usedRect.origin.y + origin.y) withAttributes:markerAttributes];
+            [marker drawAtPoint:CGPointMake(markerX, usedRect.origin.y + origin.y) withAttributes:markerAttributes];
           } else {
             CGFloat gapWidth = [typedEditor->config unorderedListGapWidth];
             CGFloat bulletSize = [typedEditor->config unorderedListBulletSize];
-            CGFloat bulletX = usedRect.origin.x - gapWidth - bulletSize;
+            CGFloat bulletX = usedRect.origin.x - gapWidth - bulletSize/2;
             CGFloat centerY = CGRectGetMidY(usedRect);
 
             CGContextRef context = UIGraphicsGetCurrentContext();