Skip to content

Commit

Permalink
Merge branch 'illabo-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Vyacheslav Budnikov committed Oct 2, 2019
2 parents 298ab9e + aa8e236 commit 2295a01
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
11 changes: 4 additions & 7 deletions SampleProject/ASDKSampleApp/Source/DetailInfo/DetailInfoTableViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -27,7 +25,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="zsp-t1-mQi">
<rect key="frame" x="0.0" y="20" width="375" height="551"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="571"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="7KP-e6-fT1"/>
Expand Down Expand Up @@ -95,7 +93,6 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="3gx-qY-JCD" firstAttribute="top" secondItem="zsp-t1-mQi" secondAttribute="bottom" id="1VN-ve-gfV"/>
<constraint firstItem="zsp-t1-mQi" firstAttribute="top" secondItem="5uV-HC-1FD" secondAttribute="top" id="FIc-uW-rUB"/>
Expand Down
26 changes: 17 additions & 9 deletions SampleProject/ASDKSampleApp/Source/ItemsList/BookItemCell/BookItemCell.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?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="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -12,16 +13,17 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="500"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<frame key="frameInset" width="480" height="500"/>
<rect key="frame" x="0.0" y="0.0" width="480" height="500"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HgE-jE-ckJ" userLabel="imageItemContainerView">
<rect key="frame" x="27" y="18" width="426" height="200"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eRB-6e-75C">
<rect key="frame" x="0.0" y="0.0" width="426" height="200"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="eRB-6e-75C" firstAttribute="top" secondItem="HgE-jE-ckJ" secondAttribute="top" id="6Ta-IG-5qn"/>
<constraint firstItem="eRB-6e-75C" firstAttribute="leading" secondItem="HgE-jE-ckJ" secondAttribute="leading" id="OXG-rn-gwB"/>
Expand All @@ -31,8 +33,10 @@
</constraints>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YWC-3n-ErF" userLabel="buySection">
<rect key="frame" x="12" y="437" width="456" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u4M-D6-Nxi" userLabel="itemCostLabel">
<rect key="frame" x="15" y="19.5" width="42" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="sFm-ao-JkA"/>
</constraints>
Expand All @@ -41,6 +45,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3lv-mG-fx3">
<rect key="frame" x="349" y="16" width="92" height="28"/>
<color key="backgroundColor" red="1" green="0.79275838080000005" blue="0.1040381712" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="tbM-gl-So0"/>
Expand All @@ -55,19 +60,20 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kqr-Ed-AqV" userLabel="topBorderView">
<rect key="frame" x="0.0" y="0.0" width="456" height="1"/>
<color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="rAY-aO-xTJ"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IeE-p2-a2j" userLabel="bottomBorderView">
<rect key="frame" x="0.0" y="59" width="456" height="1"/>
<color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="nsS-aa-xiX"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="u4M-D6-Nxi" firstAttribute="leading" secondItem="YWC-3n-ErF" secondAttribute="leading" constant="15" id="2sy-bz-E17"/>
<constraint firstAttribute="height" constant="60" id="8Sg-Ul-FvZ"/>
Expand All @@ -83,8 +89,10 @@
</constraints>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SwM-AD-2Eu" userLabel="itemDescriptionContainerView">
<rect key="frame" x="12" y="234" width="456" height="187"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6z9-69-lCg" userLabel="itemTitleLabel">
<rect key="frame" x="15" y="0.0" width="42" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="0FE-DD-IwC"/>
</constraints>
Expand All @@ -93,6 +101,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zou-Os-min" userLabel="itemSubtitleLabel">
<rect key="frame" x="15" y="29" width="37.5" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="ft8-Y9-EG0"/>
</constraints>
Expand All @@ -101,6 +110,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BRG-ZW-hvI">
<rect key="frame" x="15" y="55" width="426" height="15"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="15" id="0bQ-Er-DFK"/>
</constraints>
Expand All @@ -109,7 +119,6 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="BRG-ZW-hvI" secondAttribute="trailing" constant="15" id="03u-dq-pfN"/>
<constraint firstItem="6z9-69-lCg" firstAttribute="leading" secondItem="SwM-AD-2Eu" secondAttribute="leading" constant="15" id="0ZA-Ut-JH5"/>
Expand All @@ -124,7 +133,6 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="SwM-AD-2Eu" firstAttribute="top" secondItem="HgE-jE-ckJ" secondAttribute="bottom" constant="16" id="7JM-Vr-tR3"/>
<constraint firstAttribute="trailingMargin" secondItem="YWC-3n-ErF" secondAttribute="trailing" constant="-8" id="A50-Kp-97J"/>
Expand Down
13 changes: 5 additions & 8 deletions SampleProject/ASDKSampleApp/Source/TransactionHistoryViewController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -22,15 +20,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="AAK-Pv-GVq">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="taW-gV-o4l"/>
<outlet property="delegate" destination="-1" id="fl2-iS-Ewq"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="AAK-Pv-GVq" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="8hH-7a-iLf"/>
<constraint firstItem="D18-o9-0HH" firstAttribute="bottom" secondItem="AAK-Pv-GVq" secondAttribute="bottom" id="YfO-7n-Pwp"/>
Expand Down

0 comments on commit 2295a01

Please sign in to comment.