Skip to content

Commit

Permalink
Merge pull request #2967 from danielgindi/iPhoneX
Browse files Browse the repository at this point in the history 
Add support for iPhone X
  • Loading branch information
@liuxuan30
liuxuan30 committed Nov 8, 2017
2 parents 98552bb + f00f9de commit ecba1da
Show file tree
Hide file tree
Showing 39 changed files with 628 additions and 290 deletions.
32 changes: 6 additions & 26 deletions ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
5B43162C1AB8D8AE0009FCAA /* Icon-60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316241AB8D8AE0009FCAA /* Icon-60@3x.png */; };
5B43162D1AB8D8AE0009FCAA /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316251AB8D8AE0009FCAA /* iTunesArtwork */; };
5B43162E1AB8D8AE0009FCAA /* iTunesArtwork@2x in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316261AB8D8AE0009FCAA /* iTunesArtwork@2x */; };
5B4316351AB8D8B70009FCAA /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */; };
5B4316361AB8D8B70009FCAA /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */; };
5B4316371AB8D8B70009FCAA /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */; };
5B4316381AB8D8B70009FCAA /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B4316341AB8D8B70009FCAA /* Default@2x.png */; };
5B57BBB51A9B26AA0036A6CC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB41A9B26AA0036A6CC /* main.m */; };
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
Expand Down Expand Up @@ -84,6 +80,7 @@
5BEAED3C1ABC199F0013F194 /* ColoredLineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */; };
5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */; };
5BEAED411ABC1AC60013F194 /* SinusBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */; };
B64D06EB1FB199130067418D /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64D06EA1FB199130067418D /* Launch Screen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -146,10 +143,6 @@
5B4316241AB8D8AE0009FCAA /* Icon-60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@3x.png"; sourceTree = "<group>"; };
5B4316251AB8D8AE0009FCAA /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = "<group>"; };
5B4316261AB8D8AE0009FCAA /* iTunesArtwork@2x */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTunesArtwork@2x"; sourceTree = "<group>"; };
5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = "<group>"; };
5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = "<group>"; };
5B4316341AB8D8B70009FCAA /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChartsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
5B57BBB31A9B26AA0036A6CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5B57BBB41A9B26AA0036A6CC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -234,6 +227,7 @@
5BEAED3D1ABC1AC60013F194 /* SinusBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinusBarChartViewController.h; sourceTree = "<group>"; };
5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SinusBarChartViewController.m; sourceTree = "<group>"; };
5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SinusBarChartViewController.xib; sourceTree = "<group>"; };
B64D06EA1FB199130067418D /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -272,17 +266,6 @@
path = "app-icon";
sourceTree = "<group>";
};
5B4316301AB8D8B70009FCAA /* launch-image */ = {
isa = PBXGroup;
children = (
5B4316311AB8D8B70009FCAA /* Default-568h@2x.png */,
5B4316321AB8D8B70009FCAA /* Default-667h@2x.png */,
5B4316331AB8D8B70009FCAA /* Default-736h@3x.png */,
5B4316341AB8D8B70009FCAA /* Default@2x.png */,
);
path = "launch-image";
sourceTree = "<group>";
};
5B57BBA61A9B26AA0036A6CC = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -340,9 +323,9 @@
5B8EAF2E1AB32E15009697AA /* Resources */ = {
isa = PBXGroup;
children = (
B64D06EA1FB199130067418D /* Launch Screen.storyboard */,
5B8EAF2F1AB32E15009697AA /* Images.xcassets */,
5B43161E1AB8D8AE0009FCAA /* app-icon */,
5B4316301AB8D8B70009FCAA /* launch-image */,
5B613DA21D526AD5000F1E98 /* markers */,
);
path = Resources;
Expand Down Expand Up @@ -543,21 +526,18 @@
5B43162B1AB8D8AE0009FCAA /* Icon-60@2x.png in Resources */,
5B43162E1AB8D8AE0009FCAA /* iTunesArtwork@2x in Resources */,
5B4316281AB8D8AE0009FCAA /* Icon-29@3x.png in Resources */,
5B4316361AB8D8B70009FCAA /* Default-667h@2x.png in Resources */,
5BEAED2D1ABC160F0013F194 /* CandleStickChartViewController.xib in Resources */,
5B613DB51D526EA8000F1E98 /* RadarMarkerView.xib in Resources */,
5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */,
5BEAED131ABBFB2B0013F194 /* AnotherBarChartViewController.xib in Resources */,
5BEAED411ABC1AC60013F194 /* SinusBarChartViewController.xib in Resources */,
5BEAED371ABC192F0013F194 /* RadarChartViewController.xib in Resources */,
5B4316351AB8D8B70009FCAA /* Default-568h@2x.png in Resources */,
5B8EAF241AB3271B009697AA /* DemoListViewController.xib in Resources */,
5BEAED261ABC0BE20013F194 /* MultipleBarChartViewController.xib in Resources */,
5B43162A1AB8D8AE0009FCAA /* Icon-40@3x.png in Resources */,
5BEAED3C1ABC199F0013F194 /* ColoredLineChartViewController.xib in Resources */,
5BEAED321ABC18F00013F194 /* CubicLineChartViewController.xib in Resources */,
5BEAED281ABC0BE20013F194 /* MultipleLinesChartViewController.xib in Resources */,
5B4316381AB8D8B70009FCAA /* Default@2x.png in Resources */,
5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */,
5B613DA41D526AD5000F1E98 /* radar_marker@3x.png in Resources */,
5BE7E7631C693098000A0377 /* PositiveNegativeBarChartViewController.xib in Resources */,
Expand All @@ -566,11 +546,11 @@
0471CBFC1CA1090A00E52DBC /* PiePolylineChartViewController.xib in Resources */,
5BD8F0751AB89CE500566E05 /* LineChart1ViewController.xib in Resources */,
5BE673811D5B496500A87BA2 /* HalfPieChartViewController.xib in Resources */,
B64D06EB1FB199130067418D /* Launch Screen.storyboard in Resources */,
5B43162D1AB8D8AE0009FCAA /* iTunesArtwork in Resources */,
5BD47E661ABB424E008FCEC6 /* BarChartViewController.xib in Resources */,
5BDEDC421ABB7F73007D3A60 /* HorizontalBarChartViewController.xib in Resources */,
5BDEDC481ABB871E007D3A60 /* CombinedChartViewController.xib in Resources */,
5B4316371AB8D8B70009FCAA /* Default-736h@3x.png in Resources */,
5BE673951D5B4E0900A87BA2 /* LineChartTimeViewController.xib in Resources */,
5B4316291AB8D8AE0009FCAA /* Icon-40@2x.png in Resources */,
5BEAED1E1ABBFB340013F194 /* StackedBarChartViewController.xib in Resources */,
Expand Down Expand Up @@ -736,12 +716,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = ChartsDemo;
Expand All @@ -759,12 +739,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(SOURCE_ROOT)/../Carthage/Build/iOS";
INFOPLIST_FILE = "Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = ChartsDemo;
Expand Down
14 changes: 10 additions & 4 deletions ChartsDemo/Classes/DemoListViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -18,6 +22,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="QII-it-eiw">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="dataSource" destination="-1" id="asD-89-QES"/>
Expand All @@ -27,11 +32,12 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="QII-it-eiw" secondAttribute="bottom" id="43W-wt-Yur"/>
<constraint firstItem="e7W-vt-N3v" firstAttribute="bottom" secondItem="QII-it-eiw" secondAttribute="bottom" id="43W-wt-Yur"/>
<constraint firstItem="QII-it-eiw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="6JX-cm-T75"/>
<constraint firstAttribute="trailing" secondItem="QII-it-eiw" secondAttribute="trailing" id="Sws-jY-WYw"/>
<constraint firstItem="QII-it-eiw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="uo3-Uc-8Tl"/>
</constraints>
<viewLayoutGuide key="safeArea" id="e7W-vt-N3v"/>
</view>
</objects>
</document>
Loading

0 comments on commit ecba1da

Please sign in to comment.