Skip to content

Commit 9fed073

Browse files
committed
Updated to version 1.4.8
1 parent 2fb593f commit 9fed073

File tree

15 files changed

+161
-129
lines changed

15 files changed

+161
-129
lines changed

Example/THLabelExample.xcodeproj/project.pbxproj

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
74338E7216830723001B12C9 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 74338E7116830723001B12C9 /* AppDelegate.m */; };
1717
74338E7B16830723001B12C9 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 74338E7A16830723001B12C9 /* ViewController.m */; };
1818
74338E92168307E8001B12C9 /* THLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 74338E91168307E8001B12C9 /* THLabel.m */; };
19+
7454A23D1D8CA71600EDC9FA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7454A23C1D8CA71600EDC9FA /* LaunchScreen.storyboard */; };
1920
74699B4619BF0EDA0099B0FF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74699B4519BF0EDA0099B0FF /* Images.xcassets */; };
2021
74699B4919BF21CE0099B0FF /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 74699B4819BF21CE0099B0FF /* TableViewController.m */; };
2122
74B737E319BF0E1D0098444F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B737E219BF0E1D0098444F /* Main.storyboard */; };
@@ -37,6 +38,7 @@
3738
74338E7A16830723001B12C9 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
3839
74338E90168307E8001B12C9 /* THLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THLabel.h; sourceTree = "<group>"; };
3940
74338E91168307E8001B12C9 /* THLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THLabel.m; sourceTree = "<group>"; };
41+
7454A23C1D8CA71600EDC9FA /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
4042
74699B4519BF0EDA0099B0FF /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4143
74699B4719BF21CE0099B0FF /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewController.h; sourceTree = "<group>"; };
4244
74699B4819BF21CE0099B0FF /* TableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewController.m; sourceTree = "<group>"; };
@@ -99,6 +101,7 @@
99101
74699B4719BF21CE0099B0FF /* TableViewController.h */,
100102
74699B4819BF21CE0099B0FF /* TableViewController.m */,
101103
74B737E219BF0E1D0098444F /* Main.storyboard */,
104+
7454A23C1D8CA71600EDC9FA /* LaunchScreen.storyboard */,
102105
74699B4519BF0EDA0099B0FF /* Images.xcassets */,
103106
74338E6816830723001B12C9 /* Supporting Files */,
104107
);
@@ -152,7 +155,7 @@
152155
74338E5416830723001B12C9 /* Project object */ = {
153156
isa = PBXProject;
154157
attributes = {
155-
LastUpgradeCheck = 0700;
158+
LastUpgradeCheck = 0800;
156159
ORGANIZATIONNAME = tobiha.de;
157160
};
158161
buildConfigurationList = 74338E5716830723001B12C9 /* Build configuration list for PBXProject "THLabelExample" */;
@@ -179,6 +182,7 @@
179182
files = (
180183
74699B4619BF0EDA0099B0FF /* Images.xcassets in Resources */,
181184
74338E6C16830723001B12C9 /* InfoPlist.strings in Resources */,
185+
7454A23D1D8CA71600EDC9FA /* LaunchScreen.storyboard in Resources */,
182186
74B737E319BF0E1D0098444F /* Main.storyboard in Resources */,
183187
);
184188
runOnlyForDeploymentPostprocessing = 0;
@@ -219,21 +223,33 @@
219223
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
220224
CLANG_CXX_LIBRARY = "libc++";
221225
CLANG_ENABLE_OBJC_ARC = YES;
226+
CLANG_WARN_BOOL_CONVERSION = YES;
227+
CLANG_WARN_CONSTANT_CONVERSION = YES;
222228
CLANG_WARN_EMPTY_BODY = YES;
229+
CLANG_WARN_ENUM_CONVERSION = YES;
230+
CLANG_WARN_INFINITE_RECURSION = YES;
231+
CLANG_WARN_INT_CONVERSION = YES;
232+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
233+
CLANG_WARN_UNREACHABLE_CODE = YES;
223234
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
224235
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
225236
COPY_PHASE_STRIP = NO;
237+
ENABLE_STRICT_OBJC_MSGSEND = YES;
226238
ENABLE_TESTABILITY = YES;
227239
GCC_C_LANGUAGE_STANDARD = gnu99;
228240
GCC_DYNAMIC_NO_PIC = NO;
241+
GCC_NO_COMMON_BLOCKS = YES;
229242
GCC_OPTIMIZATION_LEVEL = 0;
230243
GCC_PREPROCESSOR_DEFINITIONS = (
231244
"DEBUG=1",
232245
"$(inherited)",
233246
);
234247
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
248+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
235249
GCC_WARN_ABOUT_RETURN_TYPE = YES;
250+
GCC_WARN_UNDECLARED_SELECTOR = YES;
236251
GCC_WARN_UNINITIALIZED_AUTOS = YES;
252+
GCC_WARN_UNUSED_FUNCTION = YES;
237253
GCC_WARN_UNUSED_VARIABLE = YES;
238254
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
239255
ONLY_ACTIVE_ARCH = YES;
@@ -249,13 +265,25 @@
249265
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
250266
CLANG_CXX_LIBRARY = "libc++";
251267
CLANG_ENABLE_OBJC_ARC = YES;
268+
CLANG_WARN_BOOL_CONVERSION = YES;
269+
CLANG_WARN_CONSTANT_CONVERSION = YES;
252270
CLANG_WARN_EMPTY_BODY = YES;
271+
CLANG_WARN_ENUM_CONVERSION = YES;
272+
CLANG_WARN_INFINITE_RECURSION = YES;
273+
CLANG_WARN_INT_CONVERSION = YES;
274+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
275+
CLANG_WARN_UNREACHABLE_CODE = YES;
253276
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
254277
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
255278
COPY_PHASE_STRIP = YES;
279+
ENABLE_STRICT_OBJC_MSGSEND = YES;
256280
GCC_C_LANGUAGE_STANDARD = gnu99;
281+
GCC_NO_COMMON_BLOCKS = YES;
282+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
257283
GCC_WARN_ABOUT_RETURN_TYPE = YES;
284+
GCC_WARN_UNDECLARED_SELECTOR = YES;
258285
GCC_WARN_UNINITIALIZED_AUTOS = YES;
286+
GCC_WARN_UNUSED_FUNCTION = YES;
259287
GCC_WARN_UNUSED_VARIABLE = YES;
260288
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
261289
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -269,11 +297,10 @@
269297
isa = XCBuildConfiguration;
270298
buildSettings = {
271299
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
272-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
273300
GCC_PRECOMPILE_PREFIX_HEADER = YES;
274301
GCC_PREFIX_HEADER = "THLabelExample/THLabelExample-Prefix.pch";
275302
INFOPLIST_FILE = "THLabelExample/THLabelExample-Info.plist";
276-
PRODUCT_BUNDLE_IDENTIFIER = "de.tobiha.${PRODUCT_NAME:rfc1034identifier}";
303+
PRODUCT_BUNDLE_IDENTIFIER = "de.tobiha.$(PRODUCT_NAME:rfc1034identifier)";
277304
PRODUCT_NAME = "$(TARGET_NAME)";
278305
WRAPPER_EXTENSION = app;
279306
};
@@ -283,11 +310,10 @@
283310
isa = XCBuildConfiguration;
284311
buildSettings = {
285312
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
286-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
287313
GCC_PRECOMPILE_PREFIX_HEADER = YES;
288314
GCC_PREFIX_HEADER = "THLabelExample/THLabelExample-Prefix.pch";
289315
INFOPLIST_FILE = "THLabelExample/THLabelExample-Info.plist";
290-
PRODUCT_BUNDLE_IDENTIFIER = "de.tobiha.${PRODUCT_NAME:rfc1034identifier}";
316+
PRODUCT_BUNDLE_IDENTIFIER = "de.tobiha.$(PRODUCT_NAME:rfc1034identifier)";
291317
PRODUCT_NAME = "$(TARGET_NAME)";
292318
WRAPPER_EXTENSION = app;
293319
};

Example/THLabelExample/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -30,6 +40,16 @@
3040
"size" : "60x60",
3141
"scale" : "3x"
3242
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "20x20",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "20x20",
51+
"scale" : "2x"
52+
},
3353
{
3454
"idiom" : "ipad",
3555
"size" : "29x29",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

Example/THLabelExample/Images.xcassets/LaunchImage.launchimage/Contents.json

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<dependencies>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
6+
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
8+
</dependencies>
9+
<scenes>
10+
<!--View Controller-->
11+
<scene sceneID="EHf-IW-A2E">
12+
<objects>
13+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
14+
<layoutGuides>
15+
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
16+
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
17+
</layoutGuides>
18+
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
19+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
20+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
21+
<subviews>
22+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2012-2016 tobiha.de. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
23+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
24+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
25+
<nil key="highlightedColor"/>
26+
</label>
27+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="THLabel" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
28+
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
29+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
30+
<nil key="highlightedColor"/>
31+
</label>
32+
</subviews>
33+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
34+
<constraints>
35+
<constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
36+
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
37+
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
38+
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
39+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
40+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
41+
</constraints>
42+
</view>
43+
</viewController>
44+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
45+
</objects>
46+
<point key="canvasLocation" x="53" y="375"/>
47+
</scene>
48+
</scenes>
49+
</document>

0 commit comments

Comments
 (0)