Skip to content

Commit

Permalink
Merge pull request #6 from hryk224/v.2.0.0
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
hryk224 committed Feb 26, 2017
2 parents 76fb8f9 + 730e1fa commit 035f7f5
Show file tree
Hide file tree
Showing 19 changed files with 1,370 additions and 886 deletions.
26 changes: 13 additions & 13 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

/* Begin PBXBuildFile section */
935BD7381CE272F400E5FDF7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 935BD7371CE272F400E5FDF7 /* AppDelegate.swift */; };
935BD73A1CE272F400E5FDF7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 935BD7391CE272F400E5FDF7 /* ViewController.swift */; };
935BD73D1CE272F400E5FDF7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 935BD73B1CE272F400E5FDF7 /* Main.storyboard */; };
935BD73A1CE272F400E5FDF7 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 935BD7391CE272F400E5FDF7 /* MainViewController.swift */; };
935BD73D1CE272F400E5FDF7 /* MainViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 935BD73B1CE272F400E5FDF7 /* MainViewController.storyboard */; };
935BD73F1CE272F400E5FDF7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 935BD73E1CE272F400E5FDF7 /* Assets.xcassets */; };
935BD7421CE272F400E5FDF7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 935BD7401CE272F400E5FDF7 /* LaunchScreen.storyboard */; };
ED413F421D8AA81B0024036E /* PCLBlurEffectAlert.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED413F411D8AA8130024036E /* PCLBlurEffectAlert.framework */; };
Expand All @@ -28,7 +28,7 @@
isa = PBXContainerItemProxy;
containerPortal = ED413F3C1D8AA8130024036E /* PCLBlurEffectAlert.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 935BD7B71CE274A500E5FDF7;
remoteGlobalIDString = OBJ_17;
remoteInfo = PCLBlurEffectAlert;
};
/* End PBXContainerItemProxy section */
Expand All @@ -50,8 +50,8 @@
/* Begin PBXFileReference section */
935BD7341CE272F400E5FDF7 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
935BD7371CE272F400E5FDF7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
935BD7391CE272F400E5FDF7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
935BD73C1CE272F400E5FDF7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
935BD7391CE272F400E5FDF7 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
935BD73C1CE272F400E5FDF7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainViewController.storyboard; sourceTree = "<group>"; };
935BD73E1CE272F400E5FDF7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
935BD7411CE272F400E5FDF7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
935BD7431CE272F400E5FDF7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -94,8 +94,8 @@
935BD73E1CE272F400E5FDF7 /* Assets.xcassets */,
935BD7431CE272F400E5FDF7 /* Info.plist */,
935BD7401CE272F400E5FDF7 /* LaunchScreen.storyboard */,
935BD73B1CE272F400E5FDF7 /* Main.storyboard */,
935BD7391CE272F400E5FDF7 /* ViewController.swift */,
935BD73B1CE272F400E5FDF7 /* MainViewController.storyboard */,
935BD7391CE272F400E5FDF7 /* MainViewController.swift */,
);
path = Example;
sourceTree = "<group>";
Expand Down Expand Up @@ -195,7 +195,7 @@
files = (
935BD73F1CE272F400E5FDF7 /* Assets.xcassets in Resources */,
935BD7421CE272F400E5FDF7 /* LaunchScreen.storyboard in Resources */,
935BD73D1CE272F400E5FDF7 /* Main.storyboard in Resources */,
935BD73D1CE272F400E5FDF7 /* MainViewController.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -207,7 +207,7 @@
buildActionMask = 2147483647;
files = (
935BD7381CE272F400E5FDF7 /* AppDelegate.swift in Sources */,
935BD73A1CE272F400E5FDF7 /* ViewController.swift in Sources */,
935BD73A1CE272F400E5FDF7 /* MainViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -222,12 +222,12 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
935BD73B1CE272F400E5FDF7 /* Main.storyboard */ = {
935BD73B1CE272F400E5FDF7 /* MainViewController.storyboard */ = {
isa = PBXVariantGroup;
children = (
935BD73C1CE272F400E5FDF7 /* Base */,
);
name = Main.storyboard;
name = MainViewController.storyboard;
sourceTree = "<group>";
};
935BD7401CE272F400E5FDF7 /* LaunchScreen.storyboard */ = {
Expand Down Expand Up @@ -280,7 +280,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -321,7 +321,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
20 changes: 20 additions & 0 deletions Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down Expand Up @@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
Expand Down
Binary file removed Example/Example/Assets.xcassets/bg.imageset/bg.jpg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "bg.jpg",
"filename" : "PAKU160126410I9A5301-thumb-autox1600-21285.jpg",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 0 additions & 50 deletions Example/Example/Base.lproj/Main.storyboard

This file was deleted.

103 changes: 103 additions & 0 deletions Example/Example/Base.lproj/MainViewController.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Main View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
<viewController automaticallyAdjustsScrollViewInsets="NO" id="BYZ-38-t0r" customClass="MainViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sampleBackground" translatesAutoresizingMaskIntoConstraints="NO" id="Lf0-6h-j4A">
<rect key="frame" x="137.5" y="0.0" width="100" height="667"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="Axo-Le-ewo"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VK3-wA-HIw">
<rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="Z9P-lH-Zic"/>
</constraints>
</view>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="b8G-F1-453">
<rect key="frame" x="8" y="17" width="359" height="29"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="IfC-2F-JDi"/>
</constraints>
<segments>
<segment title="Alert"/>
<segment title="AlertVertical"/>
<segment title="ActionSheet"/>
</segments>
</segmentedControl>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Ho7-a3-lkY">
<rect key="frame" x="8" y="55" width="359" height="29"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="tkI-T3-M2Z"/>
</constraints>
<segments>
<segment title="ExtraLight"/>
<segment title="Light"/>
<segment title="Dark"/>
</segments>
</segmentedControl>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="100" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="5El-06-33n">
<rect key="frame" x="0.0" y="100" width="375" height="567"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="BYZ-38-t0r" id="tX5-Ih-v5I"/>
<outlet property="delegate" destination="BYZ-38-t0r" id="zPS-82-KeQ"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.75686274509999996" green="0.1960784314" blue="0.15686274510000001" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="Lf0-6h-j4A" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="2E8-Eu-cP9"/>
<constraint firstItem="Lf0-6h-j4A" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="2jL-v9-ttl"/>
<constraint firstItem="VK3-wA-HIw" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="6tq-Kf-gX1"/>
<constraint firstItem="b8G-F1-453" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="8" id="745-uS-22L"/>
<constraint firstAttribute="trailing" secondItem="VK3-wA-HIw" secondAttribute="trailing" id="Fen-w1-tjW"/>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="Lf0-6h-j4A" secondAttribute="bottom" id="HjV-oP-bet"/>
<constraint firstItem="Ho7-a3-lkY" firstAttribute="top" secondItem="b8G-F1-453" secondAttribute="bottom" constant="10" id="Sij-3w-WAF"/>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="5El-06-33n" secondAttribute="bottom" id="Yah-Qo-HTT"/>
<constraint firstAttribute="trailing" secondItem="Ho7-a3-lkY" secondAttribute="trailing" constant="8" id="adQ-XY-qwK"/>
<constraint firstAttribute="trailing" secondItem="b8G-F1-453" secondAttribute="trailing" constant="8" id="eZU-IT-mBu"/>
<constraint firstItem="VK3-wA-HIw" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="gEd-gO-DMb"/>
<constraint firstItem="Ho7-a3-lkY" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="8" id="h3c-Yk-iRZ"/>
<constraint firstItem="b8G-F1-453" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="17" id="jKO-uh-ti6"/>
<constraint firstItem="5El-06-33n" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="khc-A2-bXb"/>
<constraint firstItem="5El-06-33n" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="100" id="mwa-Xh-Ruq"/>
<constraint firstAttribute="trailing" secondItem="5El-06-33n" secondAttribute="trailing" id="oXC-Wb-SHt"/>
</constraints>
</view>
<nil key="simulatedStatusBarMetrics"/>
<connections>
<outlet property="blurEffecrSegmentedControl" destination="Ho7-a3-lkY" id="meq-sq-lcd"/>
<outlet property="styleSegmentedControl" destination="b8G-F1-453" id="31G-Cx-7fe"/>
<outlet property="tableView" destination="5El-06-33n" id="DUc-Mx-Idw"/>
</connections>
</viewController>
</objects>
<point key="canvasLocation" x="1" y="47"/>
</scene>
</scenes>
<resources>
<image name="sampleBackground" width="1067" height="1600"/>
</resources>
</document>
2 changes: 1 addition & 1 deletion Example/Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<string>MainViewController</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
Loading

0 comments on commit 035f7f5

Please sign in to comment.