Skip to content

Commit 5f58197

Browse files
committed
Add Objective-C code
1 parent 8e28473 commit 5f58197

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

SVGToSwift/SVGToSwift/SVGHelper/Language/ObjCode.swift

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ final class ObjCode : CodeMaker {
103103
}
104104

105105
func makeGrapth(_ name: String, _ model: SVGDataModel) -> String {
106-
let code = "CAShapeLayer* \(name) = [CAShapeLayer new];\n"
106+
var code = "\nCAShapeLayer* \(model.name) = [CAShapeLayer new];\n"
107+
if let namelayer = model.layerName {
108+
code += "\(model.name).name = \(namelayer.objStr());\n"
109+
}
110+
else {
111+
code += "\(model.name).name = \(model.name.objStr())\n"
112+
}
113+
107114
return code
108115
}
109116

@@ -147,9 +154,10 @@ final class ObjCode : CodeMaker {
147154
var code = "\nCAShapeLayer* \(model.name) = [CAShapeLayer new];\n"
148155
code += "\(model.name).frame = CGRectMake(\(model.frame.origin.x), \(model.frame.origin.y), \(model.frame.size.width), \(model.frame.size.height));\n"
149156
code += "\(model.name).name = \(model.name.objStr());\n"
150-
code += "CGSize viewSize = \(model.name).frame.size\n"
151-
code += "let affine = CGAffineTransform.init(translationX: (UIScreen.main.bounds.size.width-viewSize.width)/2, y: (UIScreen.main.bounds.size.height-viewSize.height)/2)\n"
152-
code += "\(model.name).setAffineTransform(affine)\n"
157+
code += "CGSize viewSize = \(model.name).frame.size;\n"
158+
code += "CGSize screenSize = [UIScreen mainScreen].bounds.size;\n"
159+
code += "CGAffineTransform affine = CGAffineTransformMakeTranslation((screenSize.width - viewSize.width)/2, (screenSize.height - viewSize.width)/2);\n"
160+
code += "[\(model.name) setAffineTransform:affine];\n"
153161
return code
154162
}
155163

0 commit comments

Comments
 (0)