diff --git a/enzevalos_iphone/study parameters/IconsStyleKit.swift b/enzevalos_iphone/study parameters/IconsStyleKit.swift
index 978af6139f5a552b65b549038e245ebdfcb283a7..234dec74a7f47498830e3cf02276b23f61965f6a 100644
--- a/enzevalos_iphone/study parameters/IconsStyleKit.swift
+++ b/enzevalos_iphone/study parameters/IconsStyleKit.swift
@@ -452,66 +452,55 @@ internal class IconsStyleKit: NSObject {
//// General Declarations
let context = UIGraphicsGetCurrentContext()!
- //// Resize to Target Frame
- context.saveGState()
- let resizedFrame: CGRect = resizing.apply(rect: CGRect(x: 0, y: 0, width: 25, height: 31), target: targetFrame)
-
- context.translateBy(x: resizedFrame.minX, y: resizedFrame.minY)
-
- context.scaleBy(x: resizedFrame.width / 25, y: resizedFrame.height / 31)
-
-
- //// Color Declarations
- let fillColor2 = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
-
//// Bezier Drawing
context.saveGState()
- context.scaleBy(x: 0.3, y: 0.3)
- let bezierPath = UIBezierPath()
+ context.translateBy(x: 1.3, y: 2)
+ context.scaleBy(x: 0.27, y: 0.27)
+ color.setStroke()
- bezierPath.move(to: CGPoint(x: 71, y: 55))
- bezierPath.addLine(to: CGPoint(x: 69, y: 55))
- bezierPath.addLine(to: CGPoint(x: 69, y: 70))
- bezierPath.addCurve(to: CGPoint(x: 40, y: 100), controlPoint1: CGPoint(x: 68.9, y: 89.19), controlPoint2: CGPoint(x: 55.91, y: 100))
- bezierPath.addCurve(to: CGPoint(x: 11, y: 70), controlPoint1: CGPoint(x: 24.09, y: 100), controlPoint2: CGPoint(x: 10.5, y: 88.7))
- bezierPath.addLine(to: CGPoint(x: 11, y: 55))
- bezierPath.addCurve(to: CGPoint(x: 10, y: 55), controlPoint1: CGPoint(x: 11, y: 55), controlPoint2: CGPoint(x: 11.2, y: 55))
- bezierPath.addCurve(to: CGPoint(x: 0, y: 46), controlPoint1: CGPoint(x: 8.73, y: 55), controlPoint2: CGPoint(x: 0, y: 53.46))
- bezierPath.addLine(to: CGPoint(x: 0, y: 10))
- bezierPath.addCurve(to: CGPoint(x: 10, y: 0), controlPoint1: CGPoint(x: 0, y: 2.04), controlPoint2: CGPoint(x: 9.78, y: 0))
- bezierPath.addLine(to: CGPoint(x: 71, y: 0))
- bezierPath.addCurve(to: CGPoint(x: 80, y: 10), controlPoint1: CGPoint(x: 71.22, y: 0), controlPoint2: CGPoint(x: 80, y: 1.05))
- bezierPath.addLine(to: CGPoint(x: 80, y: 45))
- bezierPath.addCurve(to: CGPoint(x: 71, y: 55), controlPoint1: CGPoint(x: 80, y: 53.45), controlPoint2: CGPoint(x: 71.22, y: 55))
- bezierPath.addLine(to: CGPoint(x: 71, y: 55))
-
+ let bezierPath = UIBezierPath()
+ bezierPath.move(to: CGPoint(x: 71, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 69, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 69, y: 30))
+ bezierPath.addCurve(to: CGPoint(x: 40, y: 0), controlPoint1: CGPoint(x: 68.9, y: 10.81), controlPoint2: CGPoint(x: 55.91, y: 0))
+ bezierPath.addCurve(to: CGPoint(x: 11, y: 30), controlPoint1: CGPoint(x: 24.09, y: 0), controlPoint2: CGPoint(x: 10.5, y: 11.3))
+ bezierPath.addLine(to: CGPoint(x: 11, y: 45))
+ bezierPath.addCurve(to: CGPoint(x: 10, y: 45), controlPoint1: CGPoint(x: 11, y: 45), controlPoint2: CGPoint(x: 11.2, y: 45))
+ bezierPath.addCurve(to: CGPoint(x: -0, y: 54), controlPoint1: CGPoint(x: 8.73, y: 45), controlPoint2: CGPoint(x: -0, y: 46.54))
+ bezierPath.addLine(to: CGPoint(x: -0, y: 90))
+ bezierPath.addCurve(to: CGPoint(x: 10, y: 100), controlPoint1: CGPoint(x: -0, y: 97.96), controlPoint2: CGPoint(x: 9.78, y: 100))
+ bezierPath.addLine(to: CGPoint(x: 71, y: 100))
+ bezierPath.addCurve(to: CGPoint(x: 80, y: 90), controlPoint1: CGPoint(x: 71.22, y: 100), controlPoint2: CGPoint(x: 80, y: 98.95))
+ bezierPath.addLine(to: CGPoint(x: 80, y: 55))
+ bezierPath.addCurve(to: CGPoint(x: 71, y: 45), controlPoint1: CGPoint(x: 80, y: 46.55), controlPoint2: CGPoint(x: 71.22, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 71, y: 45))
bezierPath.close()
- bezierPath.move(to: CGPoint(x: 49, y: 14))
- bezierPath.addLine(to: CGPoint(x: 31, y: 14))
- bezierPath.addLine(to: CGPoint(x: 36, y: 28))
- bezierPath.addCurve(to: CGPoint(x: 32, y: 35), controlPoint1: CGPoint(x: 33.88, y: 29.41), controlPoint2: CGPoint(x: 32, y: 32.2))
- bezierPath.addCurve(to: CGPoint(x: 40, y: 43), controlPoint1: CGPoint(x: 32, y: 39.38), controlPoint2: CGPoint(x: 35.76, y: 43))
- bezierPath.addCurve(to: CGPoint(x: 48, y: 35), controlPoint1: CGPoint(x: 44.24, y: 43), controlPoint2: CGPoint(x: 48, y: 39.38))
- bezierPath.addCurve(to: CGPoint(x: 44, y: 28), controlPoint1: CGPoint(x: 48, y: 32.2), controlPoint2: CGPoint(x: 46.12, y: 29.41))
- bezierPath.addLine(to: CGPoint(x: 49, y: 14))
- bezierPath.addLine(to: CGPoint(x: 49, y: 14))
-
+ bezierPath.move(to: CGPoint(x: 49, y: 86))
+ bezierPath.addLine(to: CGPoint(x: 31, y: 86))
+ bezierPath.addLine(to: CGPoint(x: 36, y: 72))
+ bezierPath.addCurve(to: CGPoint(x: 32, y: 65), controlPoint1: CGPoint(x: 33.88, y: 70.59), controlPoint2: CGPoint(x: 32, y: 67.8))
+ bezierPath.addCurve(to: CGPoint(x: 40, y: 57), controlPoint1: CGPoint(x: 32, y: 60.62), controlPoint2: CGPoint(x: 35.76, y: 57))
+ bezierPath.addCurve(to: CGPoint(x: 48, y: 65), controlPoint1: CGPoint(x: 44.24, y: 57), controlPoint2: CGPoint(x: 48, y: 60.62))
+ bezierPath.addCurve(to: CGPoint(x: 44, y: 72), controlPoint1: CGPoint(x: 48, y: 67.8), controlPoint2: CGPoint(x: 46.12, y: 70.59))
+ bezierPath.addLine(to: CGPoint(x: 49, y: 86))
+ bezierPath.addLine(to: CGPoint(x: 49, y: 86))
bezierPath.close()
- bezierPath.move(to: CGPoint(x: 24, y: 55))
- bezierPath.addLine(to: CGPoint(x: 24, y: 70))
- bezierPath.addCurve(to: CGPoint(x: 40, y: 88), controlPoint1: CGPoint(x: 24, y: 79.95), controlPoint2: CGPoint(x: 30.16, y: 88))
- bezierPath.addCurve(to: CGPoint(x: 56, y: 70), controlPoint1: CGPoint(x: 49.74, y: 88), controlPoint2: CGPoint(x: 56, y: 80.95))
- bezierPath.addLine(to: CGPoint(x: 56, y: 55))
- bezierPath.addLine(to: CGPoint(x: 24, y: 55))
- bezierPath.addLine(to: CGPoint(x: 24, y: 55))
-
+ bezierPath.move(to: CGPoint(x: 24, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 24, y: 30))
+ bezierPath.addCurve(to: CGPoint(x: 40, y: 12), controlPoint1: CGPoint(x: 24, y: 20.05), controlPoint2: CGPoint(x: 30.16, y: 12))
+ bezierPath.addCurve(to: CGPoint(x: 56, y: 30), controlPoint1: CGPoint(x: 49.74, y: 12), controlPoint2: CGPoint(x: 56, y: 19.05))
+ bezierPath.addLine(to: CGPoint(x: 56, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 24, y: 45))
+ bezierPath.addLine(to: CGPoint(x: 24, y: 45))
bezierPath.close()
- bezierPath.usesEvenOddFillRule = true
- fillColor2.setFill()
- bezierPath.fill()
- context.restoreGState()
- context.restoreGState()
+ IconsStyleKit.strokeColor.setStroke()
+ bezierPath.lineWidth = 4
+ bezierPath.miterLimit = 4
+ bezierPath.lineJoinStyle = .round
+ bezierPath.stroke()
+ context.restoreGState()
+
}
@@ -526,17 +515,15 @@ internal class IconsStyleKit: NSObject {
context.scaleBy(x: resizedFrame.width / 24, y: resizedFrame.height / 31)
- //// Color Declarations
- let fillColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
-
//// lock-open
//// Bezier Drawing
context.saveGState()
- context.translateBy(x: 0, y: 1)
- context.scaleBy(x: 0.3, y: 0.3)
+ context.translateBy(x: 1.3, y: 2)
+ context.scaleBy(x: 0.27, y: 0.27)
+ color.setStroke()
+
let bezierPath = UIBezierPath()
-
bezierPath.move(to: CGPoint(x: 69.39, y: 26.64))
bezierPath.addCurve(to: CGPoint(x: 40.29, y: 0), controlPoint1: CGPoint(x: 69.39, y: 11), controlPoint2: CGPoint(x: 56.2, y: 0))
bezierPath.addCurve(to: CGPoint(x: 10.62, y: 29.64), controlPoint1: CGPoint(x: 24.38, y: 0), controlPoint2: CGPoint(x: 10.12, y: 10.95))
@@ -565,9 +552,11 @@ internal class IconsStyleKit: NSObject {
bezierPath.addLine(to: CGPoint(x: 49.15, y: 86.22))
bezierPath.addLine(to: CGPoint(x: 49.15, y: 86.22))
bezierPath.close()
- bezierPath.usesEvenOddFillRule = true
- fillColor.setFill()
- bezierPath.fill()
+ IconsStyleKit.strokeColor.setStroke()
+ bezierPath.lineWidth = 4
+ bezierPath.miterLimit = 4
+ bezierPath.lineJoinStyle = .round
+ bezierPath.stroke()
context.restoreGState()
@@ -586,22 +575,19 @@ internal class IconsStyleKit: NSObject {
context.scaleBy(x: resizedFrame.width / 22, y: resizedFrame.height / 28)
- //// Color Declarations
- let fillColor = UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
-
//// Bezier Drawing
context.saveGState()
- context.translateBy(x: 0.23, y: 0.83)
- context.rotate(by: 0.53 * CGFloat.pi/180)
- context.scaleBy(x: 0.27, y: 0.27)
+ context.translateBy(x: 1.23, y: 1.83)
+ context.scaleBy(x: 0.25, y: 0.25)
+ color.setStroke()
+
let bezierPath = UIBezierPath()
-
bezierPath.move(to: CGPoint(x: 71.31, y: 45.29))
bezierPath.addLine(to: CGPoint(x: 69.39, y: 45.29))
bezierPath.addLine(to: CGPoint(x: 69.39, y: 29.64))
- bezierPath.addCurve(to: CGPoint(x: 40.29, y: 0), controlPoint1: CGPoint(x: 69.29, y: 10.45), controlPoint2: CGPoint(x: 56.2, y: 0))
- bezierPath.addCurve(to: CGPoint(x: 10.62, y: 29.64), controlPoint1: CGPoint(x: 24.38, y: 0), controlPoint2: CGPoint(x: 10.12, y: 10.94))
+ bezierPath.addCurve(to: CGPoint(x: 39.1, y: 0.69), controlPoint1: CGPoint(x: 69.29, y: 10.45), controlPoint2: CGPoint(x: 55.01, y: 0.69))
+ bezierPath.addCurve(to: CGPoint(x: 10.62, y: 29.64), controlPoint1: CGPoint(x: 23.19, y: 0.69), controlPoint2: CGPoint(x: 10.12, y: 10.94))
bezierPath.addLine(to: CGPoint(x: 10.6, y: 45.27))
bezierPath.addCurve(to: CGPoint(x: 9.64, y: 45.29), controlPoint1: CGPoint(x: 10.6, y: 45.27), controlPoint2: CGPoint(x: 10.84, y: 45.29))
bezierPath.addCurve(to: CGPoint(x: 0, y: 54.22), controlPoint1: CGPoint(x: 8.37, y: 45.29), controlPoint2: CGPoint(x: 0, y: 46.76))
@@ -635,15 +621,18 @@ internal class IconsStyleKit: NSObject {
bezierPath.addLine(to: CGPoint(x: 56.86, y: 84.29))
bezierPath.addLine(to: CGPoint(x: 50.26, y: 90.69))
bezierPath.close()
- bezierPath.usesEvenOddFillRule = true
- fillColor.setFill()
- bezierPath.fill()
+ IconsStyleKit.strokeColor.setStroke()
+ bezierPath.lineWidth = 4
+ bezierPath.miterLimit = 4
+ bezierPath.lineJoinStyle = .round
+ bezierPath.stroke()
context.restoreGState()
context.restoreGState()
}
+
//// Generated Images
@@ -740,7 +729,7 @@ internal class IconsStyleKit: NSObject {
IconsStyleKit.drawPadlockSecure()
Cache.imageOfPadlockSecure = UIGraphicsGetImageFromCurrentImageContext()!
- Cache.imageOfPadlockSecure = Cache.imageOfPadlockSecure?.rotate(deg: CGFloat(180))
+ //Cache.imageOfPadlockSecure = Cache.imageOfPadlockSecure?.rotate(deg: CGFloat(180))
UIGraphicsEndImageContext()
return Cache.imageOfPadlockSecure!