Commit 21792a3e authored by Grigor Aghabalyan's avatar Grigor Aghabalyan
Browse files

Merge branch 'dev' into 'master'

Fix: scrollview height

See merge request !3
parents fa0ab730 225d4b9b
......@@ -646,7 +646,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......@@ -667,7 +667,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......
......@@ -32,10 +32,10 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kwt-kc-N2e">
<rect key="frame" x="0.0" y="0.0" width="414" height="646"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="650"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Azo-7T-DFW" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="55" width="334" height="50"/>
<rect key="frame" x="40" y="59" width="334" height="50"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0QW-Kv-2ER">
<rect key="frame" x="0.0" y="48" width="334" height="2"/>
......@@ -79,13 +79,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ելքի ժամ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="syB-Qv-Joh">
<rect key="frame" x="62" y="29" width="312" height="18"/>
<rect key="frame" x="62" y="33" width="312" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D1C-8s-tPP" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="157" width="334" height="50"/>
<rect key="frame" x="40" y="161" width="334" height="50"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="czj-oJ-tjQ">
<rect key="frame" x="0.0" y="48" width="334" height="2"/>
......@@ -119,13 +119,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ելքի հասցե" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JQ1-bo-hyi">
<rect key="frame" x="62" y="130" width="312" height="18"/>
<rect key="frame" x="62" y="134" width="312" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JD7-Yf-hQj" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="359" width="334" height="50"/>
<rect key="frame" x="40" y="363" width="334" height="50"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Yo-z8-oAH">
<rect key="frame" x="0.0" y="48" width="334" height="2"/>
......@@ -159,13 +159,13 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Այցելության վայրի հասցե/անվանում" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rli-qI-mfE">
<rect key="frame" x="62" y="333" width="312" height="18"/>
<rect key="frame" x="62" y="337" width="312" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NyF-FR-xam">
<rect key="frame" x="40" y="551" width="334" height="50"/>
<rect key="frame" x="40" y="555" width="334" height="50"/>
<color key="backgroundColor" red="0.0" green="0.53725490200000003" blue="0.15686274510000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="woG-qF-djV"/>
......@@ -184,7 +184,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z4k-Ps-PAB" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="258" width="334" height="50"/>
<rect key="frame" x="40" y="262" width="334" height="50"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lme-Mg-B1h">
<rect key="frame" x="0.0" y="48" width="334" height="2"/>
......@@ -228,19 +228,19 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Վերադարձի ակնկալվող ժամը" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XIU-P6-Fzz">
<rect key="frame" x="56" y="232" width="318" height="18"/>
<rect key="frame" x="56" y="236" width="318" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.41999998688697815" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- -" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tq2-Oq-lxj">
<rect key="frame" x="41" y="4" width="333" height="18"/>
<rect key="frame" x="41" y="8" width="333" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A8h-Y5-do2" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="460" width="334" height="50"/>
<rect key="frame" x="40" y="464" width="334" height="50"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lo6-I6-IUF">
<rect key="frame" x="0.0" y="48" width="334" height="2"/>
......@@ -274,7 +274,7 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Այցելության նպատակը" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANA-an-vnP">
<rect key="frame" x="59" y="434" width="315" height="18"/>
<rect key="frame" x="59" y="438" width="315" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
......@@ -312,7 +312,7 @@
<constraint firstItem="Tq2-Oq-lxj" firstAttribute="leading" secondItem="Kwt-kc-N2e" secondAttribute="leading" constant="41" id="exd-Af-Wo5"/>
<constraint firstItem="Azo-7T-DFW" firstAttribute="top" secondItem="syB-Qv-Joh" secondAttribute="bottom" constant="8" id="jGQ-Lj-r4b"/>
<constraint firstItem="ANA-an-vnP" firstAttribute="top" secondItem="JD7-Yf-hQj" secondAttribute="bottom" constant="25" id="juh-hB-Xei"/>
<constraint firstItem="Tq2-Oq-lxj" firstAttribute="top" secondItem="Kwt-kc-N2e" secondAttribute="top" constant="4" id="nSE-Ou-R2k"/>
<constraint firstItem="Tq2-Oq-lxj" firstAttribute="top" secondItem="Kwt-kc-N2e" secondAttribute="top" constant="8" id="nSE-Ou-R2k"/>
<constraint firstItem="syB-Qv-Joh" firstAttribute="top" secondItem="Tq2-Oq-lxj" secondAttribute="bottom" constant="7" id="rr8-7z-gj0"/>
<constraint firstAttribute="trailing" secondItem="D1C-8s-tPP" secondAttribute="trailing" constant="40" id="sZh-VY-bx5"/>
<constraint firstAttribute="trailing" secondItem="ANA-an-vnP" secondAttribute="trailing" constant="40" id="wxF-Tk-cei"/>
......@@ -324,7 +324,7 @@
</subviews>
<constraints>
<constraint firstItem="Kwt-kc-N2e" firstAttribute="width" secondItem="9XT-9B-ssX" secondAttribute="width" id="EiE-Fg-haM"/>
<constraint firstAttribute="bottom" secondItem="Kwt-kc-N2e" secondAttribute="bottom" constant="254" id="IwO-SM-oBm"/>
<constraint firstAttribute="bottom" secondItem="Kwt-kc-N2e" secondAttribute="bottom" id="IwO-SM-oBm"/>
<constraint firstAttribute="trailing" secondItem="Kwt-kc-N2e" secondAttribute="trailing" id="Xh8-mZ-LxV"/>
<constraint firstItem="Kwt-kc-N2e" firstAttribute="top" secondItem="9XT-9B-ssX" secondAttribute="top" id="nhk-wF-mqS"/>
<constraint firstItem="Kwt-kc-N2e" firstAttribute="leading" secondItem="9XT-9B-ssX" secondAttribute="leading" id="zKM-S9-Uad"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment