Skip to content

Commit 5b4d104

Browse files
author
Martin Barreto
authored
Merge pull request #672 from xmartlabs/version/8.1.1
Version/8.1.1
2 parents a097688 + 43d4202 commit 5b4d104

File tree

13 files changed

+68
-67
lines changed

13 files changed

+68
-67
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode10.1
33
env:
4-
- DESTINATION="OS=12,name=iPhone 8" SCHEME="XLPagerTabStrip" SDK=iphonesimulator
4+
- DESTINATION="OS=12.1,name=iPhone 8" SCHEME="XLPagerTabStrip" SDK=iphonesimulator
55
before_install:
66
- brew update
77
#- brew outdated carthage || brew upgrade carthage

‎Example.xcodeproj/project.pbxproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
28F828CF1C4B714D00330CF4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Example/AppDelegate.swift; sourceTree = "<group>"; };
9999
28F828DB1C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Example/Info.plist; sourceTree = "<group>"; };
100100
28F828E01C4B714D00330CF4 /* ExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
101-
28F828E61C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = Example/ExampleUITests/Info.plist; sourceTree = "<group>"; };
101+
28F828E61C4B714D00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
102102
CB2125DD1C52A80E002DAF42 /* TwitterExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TwitterExampleViewController.swift; path = Example/TwitterExampleViewController.swift; sourceTree = "<group>"; };
103103
CB3697BE1C5177B4001FC5F8 /* ButtonBarExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ButtonBarExampleViewController.swift; path = Example/Example/ButtonBarExampleViewController.swift; sourceTree = SOURCE_ROOT; };
104104
CB71C6EA1C4EB964008EC806 /* SegmentedExampleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SegmentedExampleViewController.swift; path = Example/SegmentedExampleViewController.swift; sourceTree = "<group>"; };
@@ -232,7 +232,8 @@
232232
28F828E61C4B714D00330CF4 /* Info.plist */,
233233
287D0A711C4B7877004566D6 /* ExampleUITests.swift */,
234234
);
235-
path = ExampleUITests;
235+
name = ExampleUITests;
236+
path = Example/ExampleUITests;
236237
sourceTree = "<group>";
237238
};
238239
CB86ED6C1C4D6ED400DA463B /* Demo */ = {
@@ -560,13 +561,14 @@
560561
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
561562
CLANG_ENABLE_MODULES = YES;
562563
INFOPLIST_FILE = "$(SRCROOT)/Example/Example/Info.plist";
564+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
563565
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
564566
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
565567
PRODUCT_NAME = "$(TARGET_NAME)";
566568
SWIFT_OBJC_BRIDGING_HEADER = "";
567569
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
568570
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
569-
SWIFT_VERSION = 4.0;
571+
SWIFT_VERSION = 4.2;
570572
};
571573
name = Debug;
572574
};
@@ -577,12 +579,13 @@
577579
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
578580
CLANG_ENABLE_MODULES = YES;
579581
INFOPLIST_FILE = "$(SRCROOT)/Example/Example/Info.plist";
582+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
580583
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
581584
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
582585
PRODUCT_NAME = "$(TARGET_NAME)";
583586
SWIFT_OBJC_BRIDGING_HEADER = "";
584587
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
585-
SWIFT_VERSION = 4.0;
588+
SWIFT_VERSION = 4.2;
586589
};
587590
name = Release;
588591
};

‎Example/Example/AppDelegate.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1212

1313
var window: UIWindow?
1414

15-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
15+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1616
// Override point for customization after application launch.
1717

1818
UITabBar.appearance().tintColor = UIColor.init(red: 0.027, green: 0.725, blue: 0.608, alpha: 1)
19-
UIApplication.shared.statusBarStyle = .lightContent
2019

2120
_ = YoutubeExampleViewController(nibName: nil, bundle: nil)
2221

‎Example/Example/Base.lproj/Storyboard.storyboard

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SCa-L8-uTr">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SCa-L8-uTr">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9-
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
10-
<capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
119
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1210
</dependencies>
1311
<scenes>
@@ -84,57 +82,46 @@
8482
</connections>
8583
</containerView>
8684
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jSE-G2-qe6">
87-
<rect key="frame" x="303" y="83" width="56" height="34"/>
85+
<rect key="frame" x="299" y="83" width="56" height="34"/>
8886
<state key="normal" title="Reload">
8987
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
9088
</state>
9189
<connections>
9290
<action selector="reloadTapped:" destination="uba-Iz-2L2" eventType="touchUpInside" id="KNI-Zr-Zz0"/>
9391
</connections>
9492
</button>
95-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Storyboard Demo" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="cZN-qT-VUq">
96-
<rect key="frame" x="16" y="52" width="343" height="21"/>
97-
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
98-
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
99-
<nil key="highlightedColor"/>
100-
</label>
10193
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kmN-fg-NDL">
102-
<rect key="frame" x="17" y="82" width="46" height="34"/>
94+
<rect key="frame" x="20" y="82" width="46" height="34"/>
10395
<state key="normal" title="Close">
10496
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
10597
</state>
10698
<connections>
10799
<action selector="closeTapped:" destination="uba-Iz-2L2" eventType="touchUpInside" id="B1v-kE-kC0"/>
108100
</connections>
109101
</button>
102+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Storyboard Demo" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="cZN-qT-VUq">
103+
<rect key="frame" x="20" y="50" width="335" height="21"/>
104+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
105+
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
106+
<nil key="highlightedColor"/>
107+
</label>
110108
</subviews>
111109
<color key="backgroundColor" red="0.027450980390000001" green="0.72549019609999998" blue="0.60784313729999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
112110
<constraints>
111+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="kmN-fg-NDL" secondAttribute="trailing" constant="50" id="1ha-hv-22z"/>
113112
<constraint firstItem="kmN-fg-NDL" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="62" id="7Rq-MO-b4m"/>
114-
<constraint firstItem="cZN-qT-VUq" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leadingMargin" id="9eC-5j-2zk"/>
115-
<constraint firstAttribute="centerX" secondItem="cZN-qT-VUq" secondAttribute="centerX" id="AYy-gw-Ryh"/>
113+
<constraint firstItem="kmN-fg-NDL" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leading" constant="20" symbolic="YES" id="Cpu-aA-0rq"/>
116114
<constraint firstItem="NbE-e0-l2n" firstAttribute="top" secondItem="qkQ-UG-MKG" secondAttribute="bottom" id="K6Q-s5-nzV"/>
117-
<constraint firstItem="cZN-qT-VUq" firstAttribute="trailing" secondItem="Mqm-sG-Qyv" secondAttribute="trailingMargin" id="Lma-fO-UC9"/>
115+
<constraint firstAttribute="trailing" secondItem="jSE-G2-qe6" secondAttribute="trailing" constant="20" symbolic="YES" id="MMy-Mk-MhJ"/>
118116
<constraint firstItem="jSE-G2-qe6" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="63" id="NWc-fy-XOc"/>
119-
<constraint firstItem="cZN-qT-VUq" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="32" id="RvZ-BV-1SL"/>
120-
<constraint firstItem="qkQ-UG-MKG" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leading" id="Slo-zY-IGj"/>
121-
<constraint firstItem="jSE-G2-qe6" firstAttribute="trailing" secondItem="Mqm-sG-Qyv" secondAttribute="trailingMargin" id="hbB-fi-M5S"/>
117+
<constraint firstItem="cZN-qT-VUq" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leading" constant="20" symbolic="YES" id="OiW-h4-ZuI"/>
118+
<constraint firstItem="qkQ-UG-MKG" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leading" id="bxR-0b-lVS"/>
119+
<constraint firstItem="jSE-G2-qe6" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Mqm-sG-Qyv" secondAttribute="leading" constant="50" id="cpm-b1-Y9n"/>
120+
<constraint firstItem="cZN-qT-VUq" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="30" id="fk2-dC-KBI"/>
121+
<constraint firstAttribute="trailing" secondItem="qkQ-UG-MKG" secondAttribute="trailing" id="meZ-CC-eqh"/>
122122
<constraint firstItem="qkQ-UG-MKG" firstAttribute="top" secondItem="Emc-3r-MJi" secondAttribute="bottom" constant="101" id="nJw-ag-ddh"/>
123-
<constraint firstAttribute="trailing" secondItem="qkQ-UG-MKG" secondAttribute="trailing" id="pTb-BC-Duc"/>
124-
<constraint firstItem="kmN-fg-NDL" firstAttribute="leading" secondItem="Mqm-sG-Qyv" secondAttribute="leadingMargin" constant="1" id="sXd-CC-BrV"/>
123+
<constraint firstAttribute="trailing" secondItem="cZN-qT-VUq" secondAttribute="trailing" constant="20" symbolic="YES" id="ue6-fg-BYA"/>
125124
</constraints>
126-
<variation key="default">
127-
<mask key="constraints">
128-
<exclude reference="9eC-5j-2zk"/>
129-
<exclude reference="Lma-fO-UC9"/>
130-
</mask>
131-
</variation>
132-
<variation key="heightClass=regular-widthClass=compact">
133-
<mask key="constraints">
134-
<include reference="9eC-5j-2zk"/>
135-
<include reference="Lma-fO-UC9"/>
136-
</mask>
137-
</variation>
138125
</view>
139126
<tabBarItem key="tabBarItem" title="Bar" image="icon_bar" id="1d9-i6-g9L">
140127
<offsetWrapper key="titlePositionAdjustment" horizontal="0.0" vertical="-4"/>
@@ -146,7 +133,7 @@
146133
</viewController>
147134
<placeholder placeholderIdentifier="IBFirstResponder" id="jkN-pv-eFH" userLabel="First Responder" sceneMemberID="firstResponder"/>
148135
</objects>
149-
<point key="canvasLocation" x="2141" y="-825"/>
136+
<point key="canvasLocation" x="2140" y="-827.13643178410803"/>
150137
</scene>
151138
<!--Buttons Example-->
152139
<scene sceneID="c3d-TB-Hyh">
@@ -437,7 +424,7 @@
437424
<constraint firstItem="qpV-GA-z3E" firstAttribute="top" secondItem="mzt-Sj-o9z" secondAttribute="bottom" id="XJC-Gq-PXT"/>
438425
<constraint firstItem="mzt-Sj-o9z" firstAttribute="top" secondItem="S6g-Ki-yYf" secondAttribute="bottom" id="c2z-nI-QeM"/>
439426
<constraint firstAttribute="trailing" secondItem="mzt-Sj-o9z" secondAttribute="trailing" id="ksD-G3-ZFA"/>
440-
<constraint firstItem="MRO-1B-lmT" firstAttribute="top" secondItem="qpV-GA-z3E" secondAttribute="bottom" id="ne5-8Z-LlT"/>
427+
<constraint firstAttribute="bottom" secondItem="qpV-GA-z3E" secondAttribute="bottom" id="ne5-8Z-LlT"/>
441428
</constraints>
442429
</view>
443430
<toolbarItems/>
@@ -886,7 +873,7 @@
886873
<constraint firstItem="CLm-XH-tEa" firstAttribute="leading" secondItem="yGV-Lf-LC4" secondAttribute="leading" id="qT9-rU-zer"/>
887874
<constraint firstItem="KX5-0N-ToU" firstAttribute="leading" secondItem="yGV-Lf-LC4" secondAttribute="leading" id="sIi-YZ-SuG"/>
888875
<constraint firstItem="KX5-0N-ToU" firstAttribute="top" secondItem="CLm-XH-tEa" secondAttribute="bottom" id="v7v-sW-2Vl"/>
889-
<constraint firstItem="AoG-Am-Q4c" firstAttribute="top" secondItem="KX5-0N-ToU" secondAttribute="bottom" id="xNR-eP-4e1"/>
876+
<constraint firstAttribute="bottom" secondItem="KX5-0N-ToU" secondAttribute="bottom" id="xNR-eP-4e1"/>
890877
</constraints>
891878
</view>
892879
<toolbarItems/>
@@ -990,7 +977,7 @@
990977
<constraint firstItem="OdC-5s-g0E" firstAttribute="leading" secondItem="srq-xV-ncW" secondAttribute="leading" id="Yhg-Df-lY8"/>
991978
<constraint firstItem="NF8-r2-llj" firstAttribute="top" secondItem="nAm-L7-0C5" secondAttribute="bottom" id="cGp-RS-hTW"/>
992979
<constraint firstAttribute="trailing" secondItem="NF8-r2-llj" secondAttribute="trailing" id="diI-XY-ee6"/>
993-
<constraint firstItem="h18-Xb-G4o" firstAttribute="top" secondItem="OdC-5s-g0E" secondAttribute="bottom" id="iOV-H7-dW1"/>
980+
<constraint firstAttribute="bottom" secondItem="OdC-5s-g0E" secondAttribute="bottom" id="iOV-H7-dW1"/>
994981
<constraint firstItem="NF8-r2-llj" firstAttribute="leading" secondItem="srq-xV-ncW" secondAttribute="leading" id="rDI-Ht-8Px"/>
995982
<constraint firstItem="OdC-5s-g0E" firstAttribute="top" secondItem="NF8-r2-llj" secondAttribute="bottom" id="vlA-DF-8l2"/>
996983
<constraint firstAttribute="trailing" secondItem="OdC-5s-g0E" secondAttribute="trailing" id="xNh-E4-YQz"/>

‎Example/Example/ChildControllers/TableChildExampleViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TableChildExampleViewController: UITableViewController, IndicatorInfoProvi
3131
var blackTheme = false
3232
var itemInfo = IndicatorInfo(title: "View")
3333

34-
init(style: UITableViewStyle, itemInfo: IndicatorInfo) {
34+
init(style: UITableView.Style, itemInfo: IndicatorInfo) {
3535
self.itemInfo = itemInfo
3636
super.init(style: style)
3737
}
@@ -43,8 +43,8 @@ class TableChildExampleViewController: UITableViewController, IndicatorInfoProvi
4343
override func viewDidLoad() {
4444
super.viewDidLoad()
4545
tableView.register(UINib(nibName: "PostCell", bundle: Bundle.main), forCellReuseIdentifier: cellIdentifier)
46-
tableView.estimatedRowHeight = 60.0
47-
tableView.rowHeight = UITableViewAutomaticDimension
46+
tableView.estimatedRowHeight = 600.0
47+
tableView.rowHeight = UITableView.automaticDimension
4848
tableView.allowsSelection = false
4949
if blackTheme {
5050
tableView.backgroundColor = UIColor(red: 15/255.0, green: 16/255.0, blue: 16/255.0, alpha: 1.0)

0 commit comments

Comments
 (0)