Refine drawText.

lexrus · Aug 24, 2017 · 7397b6f · 7397b6f
1 parent 8bb2974
commit 7397b6f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/LTMorphingLabel/LTMorphingLabel+Sparkle.swift b/LTMorphingLabel/LTMorphingLabel+Sparkle.swift
@@ -53,15 +53,17 @@ extension LTMorphingLabel {
                 NSFontAttributeName: self.font,
                 NSForegroundColorAttributeName: self.textColor
                 ])
-            let newImage = UIGraphicsGetImageFromCurrentImageContext()
+            guard let newImage = UIGraphicsGetImageFromCurrentImageContext() else {
+                return (UIImage(), CGRect.zero)
+            }
             UIGraphicsEndImageContext()
             let newRect = CGRect(
                 x: charLimbo.rect.origin.x,
                 y: charLimbo.rect.origin.y,
                 width: charLimbo.rect.size.width,
                 height: maskedHeight
             )
-            return (newImage!, newRect)
+            return (newImage, newRect)
     }
 
     func SparkleLoad() {

diff --git a/LTMorphingLabel/LTMorphingLabel.swift b/LTMorphingLabel/LTMorphingLabel.swift
@@ -111,7 +111,7 @@ typealias LTMorphingSkipFramesClosure =
 
     override open var font: UIFont! {
         get {
-            return super.font
+            return super.font ?? UIFont.systemFont(ofSize: 15)
         }
         set {
             super.font = newValue
@@ -121,7 +121,7 @@ typealias LTMorphingSkipFramesClosure =
 
     override open var text: String! {
         get {
-            return super.text
+            return super.text ?? ""
         }
         set {
             guard text != newValue else { return }
@@ -489,15 +489,17 @@ extension LTMorphingLabel {
                 }
                 return false
                 }(charLimbo)
-            
+
             if !willAvoidDefaultDrawing {
+                var attrs: [String: Any] = [
+                    NSForegroundColorAttributeName: textColor.withAlphaComponent(charLimbo.alpha)
+                ]
+
+                if let font = UIFont(name: font.fontName, size: charLimbo.size) {
+                    attrs[NSFontAttributeName] = font
+                }
                 let s = String(charLimbo.char)
-                s.draw(in: charRect, withAttributes: [
-                    NSFontAttributeName:
-                        UIFont.init(name: font.fontName, size: charLimbo.size)!,
-                    NSForegroundColorAttributeName:
-                        textColor.withAlphaComponent(charLimbo.alpha)
-                    ])
+                s.draw(in: charRect, withAttributes: attrs)
             }
         }
     }

diff --git a/LTMorphingLabelDemo.xcodeproj/project.pbxproj b/LTMorphingLabelDemo.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = lexrus.com;
 				TargetAttributes = {
 					D74AD96D195171E7009A2ACD = {
@@ -575,6 +575,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -606,6 +607,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;

diff --git a/...o.xcodeproj/project.xcworkspace/xcuserdata/lex.xcuserdatad/UserInterfaceState.xcuserstate b/...o.xcodeproj/project.xcworkspace/xcuserdata/lex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel.xcscheme b/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabelDemo.xcscheme b/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabelDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"