Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated to version 1.3.5

  • Loading branch information...
commit 1cbd4410c5d921d747e18ea9d361187cffae914a 1 parent e78d799
@nicklockwood authored
View
8 Examples/Label Styles/FXLabelExample.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 01924544160E11CE005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924543160E11CE005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
@@ -20,6 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 01924543160E11CE005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 01924543160E11CE005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
@@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0440;
+ LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
@@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
+ 01924544160E11CE005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -265,6 +269,7 @@
GCC_PREFIX_HEADER = "FXLabelExample/FXLabelExample-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "FXLabelExample/FXLabelExample-Info.plist";
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -277,6 +282,7 @@
GCC_PREFIX_HEADER = "FXLabelExample/FXLabelExample-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "FXLabelExample/FXLabelExample-Info.plist";
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
View
BIN  Examples/Label Styles/FXLabelExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 Examples/Label Styles/FXLabelExample/en.lproj/FXLabelExampleViewController.xib
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1280</int>
- <string key="IBDocument.SystemVersion">10K549</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <int key="IBDocument.SystemTarget">1536</int>
+ <string key="IBDocument.SystemVersion">12C54</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2840</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">933</string>
+ <string key="NS.object.0">1926</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
- <string>IBUIView</string>
<string>IBUILabel</string>
+ <string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,7 +45,7 @@
<string key="NSFrame">{{20, 30}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="370874756"/>
+ <reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -116,7 +116,7 @@
<string key="NSFrame">{{20, 184}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="419998994"/>
+ <reference key="NSNextKeyView" ref="68980804"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -148,6 +148,7 @@
<string key="NSFrame">{{20, 273}, {280, 63}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="419998994"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -336,7 +337,7 @@
<string>8.CustomClassName</string>
<string>8.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>FXLabelExampleViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -367,7 +368,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">18</int>
+ <int key="maxID">20</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -393,7 +394,7 @@
<string>label4</string>
<string>label5</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>FXLabel</string>
<string>FXLabel</string>
@@ -412,7 +413,7 @@
<string>label4</string>
<string>label5</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">label1</string>
@@ -451,6 +452,6 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">933</string>
+ <string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>
View
6 Examples/Oversampling/FXLabelExample.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 0192454D160E3CBA005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0192454C160E3CBA005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
@@ -20,6 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 0192454C160E3CBA005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 0192454C160E3CBA005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
@@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
@@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
+ 0192454D160E3CBA005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  Examples/Oversampling/FXLabelExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 Examples/Text Alignment/FXLabelExample.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 01924553160E3D45005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924552160E3D45005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
@@ -20,6 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 01924552160E3D45005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 01924552160E3D45005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
@@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
+ 01924553160E3D45005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  Examples/Text Alignment/FXLabelExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 Examples/Text Insets/FXLabelExample.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 0192455B160E3D90005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0192455A160E3D90005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
@@ -20,6 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 0192455A160E3D90005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* FXLabelExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FXLabelExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 0192455A160E3D90005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* FXLabelExample-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
@@ -141,7 +144,7 @@
01FAC0F21400668500B63C5B /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0450;
};
buildConfigurationList = 01FAC0F51400668500B63C5B /* Build configuration list for PBXProject "FXLabelExample" */;
compatibilityVersion = "Xcode 3.2";
@@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
+ 0192455B160E3D90005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  Examples/Text Insets/FXLabelExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
25 FXLabel/FXLabel.h
@@ -1,7 +1,7 @@
//
// FXLabel.h
//
-// Version 1.3.4
+// Version 1.3.5
//
// Created by Nick Lockwood on 20/08/2011.
// Copyright 2011 Charcoal Design
@@ -34,7 +34,7 @@
//
// ARC Helper
//
-// Version 1.3
+// Version 2.1
//
// Created by Nick Lockwood on 05/01/2012.
// Copyright 2012 Charcoal Design
@@ -45,21 +45,16 @@
// https://gist.github.com/1563325
//
-#ifndef AH_RETAIN
+#ifndef ah_retain
#if __has_feature(objc_arc)
-#define AH_RETAIN(x) (x)
-#define AH_RELEASE(x) (void)(x)
-#define AH_AUTORELEASE(x) (x)
-#define AH_SUPER_DEALLOC (void)(0)
-#define __AH_BRIDGE __bridge
+#define ah_retain self
+#define ah_dealloc self
+#define release self
+#define autorelease self
#else
-#define __AH_WEAK
-#define AH_WEAK assign
-#define AH_RETAIN(x) [(x) retain]
-#define AH_RELEASE(x) [(x) release]
-#define AH_AUTORELEASE(x) [(x) autorelease]
-#define AH_SUPER_DEALLOC [super dealloc]
-#define __AH_BRIDGE
+#define ah_retain retain
+#define ah_dealloc dealloc
+#define __bridge
#endif
#endif
View
36 FXLabel/FXLabel.m
@@ -1,7 +1,7 @@
//
// FXLabel.m
//
-// Version 1.3.4
+// Version 1.3.5
//
// Created by Nick Lockwood on 20/08/2011.
// Copyright 2011 Charcoal Design
@@ -100,8 +100,8 @@ - (void)setInnerShadowColor:(UIColor *)color
{
if (innerShadowColor != color)
{
- AH_RELEASE(innerShadowColor);
- innerShadowColor = AH_RETAIN(color);
+ [innerShadowColor release];
+ innerShadowColor = [color ah_retain];
[self setNeedsDisplay];
}
}
@@ -126,7 +126,7 @@ - (void)setGradientStartColor:(UIColor *)color
NSMutableArray *colors = [gradientColors mutableCopy];
[colors replaceObjectAtIndex:0 withObject:color];
self.gradientColors = colors;
- AH_RELEASE(colors);
+ [colors release];
}
}
@@ -150,7 +150,7 @@ - (void)setGradientEndColor:(UIColor *)color
NSMutableArray *colors = [gradientColors mutableCopy];
[colors replaceObjectAtIndex:[colors count] - 1 withObject:color];
self.gradientColors = colors;
- AH_RELEASE(colors);
+ [colors release];
}
}
@@ -158,7 +158,7 @@ - (void)setGradientColors:(NSArray *)colors
{
if (gradientColors != colors)
{
- AH_RELEASE(gradientColors);
+ [gradientColors release];
gradientColors = [colors copy];
[self setNeedsDisplay];
}
@@ -250,10 +250,18 @@ - (void)drawRect:(CGRect)rect
//get label size
CGRect textRect = rect;
CGFloat fontSize = self.font.pointSize;
+ CGFloat minimumFontSize;
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED == __IPHONE_6_0
+ minimumFontSize = self.minimumScaleFactor? self.minimumScaleFactor * fontSize: fontSize;
+#else
+ minimumFontSize = self.minimumFontSize;
+#endif
+
if (self.adjustsFontSizeToFitWidth && self.numberOfLines == 1)
{
textRect.size = [self.text sizeWithFont:self.font
- minFontSize:self.minimumFontSize
+ minFontSize:minimumFontSize
actualFontSize:&fontSize
forWidth:rect.size.width
lineBreakMode:self.lineBreakMode];
@@ -276,12 +284,12 @@ - (void)drawRect:(CGRect)rect
//set position
switch (self.textAlignment)
{
- case UITextAlignmentCenter:
+ case NSTextAlignmentCenter:
{
textRect.origin.x = rect.origin.x + (rect.size.width - textRect.size.width) / 2.0f;
break;
}
- case UITextAlignmentRight:
+ case NSTextAlignmentRight:
{
textRect.origin.x = textRect.origin.x + rect.size.width - textRect.size.width;
break;
@@ -385,13 +393,13 @@ - (void)drawRect:(CGRect)rect
for (UIColor *color in gradientColors)
{
UIColor *blended = [self color:color.CGColor blendedWithColor:textColor.CGColor];
- [colors addObject:(__AH_BRIDGE id)blended.CGColor];
+ [colors addObject:(__bridge id)blended.CGColor];
}
//draw gradient
CGContextScaleCTM(context, 1.0, -1.0);
CGContextTranslateCTM(context, 0, -rect.size.height);
- CGGradientRef gradient = CGGradientCreateWithColors(NULL, (__AH_BRIDGE CFArrayRef)colors, NULL);
+ CGGradientRef gradient = CGGradientCreateWithColors(NULL, (__bridge CFArrayRef)colors, NULL);
CGPoint startPoint = CGPointMake(textRect.origin.x + gradientStartPoint.x * textRect.size.width,
textRect.origin.y + gradientStartPoint.y * textRect.size.height);
CGPoint endPoint = CGPointMake(textRect.origin.x + gradientEndPoint.x * textRect.size.width,
@@ -422,9 +430,9 @@ - (void)drawRect:(CGRect)rect
- (void)dealloc
{
- AH_RELEASE(innerShadowColor);
- AH_RELEASE(gradientColors);
- AH_SUPER_DEALLOC;
+ [innerShadowColor release];
+ [gradientColors release];
+ [super ah_dealloc];
}
@end
View
2  LICENCE.md
@@ -1,6 +1,6 @@
FXLabel
-Version 1.3.4, April 29th, 2012
+Version 1.3.5, September 22nd, 2012
Copyright (C) 2011 Charcoal Design
View
4 README.md
@@ -9,8 +9,8 @@ FXLabel improves upon the standard UILabel by providing a subclass that supports
Supported iOS & SDK Versions
-----------------------------
-* Supported build target - iOS 5.1 / Mac OS 10.7 (Xcode 4.3, Apple LLVM compiler 3.1)
-* Earliest supported deployment target - iOS 4.3 / Mac OS 10.6
+* Supported build target - iOS 6.0 / Mac OS 10.7 (Xcode 4.5, Apple LLVM compiler 4.1)
+* Earliest supported deployment target - iOS 5.0 / Mac OS 10.6
* Earliest compatible deployment target - iOS 3.0
NOTE: 'Supported' means that the library has been tested with this version. 'Compatible' means that the library should work on this iOS version (i.e. it doesn't rely on any unavailable SDK features) but is no longer being tested for compatibility and may require tweaking or bug fixes to run correctly.
View
5 RELEASE NOTES.md
@@ -1,3 +1,8 @@
+Version 1.3.5
+
+- Fixed deprecation warnings under iOS 6
+- Updated ARC Helper to version 2.1
+
Version 1.3.4
- Updated ARC Helper to version 1.3
View
8 Tests/ARC Test/ARC Test.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 01924561160E3DF7005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924560160E3DF7005A22BB /* Default-568h@2x.png */; };
01FAC1001400668500B63C5B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC0FF1400668500B63C5B /* UIKit.framework */; };
01FAC1021400668500B63C5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1011400668500B63C5B /* Foundation.framework */; };
01FAC1041400668500B63C5B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FAC1031400668500B63C5B /* CoreGraphics.framework */; };
@@ -20,14 +21,15 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 01924560160E3DF7005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
01FAC0FB1400668500B63C5B /* ARC Test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ARC Test.app"; sourceTree = BUILT_PRODUCTS_DIR; };
01FAC0FF1400668500B63C5B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
01FAC1011400668500B63C5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
01FAC1031400668500B63C5B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- 01FAC1071400668500B63C5B /* ARC Test-Info.plist */ = {isa = PBXFileReference; path = "ARC Test-Info.plist"; sourceTree = "<group>"; };
+ 01FAC1071400668500B63C5B /* ARC Test-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ARC Test-Info.plist"; sourceTree = "<group>"; };
01FAC1091400668500B63C5B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
01FAC10B1400668500B63C5B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 01FAC10D1400668500B63C5B /* ARC Test-Prefix.pch */ = {isa = PBXFileReference; path = "ARC Test-Prefix.pch"; sourceTree = "<group>"; };
+ 01FAC10D1400668500B63C5B /* ARC Test-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ARC Test-Prefix.pch"; sourceTree = "<group>"; };
01FAC10E1400668500B63C5B /* FXLabelExampleAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FXLabelExampleAppDelegate.h; sourceTree = "<group>"; };
01FAC10F1400668500B63C5B /* FXLabelExampleAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FXLabelExampleAppDelegate.m; sourceTree = "<group>"; };
01FAC1121400668500B63C5B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
@@ -97,6 +99,7 @@
01FAC1061400668500B63C5B /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 01924560160E3DF7005A22BB /* Default-568h@2x.png */,
01FAC1071400668500B63C5B /* ARC Test-Info.plist */,
01FAC1081400668500B63C5B /* InfoPlist.strings */,
01FAC10B1400668500B63C5B /* main.m */,
@@ -168,6 +171,7 @@
01FAC10A1400668500B63C5B /* InfoPlist.strings in Resources */,
01FAC1131400668500B63C5B /* MainWindow.xib in Resources */,
01FAC1191400668500B63C5B /* FXLabelExampleViewController.xib in Resources */,
+ 01924561160E3DF7005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  Tests/ARC Test/FXLabelExample/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Tests/Highlight Color/FXLabelTest/Default-568h@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
8 Tests/Highlight Color/Highlight Test.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 01924568160E3E2E005A22BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01924567160E3E2E005A22BB /* Default-568h@2x.png */; };
0B8B2D2F14887CC500BFD0BC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B8B2D2E14887CC500BFD0BC /* UIKit.framework */; };
0B8B2D3114887CC500BFD0BC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B8B2D3014887CC500BFD0BC /* Foundation.framework */; };
0B8B2D3314887CC500BFD0BC /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B8B2D3214887CC500BFD0BC /* CoreGraphics.framework */; };
@@ -19,14 +20,15 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 01924567160E3E2E005A22BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
0B8B2D2A14887CC500BFD0BC /* Highlight Test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Highlight Test.app"; sourceTree = BUILT_PRODUCTS_DIR; };
0B8B2D2E14887CC500BFD0BC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
0B8B2D3014887CC500BFD0BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
0B8B2D3214887CC500BFD0BC /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- 0B8B2D3614887CC500BFD0BC /* Highlight Test-Info.plist */ = {isa = PBXFileReference; path = "Highlight Test-Info.plist"; sourceTree = "<group>"; };
+ 0B8B2D3614887CC500BFD0BC /* Highlight Test-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Highlight Test-Info.plist"; sourceTree = "<group>"; };
0B8B2D3814887CC500BFD0BC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
0B8B2D3A14887CC500BFD0BC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 0B8B2D3C14887CC500BFD0BC /* Highlight Test-Prefix.pch */ = {isa = PBXFileReference; path = "Highlight Test-Prefix.pch"; sourceTree = "<group>"; };
+ 0B8B2D3C14887CC500BFD0BC /* Highlight Test-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Highlight Test-Prefix.pch"; sourceTree = "<group>"; };
0B8B2D3D14887CC500BFD0BC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
0B8B2D3E14887CC500BFD0BC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
0B8B2D4014887CC500BFD0BC /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
@@ -94,6 +96,7 @@
0B8B2D3514887CC500BFD0BC /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 01924567160E3E2E005A22BB /* Default-568h@2x.png */,
0B8B2D3614887CC500BFD0BC /* Highlight Test-Info.plist */,
0B8B2D3714887CC500BFD0BC /* InfoPlist.strings */,
0B8B2D3A14887CC500BFD0BC /* main.m */,
@@ -164,6 +167,7 @@
files = (
0B8B2D3914887CC500BFD0BC /* InfoPlist.strings in Resources */,
0B8B2D4514887CC500BFD0BC /* ViewController.xib in Resources */,
+ 01924568160E3E2E005A22BB /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Please sign in to comment.
Something went wrong with that request. Please try again.