chore: refactoring

Author: farfromrefug

plugin/platforms/ios/src/UIBezierPath+Text.h

@@ -10,6 +10,6 @@
 #import "UIBezierPath+Elements.h"
 @interface UIBezierPath (TextUtilities)
 + (UIBezierPath*) fromString: (NSString *) string withFont:(UIFont *) font;
-- (void) drawAttributedString: (NSAttributedString *) string;
-- (void) drawString: (NSString *) string withAttributes:(NSDictionary*)attributes;
+- (void) drawAttributedString: (NSAttributedString *) string withAlignment:(NSTextAlignment) alignment;
+- (void) drawString: (NSString *) string withAttributes:(NSDictionary*)attributes withAlignment:(NSTextAlignment) alignment;
 @end

plugin/platforms/ios/src/UIBezierPath+Text.m

@@ -12,10 +12,10 @@ + (UIBezierPath*) fromString: (NSString *) string withFont:(UIFont *) font {
   return BezierPathFromString(string, font);
 }
 
-- (void) drawString: (NSString *) string withAttributes:(NSDictionary*)attributes {
-  [self drawAttributedString:[[NSAttributedString alloc] initWithString:string attributes:attributes]];
+- (void) drawString: (NSString *) string withAttributes:(NSDictionary*)attributes withAlignment:(NSTextAlignment) alignment {
+  [self drawAttributedString:[[NSAttributedString alloc] initWithString:string attributes:attributes] withAlignment:alignment];
 }
-- (void) drawAttributedString: (NSAttributedString *) string
+- (void) drawAttributedString: (NSAttributedString *) string withAlignment:(NSTextAlignment) alignment
 {
     if (!string) return;
     CGContextRef context = UIGraphicsGetCurrentContext();
@@ -45,7 +45,7 @@ - (void) drawAttributedString: (NSAttributedString *) string
         CGPoint targetPoint = [self pointAtPercent:percentConsumed withSlope:&slope];
 
         // Accommodate the forward progress
-        glyphDistance += bounding.size.width / 2;         
+        glyphDistance += bounding.size.width / 2; 
         if (percentConsumed >= 1.0f) break;
 
         // Calculate the rotation

src/canvas.ios.ts

@@ -10,6 +10,15 @@ export * from './canvas.common';
 
 const identity = CGAffineTransformIdentity;
 
+function NSTextAlignmentFromAlign(align: Align) {
+    if (align === Align.CENTER) {
+        return NSTextAlignment.Center;
+    } else if (align === Align.RIGHT) {
+        return NSTextAlignment.Right;
+    }
+    return NSTextAlignment.Left;
+}
+
 function DEGREES_TO_RADIANS(x) {
     return (Math.PI * x) / 180.0;
 }
@@ -1855,9 +1864,9 @@ export class Canvas implements ICanvas {
         }
         UIGraphicsPushContext(ctx);
         if (text instanceof NSAttributedString) {
-            bPath.drawAttributedString(applyAttributesToNSAttributedString(text, paint.getDrawTextAttribs()));
+            bPath.drawAttributedStringWithAlignment(applyAttributesToNSAttributedString(text, paint.getDrawTextAttribs()), NSTextAlignmentFromAlign(paint.getTextAlign()));
         } else {
-            bPath.drawStringWithAttributes(text, paint.getDrawTextAttribs());
+            bPath.drawStringWithAttributesWithAlignment(text, paint.getDrawTextAttribs(), NSTextAlignmentFromAlign(paint.getTextAlign()));
         }
         UIGraphicsPopContext();
     }

src/typings/ios.d.ts

@@ -1,28 +1,29 @@
 declare namespace UIBezierPath {
-	 function fromStringWithFont(string: string, font: UIFont): UIBezierPath;
-	 function addLinesOffsetCountCloseToPath(points, offset, length, close, path)
-	 function addCubicLinesOffsetCountCloseToPath(points, offset, length, close, path)
+    function fromStringWithFont(str: string, font: UIFont): UIBezierPath;
+    function addLinesOffsetCountCloseToPath(points, offset, length, close, path);
+    function addCubicLinesOffsetCountCloseToPath(points, offset, length, close, path);
 }
 
 declare namespace UIDrawingPath {
-	function drawLineSegmentsCountInContextWithTransform(pts: any, count: number, context:any, _transform: CGAffineTransform)
+    function drawLineSegmentsCountInContextWithTransform(pts: any, count: number, context: any, _transform: CGAffineTransform);
 }
-declare namespace UIDrawingText{
-	function drawStringXYFontColor(text: string, x: number, y:number, font: UIFont, color: UIColor)
-	function drawAttributedStringXYFontColor(text: NSAttributedString, x: number, y:number, font: UIFont, color: UIColor)
-	function drawAttributedStringInRectXYWidthHeightFontAlignmentColor(text: NSAttributedString, x: number, y:number, w: number, h:number, font: UIFont, alignment:NSTextAlignment, color: UIColor)
-
-	function drawStringXYWithAttributes(text: string, x: number, y:number, attributes: NSDictionary<any, any>)
-	function drawAttributedStringXYWithAttributes(text: NSAttributedString, x: number, y:number, attributes: NSDictionary<any, any>)
-	function getTextBoundsFromToAttributes(text: string, start: number, end: number,attributes:NSDictionary<any, any>): CGRect;
-	function measureTextFromToAttributes(text: string, start: number, end: number,attributes:NSDictionary<any, any>): number;
+declare namespace UIDrawingText {
+    function drawStringXYFontColor(text: string, x: number, y: number, font: UIFont, color: UIColor);
+    function drawAttributedStringXYFontColor(text: NSAttributedString, x: number, y: number, font: UIFont, color: UIColor);
+    function drawAttributedStringInRectXYWidthHeightFontAlignmentColor(text: NSAttributedString, x: number, y: number, w: number, h: number, font: UIFont, alignment: NSTextAlignment, color: UIColor);
+
+    function drawStringXYWithAttributes(text: string, x: number, y: number, attributes: NSDictionary<any, any>);
+    function drawAttributedStringXYWithAttributes(text: NSAttributedString, x: number, y: number, attributes: NSDictionary<any, any>);
+    function getTextBoundsFromToAttributes(text: string, start: number, end: number, attributes: NSDictionary<any, any>): CGRect;
+    function measureTextFromToAttributes(text: string, start: number, end: number, attributes: NSDictionary<any, any>): number;
 }
 
+// eslint-disable-next-line no-redeclare
 declare interface UIBezierPath {
-	drawAttributedString(string: NSAttributedString);
-	drawStringWithAttributes(string: string, attributes:NSDictionary<any, any>);
-	addLinesCountClose(pts: any, count: number, close:boolean)
-	addCubicLinesCountClose(pts: any, count: number, close:boolean)
+    drawAttributedStringWithAlignment(str: NSAttributedString, alignment: NSTextAlignment);
+    drawStringWithAttributesWithAlignment(str: string, attributes: NSDictionary<any, any>, alignment: NSTextAlignment);
+    addLinesCountClose(pts: any, count: number, close: boolean);
+    addCubicLinesCountClose(pts: any, count: number, close: boolean);
 }
 
 declare function AddDashesToPath(path: UIBezierPath): void;
@@ -38,37 +39,36 @@ declare function AspectScaleFit(sourceSize: CGSize, destRect: CGRect): number;
 declare function BevelPath(p: UIBezierPath, color: UIColor, r: number, theta: number): void;
 
 declare class BezierElement extends NSObject implements NSCopying {
+    static alloc(): BezierElement; // inherited from NSObject
 
-	static alloc(): BezierElement; // inherited from NSObject
+    static elementWithPathElement(element: CGPathElement): BezierElement;
 
-	static elementWithPathElement(element: CGPathElement): BezierElement;
+    static new(): BezierElement; // inherited from NSObject
 
-	static new(): BezierElement; // inherited from NSObject
+    controlPoint1: CGPoint;
 
-	controlPoint1: CGPoint;
+    controlPoint2: CGPoint;
 
-	controlPoint2: CGPoint;
+    elementType: CGPathElementType;
 
-	elementType: CGPathElementType;
+    point: CGPoint;
 
-	point: CGPoint;
+    readonly stringValue: string;
 
-	readonly stringValue: string;
+    addToPath(path: UIBezierPath): void;
 
-	addToPath(path: UIBezierPath): void;
+    copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
 
-	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
+    elementByApplyingBlock(block: (p1: CGPoint) => CGPoint): BezierElement;
 
-	elementByApplyingBlock(block: (p1: CGPoint) => CGPoint): BezierElement;
-
-	showTheCode(): void;
+    showTheCode(): void;
 }
 
 declare function BezierInflectedShape(numberOfInflections: number, percentInflection: number): UIBezierPath;
 
-declare function BezierPathFromString(string: string, font: UIFont): UIBezierPath;
+declare function BezierPathFromString(str: string, font: UIFont): UIBezierPath;
 
-declare function BezierPathFromStringWithFontFace(string: string, fontFace: string): UIBezierPath;
+declare function BezierPathFromStringWithFontFace(str: string, fontFace: string): UIBezierPath;
 
 declare function BezierPathWithElements(elements: NSArray<any>): UIBezierPath;