git.iko.soy/dashared/hookah-tau
on develop help sign in
Убрала надпись про количество кальянов
commit99b44e696df964825f678af8c1d2283ac88b3cf4 authorDarya Rednikina <rednikina.com@yandex.ru> dateWed 8 Jan 2020, 16:33 (7 years ago) parent89d52cc
3 files changed+14−28
compare with develop
unifiedsplit
Hookah Tau/Controllers/Client/Reservations/Reservation.storyboard+4−4 Hookah Tau/Controllers/Client/Reservations/Steps/2/SecondStepView.swift−7 Hookah Tau/Controllers/Client/Reservations/Steps/2/SecondStepView.xib+10−17
Hookah Tau/Controllers/Client/Reservations/Reservation.storyboard+4−4
@@ -1,9 +1,9 @@
11<?xml version="1.0" encoding="UTF-8"?>
2−<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33 <device id="retina6_1" orientation="portrait" appearance="light"/>
44 <dependencies>
55 <deployment identifier="iOS"/>
6− <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
6+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
77 <capability name="Safe area layout guides" minToolsVersion="9.0"/>
88 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99 </dependencies>
@@ -49,10 +49,10 @@
4949 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
5050 <subviews>
5151 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NBJ-7w-vpV">
52− <rect key="frame" x="0.0" y="502" width="414" height="394"/>
52+ <rect key="frame" x="0.0" y="544" width="414" height="352"/>
5353 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5454 <constraints>
55− <constraint firstAttribute="height" constant="394" id="KKm-d5-Srx"/>
55+ <constraint firstAttribute="height" constant="352" id="KKm-d5-Srx"/>
5656 </constraints>
5757 </view>
5858 </subviews>
Hookah Tau/Controllers/Client/Reservations/Steps/2/SecondStepView.swift−7
@@ -23,8 +23,6 @@ class SecondStepView: UIView {
2323
2424 @IBOutlet weak var totalBookingLabel: UILabel!
2525
26− @IBOutlet weak var infoLabel: UILabel!
27−
2826 @IBOutlet weak var specialLabel: UILabel! {
2927 didSet {
3028 let m = NSMutableAttributedString(string: "Если Вам нужно что-то особенное, Вы можете связаться с администратором ")
@@ -131,7 +129,6 @@ class SecondStepView: UIView {
131129 @IBAction func sliderValueChanged(_ sender: UISlider) {
132130 let value = Int(sender.value)
133131 numberOfGuestsLabel.text = "Количество гостей: \(value)"
134− infoLabel.text = getNumberOfCalians(value)
135132
136133 guard let d = data else { return }
137134
@@ -151,10 +148,6 @@ class SecondStepView: UIView {
151148 UIApplication.shared.open(urlPhone)
152149 }
153150
154− func getNumberOfCalians(_ sliderValue: Int) -> String {
155− return "Минимальное количество кальянов: \(sliderValue > 6 ? 2 : 1)"
156− }
157−
158151 // MARK: - Setup
159152
160153 /// Тут происходит установка интервалов. Разное для клиента и админа
Hookah Tau/Controllers/Client/Reservations/Steps/2/SecondStepView.xib+10−17
@@ -1,9 +1,9 @@
11<?xml version="1.0" encoding="UTF-8"?>
2−<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">
2+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33 <device id="retina4_7" orientation="portrait" appearance="light"/>
44 <dependencies>
55 <deployment identifier="iOS"/>
6− <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
6+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
77 <capability name="Safe area layout guides" minToolsVersion="9.0"/>
88 <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
99 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,14 +12,14 @@
1212 <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
1313 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
1414 <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SecondStepView" customModule="Hookah_Tau" customModuleProvider="target">
15− <rect key="frame" x="0.0" y="0.0" width="414" height="394"/>
15+ <rect key="frame" x="0.0" y="0.0" width="414" height="352"/>
1616 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1717 <subviews>
1818 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="bJ1-1q-VXq">
19− <rect key="frame" x="20" y="20" width="374" height="131.5"/>
19+ <rect key="frame" x="20" y="20" width="374" height="80"/>
2020 <subviews>
2121 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="Dkh-B7-3Dl">
22− <rect key="frame" x="16.5" y="0.0" width="341.5" height="92.5"/>
22+ <rect key="frame" x="16.5" y="0.0" width="341.5" height="41"/>
2323 <subviews>
2424 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Забронировать 7 столик на 3 человека 29 марта с 3:00 до 5:30?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7M9-lI-egu">
2525 <rect key="frame" x="0.0" y="0.0" width="341.5" height="41"/>
@@ -27,16 +27,10 @@
2727 <nil key="textColor"/>
2828 <nil key="highlightedColor"/>
2929 </label>
30− <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Минимальное количество кальянов: 2" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zMP-Wa-N6b">
31− <rect key="frame" x="11" y="72" width="319" height="20.5"/>
32− <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
33− <nil key="textColor"/>
34− <nil key="highlightedColor"/>
35− </label>
3630 </subviews>
3731 </stackView>
3832 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PHb-Nt-9I2">
39− <rect key="frame" x="47" y="102.5" width="280.5" height="29"/>
33+ <rect key="frame" x="47" y="51" width="280.5" height="29"/>
4034 <string key="text">Если Вам нужно что-то особенное, Вы можете
4135связаться с администратором. </string>
4236 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="12"/>
@@ -46,7 +40,7 @@
4640 </subviews>
4741 </stackView>
4842 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="9c7-IZ-n2p">
49− <rect key="frame" x="20" y="171.5" width="373.5" height="60.5"/>
43+ <rect key="frame" x="20" y="120" width="373.5" height="70"/>
5044 <subviews>
5145 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Количество гостей: 3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QuY-68-2ax">
5246 <rect key="frame" x="0.0" y="0.0" width="373.5" height="20.5"/>
@@ -55,7 +49,7 @@
5549 <nil key="highlightedColor"/>
5650 </label>
5751 <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="3" minValue="1" maxValue="10" translatesAutoresizingMaskIntoConstraints="NO" id="TrY-MC-Ty0">
58− <rect key="frame" x="-2" y="30.5" width="377.5" height="31"/>
52+ <rect key="frame" x="-2" y="30.5" width="377.5" height="40.5"/>
5953 <connections>
6054 <action selector="sliderValueChanged:" destination="iN0-l3-epB" eventType="valueChanged" id="ekZ-3h-EeB"/>
6155 </connections>
@@ -63,7 +57,7 @@
6357 </subviews>
6458 </stackView>
6559 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RJE-Hk-KNh">
66− <rect key="frame" x="0.0" y="252" width="414" height="106"/>
60+ <rect key="frame" x="0.0" y="210" width="414" height="106"/>
6761 <subviews>
6862 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dmc-2e-y3T">
6963 <rect key="frame" x="0.0" y="21" width="414" height="85"/>
@@ -144,14 +138,13 @@
144138 <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
145139 <connections>
146140 <outlet property="guestSlider" destination="TrY-MC-Ty0" id="mR0-wv-AM7"/>
147− <outlet property="infoLabel" destination="zMP-Wa-N6b" id="htu-ql-T0O"/>
148141 <outlet property="intervalsStackView" destination="IIO-je-eBt" id="gaP-LX-Xed"/>
149142 <outlet property="numberOfGuestsLabel" destination="QuY-68-2ax" id="DvK-dr-c3J"/>
150143 <outlet property="scrollView" destination="zk1-3E-2kS" id="b8R-jY-2Q3"/>
151144 <outlet property="specialLabel" destination="PHb-Nt-9I2" id="hXL-Je-dax"/>
152145 <outlet property="totalBookingLabel" destination="7M9-lI-egu" id="7YU-yI-Gm4"/>
153146 </connections>
154− <point key="canvasLocation" x="-8" y="70"/>
147+ <point key="canvasLocation" x="-8" y="88.15592203898052"/>
155148 </view>
156149 </objects>
157150</document>