Skip to content

K
kt-ios
Commit e92882a0 by Olzhas Aldabergenov
Options

bug fixes

parent 67e7b8ba
Showing with 171 additions and 502 deletions
kt.xcodeproj/project.pbxproj
......@@ -95,7 +95,6 @@
3E6969B31FA2097200032D95 /* ServiceDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6969B21FA2097200032D95 /* ServiceDetailsViewController.swift */; };
3E7A5B371FD95F4C0040F7A6 /* UITextField+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7A5B361FD95F4C0040F7A6 /* UITextField+Extensions.swift */; };
3E8D31161FB1AA3500A650D2 /* VIPCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D31151FB1AA3500A650D2 /* VIPCell.swift */; };
3EA73F081FAAE6620009731F /* ServiceCalculatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA73F071FAAE6620009731F /* ServiceCalculatorViewController.swift */; };
3EA7F6BA1F00D1A1003F6CBF /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA7F6B91F00D1A1003F6CBF /* MainViewController.swift */; };
3EA7F6C51F021C9D003F6CBF /* FeedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA7F6C41F021C9D003F6CBF /* FeedViewController.swift */; };
3EA7F6C71F0227E1003F6CBF /* FeedItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA7F6C61F0227E1003F6CBF /* FeedItem.swift */; };
......@@ -652,7 +651,6 @@
3E6969B21FA2097200032D95 /* ServiceDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceDetailsViewController.swift; sourceTree = "<group>"; };
3E7A5B361FD95F4C0040F7A6 /* UITextField+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+Extensions.swift"; sourceTree = "<group>"; };
3E8D31151FB1AA3500A650D2 /* VIPCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VIPCell.swift; sourceTree = "<group>"; };
3EA73F071FAAE6620009731F /* ServiceCalculatorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceCalculatorViewController.swift; sourceTree = "<group>"; };
3EA7F6B91F00D1A1003F6CBF /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
3EA7F6C41F021C9D003F6CBF /* FeedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedViewController.swift; sourceTree = "<group>"; };
3EA7F6C61F0227E1003F6CBF /* FeedItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedItem.swift; sourceTree = "<group>"; };
......@@ -1265,7 +1263,6 @@
3EA7F6EB1F04FDCB003F6CBF /* ServiceMainCell.swift */,
3EAFC48F1F7916A500BB07AD /* CallbackViewController.swift */,
3E6969B21FA2097200032D95 /* ServiceDetailsViewController.swift */,
3EA73F071FAAE6620009731F /* ServiceCalculatorViewController.swift */,
3EC107C41FB019A600EB2188 /* ServiceVIPTableViewController.swift */,
);
path = Service;
......@@ -2697,7 +2694,6 @@
9843762A1DC4AAEA00FBF2B3 /* UIView+Util.swift in Sources */,
984A73881CEC76D0005C26F6 /* UITableViewCell+PresentingViewController.swift in Sources */,
3EB108581F15F428000EAE88 /* BotViewController.swift in Sources */,
3EA73F081FAAE6620009731F /* ServiceCalculatorViewController.swift in Sources */,
3EA7F6F01F074BF9003F6CBF /* AccountServices.swift in Sources */,
3EAFC4771F6A926A00BB07AD /* MainKnowedgeViewController.swift in Sources */,
987457B01CFDDA3800BB32C6 /* OfferFormTitleCell.swift in Sources */,
......
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -25,22 +25,6 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/AccountServicesViewController.swift"
timestampString = "528871513.42196"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "190"
endingLineNumber = "190"
landmarkName = "megalineInfoAction(sender:event:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/CallbackViewController.swift"
timestampString = "528032989.334432"
startingColumnNumber = "9223372036854775807"
......@@ -138,14 +122,46 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceVIPTableViewController.swift"
timestampString = "534249690.799642"
timestampString = "534767021.314772"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "305"
endingLineNumber = "305"
startingLineNumber = "314"
endingLineNumber = "314"
landmarkName = "updateTotal()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/cashAndPayments/PaymentsHistoryViewController.swift"
timestampString = "534837511.617012"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "147"
endingLineNumber = "147"
landmarkName = "numberOfSections(in:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/cashAndPayments/PaymentsHistoryViewController.swift"
timestampString = "534837511.617012"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "142"
endingLineNumber = "142"
landmarkName = "tableView(_:numberOfRowsInSection:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
kt/Resources/Base.lproj/Main.storyboard
......@@ -354,7 +354,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8gk-Mh-q6D" id="wRv-ae-1bA">
<frame key="frameInset" width="600" height="79.5"/>
<frame key="frameInset" width="600" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dul-TF-41F">
......@@ -1974,7 +1974,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="565"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2Ex-Sy-kIh" id="4Ss-D3-jvW">
<frame key="frameInset" width="375" height="564.5"/>
<frame key="frameInset" width="375" height="565"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cJE-8m-Tze" userLabel="Header">
......@@ -2208,7 +2208,7 @@
<rect key="frame" x="0.0" y="593" width="375" height="341"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wSX-HC-rEx" id="xpH-PD-ZuU">
<frame key="frameInset" width="375" height="340.5"/>
<frame key="frameInset" width="375" height="341"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Io8-0E-EIc" userLabel="Header">
......@@ -2367,7 +2367,7 @@
<rect key="frame" x="0.0" y="934" width="375" height="501"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7Q0-0z-3pT" id="TMP-vz-N82">
<frame key="frameInset" width="375" height="500.5"/>
<frame key="frameInset" width="375" height="501"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WeX-fT-6Mb" userLabel="Header">
......@@ -2567,7 +2567,7 @@
<rect key="frame" x="0.0" y="1435" width="375" height="325"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Iha-Cf-L7F" id="9OS-6Y-Nv4">
<frame key="frameInset" width="375" height="324.5"/>
<frame key="frameInset" width="375" height="325"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VBM-Nr-Uoz" userLabel="Button Plus">
......@@ -2693,7 +2693,7 @@
<rect key="frame" x="0.0" y="1760" width="375" height="450"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SWC-Xq-tlp" id="D5t-2w-Kys">
<frame key="frameInset" width="375" height="449.5"/>
<frame key="frameInset" width="375" height="450"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yao-1s-tH1" userLabel="Button Plus">
......@@ -2859,7 +2859,7 @@
<rect key="frame" x="0.0" y="2210" width="375" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eUc-dJ-Vzf" id="ZYI-52-t5l">
<frame key="frameInset" width="375" height="149.5"/>
<frame key="frameInset" width="375" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcb-Lg-dXc">
......@@ -2919,7 +2919,7 @@
<rect key="frame" x="0.0" y="2360" width="375" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rs2-re-Y7e" id="4rT-Rf-2pL">
<frame key="frameInset" width="375" height="165.5"/>
<frame key="frameInset" width="375" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xqe-0s-hVF">
......@@ -2991,7 +2991,7 @@
<rect key="frame" x="0.0" y="2526" width="375" height="145"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="cKQ-ha-MTj" id="Pxd-jU-nW1">
<frame key="frameInset" width="375" height="144.5"/>
<frame key="frameInset" width="375" height="145"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="testing label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d9N-Lj-Vxa" userLabel="Label Services Total">
......@@ -3112,304 +3112,6 @@
</objects>
<point key="canvasLocation" x="-7839.1999999999998" y="-7379.0104947526243"/>
</scene>
<!--Service Calculator View Controller-->
<scene sceneID="C1t-ME-0VT">
<objects>
<viewController storyboardIdentifier="ServiceCalculatorViewController" id="kWG-Ld-cX7" customClass="ServiceCalculatorViewController" customModule="telecom" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="MFc-oi-nwf"/>
<viewControllerLayoutGuide type="bottom" id="ELo-X6-6Jf"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="ALa-1U-XGY">
<rect key="frame" x="0.0" y="0.0" width="375" height="1667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Cul-km-bT6">
<frame key="frameInset" width="375" height="1535"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e2G-aG-Seh" userLabel="LinearLayout">
<rect key="frame" x="0.0" y="0.0" width="375" height="1394"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xpk-Nd-7vs">
<constraints>
<constraint firstAttribute="height" constant="196" id="1u6-eR-X4c"/>
</constraints>
</imageView>
<view alpha="0.30000001192092896" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZM-U8-P1I" userLabel="TintView">
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ql2-Dz-IkV" userLabel="ServicePriceView">
<fontDescription key="fontDescription" type="system" pointSize="21"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="bottomLeft" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ocy-Sc-p32" userLabel="ServiceNameView">
<fontDescription key="fontDescription" type="system" pointSize="21"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Что входит в пакет?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UJk-Gq-Tiz" userLabel="LabelWhatIsNew">
<frame key="frameInset" minX="8" minY="204" width="359" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="05m-Ao-Dvo" userLabel="SeparatorBlue">
<frame key="frameInset" minX="8" minY="251" width="60" height="2"/>
<color key="backgroundColor" red="0.0" green="0.50679506070000002" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="eZ8-6Q-C3e"/>
<constraint firstAttribute="height" constant="2" id="ou7-f4-M0A"/>
</constraints>
</view>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UOj-ri-ShI" userLabel="Separator1">
<frame key="frameInset" minX="8" minY="272" width="359" height="1"/>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="eFI-6K-9Ut"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Безопасный интернет" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ehz-nz-z9R" userLabel="LabelSafeInternet">
<frame key="frameInset" minX="8" minY="289" width="359" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Скорость интернета до 100 Мбит/с" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1md-hm-1OE">
<frame key="frameInset" minX="8" minY="325" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Антивирус Касперского" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mxb-CW-swx">
<frame key="frameInset" minX="8" minY="361" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Родительский контроль" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QDL-6B-ZPF">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ioh-93-buQ" userLabel="Separator2">
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="JAf-fa-AIr"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Премиальное телевидение" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XW7-vz-wya" userLabel="Label Premium TV">
<frame key="frameInset" minX="8" minY="450" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="130 каналов iDTV" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zF9-GX-j2n">
<frame key="frameInset" minX="8" minY="486" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="70 мировых сериалов Amedia" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dEl-gE-Q5K">
<frame key="frameInset" minX="8" minY="520" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="5000 фильмов Megogo+" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qrs-bH-YJX">
<frame key="frameInset" minX="8" minY="552" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="4000 песен караоке" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CTN-c8-gju">
<frame key="frameInset" minX="8" minY="590" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="ServiceOptions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q3g-LH-x9s">
<frame key="frameInset" minX="8" minY="636" width="359" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="bfb-Kw-Ae6" userLabel="TableViewServiceOption">
<frame key="frameInset" minX="8" minY="682" width="359" height="168"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="sectionIndexBackgroundColor" red="1" green="0.6875568447" blue="0.4941991208" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cellServiceOption" editingAccessoryType="checkmark" id="6Jf-K2-ojJ">
<rect key="frame" x="0.0" y="28" width="359" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Jf-K2-ojJ" id="Ye0-42-ZEz">
<frame key="frameInset" width="359" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
</tableView>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vig-xj-f7Z" userLabel="BottomView">
<frame key="frameInset" minX="8" minY="1331" width="359" height="32"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="gAH-af-xcU"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="dEl-gE-Q5K" firstAttribute="top" secondItem="zF9-GX-j2n" secondAttribute="bottom" constant="16" id="1XD-2p-bpv"/>
<constraint firstItem="ioh-93-buQ" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="2AJ-IY-hIC"/>
<constraint firstAttribute="trailing" secondItem="Ql2-Dz-IkV" secondAttribute="trailing" constant="16" id="2Ga-5B-5wu"/>
<constraint firstAttribute="trailing" secondItem="mxb-CW-swx" secondAttribute="trailing" constant="8" id="3fL-1y-gaY"/>
<constraint firstItem="Ocy-Sc-p32" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="16" id="3hV-uc-6dG"/>
<constraint firstItem="Q3g-LH-x9s" firstAttribute="top" secondItem="CTN-c8-gju" secondAttribute="bottom" constant="16" id="4gx-dY-zDd"/>
<constraint firstItem="ehz-nz-z9R" firstAttribute="top" secondItem="UOj-ri-ShI" secondAttribute="bottom" constant="16" id="6ag-rX-JY9"/>
<constraint firstAttribute="trailing" secondItem="Ocy-Sc-p32" secondAttribute="trailing" constant="16" id="7Yh-VJ-3B2"/>
<constraint firstItem="QDL-6B-ZPF" firstAttribute="top" secondItem="mxb-CW-swx" secondAttribute="bottom" constant="16" id="7b3-T2-t0d"/>
<constraint firstItem="xpk-Nd-7vs" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" id="BlO-5P-5xb"/>
<constraint firstItem="vig-xj-f7Z" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" id="C3S-iT-epT"/>
<constraint firstItem="qrs-bH-YJX" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="CC2-FU-Trf"/>
<constraint firstItem="UJk-Gq-Tiz" firstAttribute="trailing" secondItem="e2G-aG-Seh" secondAttribute="trailingMargin" id="CDt-t5-bUb"/>
<constraint firstItem="XW7-vz-wya" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="FKH-uF-Dnv"/>
<constraint firstAttribute="trailing" secondItem="CTN-c8-gju" secondAttribute="trailing" constant="8" id="Gc5-gF-WZA"/>
<constraint firstAttribute="trailing" secondItem="zF9-GX-j2n" secondAttribute="trailing" constant="8" id="Hwd-Sg-NZj"/>
<constraint firstItem="bfb-Kw-Ae6" firstAttribute="top" secondItem="Q3g-LH-x9s" secondAttribute="bottom" constant="16" id="IAe-bQ-DUC"/>
<constraint firstItem="ioh-93-buQ" firstAttribute="top" secondItem="QDL-6B-ZPF" secondAttribute="bottom" constant="16" id="IVc-ZP-4Zq"/>
<constraint firstItem="vig-xj-f7Z" firstAttribute="top" secondItem="bfb-Kw-Ae6" secondAttribute="bottom" constant="16" id="J7U-ZC-N64"/>
<constraint firstItem="zF9-GX-j2n" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="JEU-JL-ozC"/>
<constraint firstItem="ZZM-U8-P1I" firstAttribute="top" secondItem="e2G-aG-Seh" secondAttribute="top" id="JyC-mw-hYU"/>
<constraint firstItem="UJk-Gq-Tiz" firstAttribute="top" secondItem="xpk-Nd-7vs" secondAttribute="bottom" constant="16" id="K2T-zI-5EN"/>
<constraint firstItem="xpk-Nd-7vs" firstAttribute="top" secondItem="e2G-aG-Seh" secondAttribute="top" id="KnS-Ad-o3E"/>
<constraint firstItem="mxb-CW-swx" firstAttribute="top" secondItem="1md-hm-1OE" secondAttribute="bottom" constant="16" id="M7E-A3-2xn"/>
<constraint firstAttribute="trailing" secondItem="qrs-bH-YJX" secondAttribute="trailing" constant="8" id="MW3-7U-t2H"/>
<constraint firstAttribute="trailing" secondItem="bfb-Kw-Ae6" secondAttribute="trailing" constant="8" id="MXe-qc-k4h"/>
<constraint firstItem="CTN-c8-gju" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="NVU-LL-XaG"/>
<constraint firstItem="ZZM-U8-P1I" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" id="Nst-Fv-Zfe"/>
<constraint firstAttribute="trailing" secondItem="QDL-6B-ZPF" secondAttribute="trailing" constant="8" id="SCx-wb-A0B"/>
<constraint firstAttribute="trailing" secondItem="xpk-Nd-7vs" secondAttribute="trailing" id="SFb-eh-V6s"/>
<constraint firstItem="1md-hm-1OE" firstAttribute="top" secondItem="ehz-nz-z9R" secondAttribute="bottom" constant="16" id="SoX-6J-Ott"/>
<constraint firstItem="05m-Ao-Dvo" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leadingMargin" id="Va1-wo-LFA"/>
<constraint firstItem="dEl-gE-Q5K" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="W3z-g7-hov"/>
<constraint firstItem="Ql2-Dz-IkV" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="16" id="Z0O-mq-EuH"/>
<constraint firstItem="UJk-Gq-Tiz" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leadingMargin" id="Zbl-Wb-iLK"/>
<constraint firstAttribute="trailing" secondItem="ehz-nz-z9R" secondAttribute="trailing" constant="8" id="amL-8Z-PAY"/>
<constraint firstItem="1md-hm-1OE" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="bpi-em-vzX"/>
<constraint firstItem="Q3g-LH-x9s" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="btp-KM-EQS"/>
<constraint firstAttribute="bottom" secondItem="vig-xj-f7Z" secondAttribute="bottom" constant="32" id="cb9-L3-Cn9"/>
<constraint firstAttribute="trailing" secondItem="Q3g-LH-x9s" secondAttribute="trailing" constant="8" id="dDW-5U-O35"/>
<constraint firstItem="XW7-vz-wya" firstAttribute="top" secondItem="ioh-93-buQ" secondAttribute="bottom" constant="16" id="fCV-nU-Zfg"/>
<constraint firstItem="bfb-Kw-Ae6" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="fPZ-ac-24Y"/>
<constraint firstAttribute="trailing" secondItem="ZZM-U8-P1I" secondAttribute="trailing" id="fet-eJ-iEt"/>
<constraint firstItem="UOj-ri-ShI" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leadingMargin" id="iHp-jJ-8bz"/>
<constraint firstAttribute="trailing" secondItem="XW7-vz-wya" secondAttribute="trailing" constant="8" id="ikY-16-CxC"/>
<constraint firstItem="mxb-CW-swx" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="k4S-zC-xAu"/>
<constraint firstItem="ehz-nz-z9R" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="kDy-Aq-Q4t"/>
<constraint firstAttribute="trailing" secondItem="1md-hm-1OE" secondAttribute="trailing" constant="8" id="kYD-78-AFf"/>
<constraint firstItem="Ql2-Dz-IkV" firstAttribute="top" secondItem="Ocy-Sc-p32" secondAttribute="bottom" constant="8" id="ksn-eG-sgV"/>
<constraint firstAttribute="trailing" secondItem="vig-xj-f7Z" secondAttribute="trailing" id="o0S-wd-1Sf"/>
<constraint firstItem="ZZM-U8-P1I" firstAttribute="height" secondItem="xpk-Nd-7vs" secondAttribute="height" id="oCY-rH-TXO"/>
<constraint firstItem="05m-Ao-Dvo" firstAttribute="top" secondItem="UJk-Gq-Tiz" secondAttribute="bottom" constant="16" id="p1F-Oo-bWQ"/>
<constraint firstAttribute="trailing" secondItem="dEl-gE-Q5K" secondAttribute="trailing" constant="8" id="p7L-tM-KB9"/>
<constraint firstItem="QDL-6B-ZPF" firstAttribute="leading" secondItem="e2G-aG-Seh" secondAttribute="leading" constant="8" id="pxv-d7-c6h"/>
<constraint firstItem="UOj-ri-ShI" firstAttribute="top" secondItem="05m-Ao-Dvo" secondAttribute="bottom" constant="16" id="ql6-Lh-aDd"/>
<constraint firstItem="Ql2-Dz-IkV" firstAttribute="top" secondItem="xpk-Nd-7vs" secondAttribute="bottom" constant="-36" id="sdE-1T-PhR"/>
<constraint firstItem="UOj-ri-ShI" firstAttribute="trailing" secondItem="e2G-aG-Seh" secondAttribute="trailingMargin" id="siL-kZ-HRV"/>
<constraint firstItem="CTN-c8-gju" firstAttribute="top" secondItem="qrs-bH-YJX" secondAttribute="bottom" constant="16" id="tsC-zD-AXm"/>
<constraint firstAttribute="trailing" secondItem="ioh-93-buQ" secondAttribute="trailing" constant="8" id="vUL-IJ-ZGh"/>
<constraint firstItem="qrs-bH-YJX" firstAttribute="top" secondItem="dEl-gE-Q5K" secondAttribute="bottom" constant="16" id="yap-qf-SUh"/>
<constraint firstItem="zF9-GX-j2n" firstAttribute="top" secondItem="XW7-vz-wya" secondAttribute="bottom" constant="16" id="zzs-ii-KR1"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="e2G-aG-Seh" secondAttribute="trailing" id="07P-Is-nGi"/>
<constraint firstAttribute="bottom" secondItem="e2G-aG-Seh" secondAttribute="bottom" id="7Xq-v2-Ws3"/>
<constraint firstItem="e2G-aG-Seh" firstAttribute="width" secondItem="Cul-km-bT6" secondAttribute="width" id="Hvv-Je-oyB"/>
<constraint firstItem="e2G-aG-Seh" firstAttribute="top" secondItem="Cul-km-bT6" secondAttribute="top" id="cBe-pF-QXY"/>
<constraint firstItem="e2G-aG-Seh" firstAttribute="leading" secondItem="Cul-km-bT6" secondAttribute="leading" id="eK7-Sv-Bji"/>
</constraints>
</scrollView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iwP-ez-q9f" userLabel="ButtonsView">
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hHM-l3-WVb" customClass="UIButtonRoundedBlue" customModule="telecom" customModuleProvider="target">
<color key="backgroundColor" red="0.095081739129999995" green="0.37402468919999998" blue="0.67706954480000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="DHr-bS-wyC"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<state key="normal" title="Подключить">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="buttonAddClicked:" destination="kWG-Ld-cX7" eventType="touchUpInside" id="od0-Du-WHh"/>
<action selector="connectButton:" destination="dnQ-WR-vR5" eventType="touchUpInside" id="qo2-FU-xHq"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9X5-uh-Y1a" customClass="UIButtonRoundedGray" customModule="telecom" customModuleProvider="target">
<color key="backgroundColor" red="0.26219156380000003" green="0.33811080459999998" blue="0.45045208930000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="CLu-TC-1WF"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<state key="normal" title="Обратный звонок">
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="buttonCallbackClicked:" destination="kWG-Ld-cX7" eventType="touchUpInside" id="aCr-kx-9NY"/>
<action selector="callBackButton:" destination="dnQ-WR-vR5" eventType="touchUpInside" id="YhF-Kc-fbl"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.92636108399999995" green="0.92633336779999997" blue="0.92634916310000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="9X5-uh-Y1a" secondAttribute="trailing" constant="16" id="7OI-QR-Kbb"/>
<constraint firstItem="9X5-uh-Y1a" firstAttribute="top" secondItem="hHM-l3-WVb" secondAttribute="bottom" constant="16" id="bbd-Cb-Q6M"/>
<constraint firstItem="hHM-l3-WVb" firstAttribute="leading" secondItem="iwP-ez-q9f" secondAttribute="leading" constant="16" id="ecM-Di-V62"/>
<constraint firstAttribute="bottom" secondItem="9X5-uh-Y1a" secondAttribute="bottom" constant="16" id="fkK-A1-1yN"/>
<constraint firstItem="9X5-uh-Y1a" firstAttribute="leading" secondItem="iwP-ez-q9f" secondAttribute="leading" constant="16" id="kWJ-f9-cSS"/>
<constraint firstAttribute="trailing" secondItem="hHM-l3-WVb" secondAttribute="trailing" constant="16" id="xtV-pv-Mbu"/>
<constraint firstItem="hHM-l3-WVb" firstAttribute="top" secondItem="iwP-ez-q9f" secondAttribute="top" constant="16" id="yW4-Nc-h2o"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="Cul-km-bT6" firstAttribute="leading" secondItem="ALa-1U-XGY" secondAttribute="leading" id="8ZO-Eb-gpw"/>
<constraint firstAttribute="trailing" secondItem="iwP-ez-q9f" secondAttribute="trailing" id="Pm0-B3-Pq6"/>
<constraint firstAttribute="trailing" secondItem="Cul-km-bT6" secondAttribute="trailing" id="d6i-x5-jk5"/>
<constraint firstItem="ELo-X6-6Jf" firstAttribute="top" secondItem="iwP-ez-q9f" secondAttribute="bottom" id="g4x-pI-6NY"/>
<constraint firstItem="iwP-ez-q9f" firstAttribute="leading" secondItem="ALa-1U-XGY" secondAttribute="leading" id="kZc-2Z-FlX"/>
<constraint firstItem="Cul-km-bT6" firstAttribute="top" secondItem="ALa-1U-XGY" secondAttribute="top" id="pQi-Tj-zgf"/>
<constraint firstItem="iwP-ez-q9f" firstAttribute="top" secondItem="Cul-km-bT6" secondAttribute="bottom" id="re6-La-36A"/>
</constraints>
</view>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<size key="freeformSize" width="375" height="1667"/>
<connections>
<outlet property="labelFastInternet" destination="1md-hm-1OE" id="PvI-Ow-8UR"/>
<outlet property="labelKaspersky" destination="mxb-CW-swx" id="KPj-RT-2db"/>
<outlet property="labelParentControl" destination="QDL-6B-ZPF" id="QNg-u9-SHX"/>
<outlet property="labelPremiumTV" destination="XW7-vz-wya" id="DWU-Kz-vAE"/>
<outlet property="labelPremiumTV1" destination="zF9-GX-j2n" id="yrz-DG-q71"/>
<outlet property="labelPremiumTV2" destination="dEl-gE-Q5K" id="rX4-vt-u28"/>
<outlet property="labelPremiumTV3" destination="qrs-bH-YJX" id="pBv-dG-U0Q"/>
<outlet property="labelPremiumTV4" destination="CTN-c8-gju" id="GcI-Z3-9wZ"/>
<outlet property="labelSafeInternet" destination="ehz-nz-z9R" id="x1W-gz-fRc"/>
<outlet property="labelServiceOptions" destination="Q3g-LH-x9s" id="BK6-Q0-kP8"/>
<outlet property="labelWhatIsNew" destination="UJk-Gq-Tiz" id="1za-C9-BUE"/>
<outlet property="scrollView" destination="Cul-km-bT6" id="NLp-OL-eDk"/>
<outlet property="serviceImage" destination="xpk-Nd-7vs" id="md4-DM-3nC"/>
<outlet property="serviceNameView" destination="Ocy-Sc-p32" id="6b7-aE-aSh"/>
<outlet property="servicePriceView" destination="Ql2-Dz-IkV" id="kmX-dW-Gwx"/>
<outlet property="tableViewServiceOption" destination="bfb-Kw-Ae6" id="nDg-fa-exO"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tGR-ZH-zvs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-7138.3999999999996" y="-7378.5607196401807"/>
</scene>
<!--Главная-->
<scene sceneID="bKw-s9-jMJ">
<objects>
......@@ -3868,7 +3570,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nlE-Nl-vsQ" id="gT9-U4-WIA">
<frame key="frameInset" width="342" height="99.5"/>
<frame key="frameInset" width="342" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UCI-rb-RNP">
......@@ -3901,7 +3603,7 @@
<rect key="frame" x="0.0" y="192" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Chb-YR-87M" id="h7J-gm-bU3">
<frame key="frameInset" width="375" height="99.5"/>
<frame key="frameInset" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rMF-Vb-ftO">
......@@ -3934,7 +3636,7 @@
<rect key="frame" x="0.0" y="292" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="IW2-Os-7eR" id="XaK-1e-1F2">
<frame key="frameInset" width="375" height="99.5"/>
<frame key="frameInset" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Td-Wr-Khh" customClass="UIButtonSquaredBlue" customModule="telecom" customModuleProvider="target">
......@@ -4053,7 +3755,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lkv-ut-or5" id="IV2-pe-FBo">
<frame key="frameInset" width="342" height="99.5"/>
<frame key="frameInset" width="342" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="ЗАЯВКИ НАЧИНАЯ С ДАТЫ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cw9-bL-EoY">
......@@ -4089,7 +3791,7 @@
<rect key="frame" x="0.0" y="128" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mgU-8z-mk5" id="7cZ-W8-6Bt">
<frame key="frameInset" width="328" height="89.5"/>
<frame key="frameInset" width="328" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" ambiguous="YES" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbS-eM-lUP">
......@@ -4598,7 +4300,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AP9-BD-JTo" id="Isd-kD-9HS">
<frame key="frameInset" width="375" height="49.5"/>
<frame key="frameInset" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fsq-Q1-em8">
......@@ -4683,7 +4385,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uQQ-J8-UPI" id="d0w-1a-NfH">
<frame key="frameInset" width="375" height="79.5"/>
<frame key="frameInset" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R6G-yX-gQ1">
......@@ -4726,7 +4428,7 @@
<rect key="frame" x="0.0" y="108" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lM5-fY-h1s" id="EZR-N0-HGR">
<frame key="frameInset" width="375" height="79.5"/>
<frame key="frameInset" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Gy-0e-uKm">
......@@ -5081,7 +4783,7 @@
<rect key="frame" x="0.0" y="28" width="359" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Zoj-Mv-vlU" id="zZi-o0-cLk">
<frame key="frameInset" width="359" height="249.5"/>
<frame key="frameInset" width="359" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbe-am-xpW">
......@@ -5244,7 +4946,7 @@
<rect key="frame" x="0.0" y="278" width="359" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5nw-DG-5mw" id="KQF-0C-LBJ">
<frame key="frameInset" width="359" height="119.5"/>
<frame key="frameInset" width="359" height="120"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="duM-2o-GIO">
......@@ -5322,7 +5024,7 @@
<rect key="frame" x="0.0" y="398" width="359" height="80"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="dmh-Hg-JDK" id="OQF-WI-52i">
<frame key="frameInset" width="359" height="79.5"/>
<frame key="frameInset" width="359" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqi-tN-QfC">
......@@ -5916,7 +5618,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="88"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dl5-ti-jpt" id="Bfy-f6-tct">
<frame key="frameInset" width="375" height="87.5"/>
<frame key="frameInset" width="375" height="88"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0p-eC-Sik">
......@@ -6652,7 +6354,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wCL-Bo-ud3" id="V3w-Bg-wQ1">
<frame key="frameInset" width="375" height="59.5"/>
<frame key="frameInset" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HuX-QL-KpV">
......@@ -7026,7 +6728,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ThT-7B-kzN" id="pok-ft-BvC">
<frame key="frameInset" width="375" height="279.5"/>
<frame key="frameInset" width="375" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oG5-sD-tfJ">
......@@ -10065,7 +9767,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5B6-eK-flM" id="yJk-qe-Kmj">
<frame key="frameInset" width="375" height="59.5"/>
<frame key="frameInset" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="So8-9t-0MR">
......@@ -11771,7 +11473,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CRL-NB-uv2" id="url-DA-apA">
<frame key="frameInset" width="342" height="53.5"/>
<frame key="frameInset" width="342" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Pz-e1-Exk">
......@@ -11884,7 +11586,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rJb-XU-r8u" id="2La-8x-EIZ">
<frame key="frameInset" width="375" height="79.5"/>
<frame key="frameInset" width="375" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<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="2bK-Nu-5ZL">
......@@ -11950,7 +11652,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3Jp-vB-Uxs" id="8qf-ck-wI5">
<frame key="frameInset" width="375" height="99.5"/>
<frame key="frameInset" width="375" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e7b-uq-fJH">
kt/Supporting Files/Info.plist
......@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>1.0.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>80</string>
<string>81</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
kt/ViewControllers/Cabinet/AccountServicesViewController.swift
......@@ -58,6 +58,27 @@ class AccountServicesViewController: ViewControllerWithMenu {
extension AccountServicesViewController {
func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
switch indexPath.section {
case Sections.Phones:
break
case Sections.Altel:
self.altel4GActionAction(indexPath.row)
break
case Sections.Megaline:
self.megalineInfoActionAction(indexPath.row)
break
case Sections.idTvOnline:
//self.altel4GActionAction(indexPath.row)
break
default:
break
}
defer { tableView.deselectRowAtIndexPath(indexPath, animated: true)}
}
......@@ -175,9 +196,11 @@ extension AccountServicesViewController {
}
func megalineInfoAction(sender: UIButton, event: AnyObject) {
let index = sender.tag
megalineInfoActionAction(index)
}
private func megalineInfoActionAction(index: Int) {
let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet)
actionSheet.popoverPresentationController?.permittedArrowDirections = UIPopoverArrowDirection.init(rawValue: 0)
......@@ -237,6 +260,10 @@ extension AccountServicesViewController {
let index = sender.tag
}
private func IDTVOnlineActionAction(index: Int) {
let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet)
actionSheet.popoverPresentationController?.permittedArrowDirections = UIPopoverArrowDirection.init(rawValue: 0)
......@@ -258,9 +285,11 @@ extension AccountServicesViewController {
}
func altel4gAction(sender: UIButton, event: AnyObject) {
let index = sender.tag
self.altel4GActionAction(index)
}
private func altel4GActionAction(index: Int) {
let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet)
actionSheet.popoverPresentationController?.permittedArrowDirections = UIPopoverArrowDirection.init(rawValue: 0)
......
kt/ViewControllers/Cabinet/Login/LoginViewController.swift
......@@ -217,7 +217,7 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
isPhoneMode = true
}
func forgetPasswordSend(params: [String: AnyObject]) {
func forgetPasswordSend(params: [String: AnyObject], alert: CustomAlertViewController) {
Facade.sharedInstance().forgetPassword(params, onError: { error -> Void in
AlertViewUtil.showErrorAlert(message: error)
PKNotification.loading(false)
......@@ -225,6 +225,7 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
let message = String(format: LS("login.recovery.successfully_sent"), email)
AlertViewUtil.showIncorrectAlert(message)
PKNotification.loading(false)
alert.close()
})
}
......@@ -293,9 +294,8 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
"type": recoverType,
"data": self.getDataFromTextField(textField)
] as [String: AnyObject]
self.forgetPasswordSend(params)
self.forgetPasswordSend(params, alert: customAlertVC)
}
alertVC.close()
NSTimer.scheduledTimerWithTimeInterval(3.0, target: self, selector: Selector("hideShowedAlert"), userInfo: nil, repeats: false)
}
})
......@@ -606,7 +606,7 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
"data": data
] as [String: AnyObject]
print("params \(params)")
self.forgetPasswordSend(params)
self.forgetPasswordSend(params, alert: customAlertVC)
}
})
})
......@@ -653,8 +653,8 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
phoneHint.hidden = false
self.view.endEditing(true)
_loginTextField.text = "+7 727 817-7224"//"7172682610" // ntcnjdsq 7278177224
_passwordTextField.text = "123456789"//"NewPassword1"
_loginTextField.text = "+7 "//"+7 727 817-7224"//"7172682610" // ntcnjdsq 7278177224
_passwordTextField.text = ""//"123456789"//"NewPassword1"
}
func loginSwitchLoginSelected() {
......
kt/ViewControllers/Cabinet/Login/StepViewController.swift
......@@ -116,6 +116,7 @@ class StepViewController : ScrolledViewController, UIAlertViewDelegate, UIPicker
PKNotification.loading(true)
Facade.sharedInstance().callbackSend(params, onSuccess: { (msg) in
AlertViewUtil.showAlert(msg)
customAlertVC.close()
}, onError: { (error) in
AlertViewUtil.showAlert(error)
}, onFinish: {
......
kt/ViewControllers/Cabinet/cashAndPayments/PaymentsHistoryViewController.swift
......@@ -102,6 +102,8 @@ class PaymentsHistoryViewController: UIViewController, UITableViewDataSource, UI
return tableView.dequeueReusableCellWithIdentifier("pdfCell", forIndexPath: indexPath)
}
}
// UITableViewDataSource
......@@ -122,7 +124,42 @@ extension PaymentsHistoryViewController {
func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
var i = getNumberOfRows()
return i == 0 ? 0 : i + 1
if (i != 0) {
i = i+1
tableView.separatorStyle = .SingleLine
tableView.backgroundView = nil
}
else {
let noDataLabel: UILabel = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.bounds.size.width, height: tableView.bounds.size.height))
noDataLabel.text = LS("no_data")
noDataLabel.textColor = UIColor.blackColor()
noDataLabel.textAlignment = NSTextAlignment.Center
tableView.backgroundView = noDataLabel
tableView.separatorStyle = UITableViewCellSeparatorStyle.None
}
return i///i == 0 ? 0 : i + 1
}
func numberOfSections(in tableView: UITableView) -> Int {
var numOfSections: Int = 0
if getNumberOfRows() != 0
{
tableView.separatorStyle = .SingleLine
numOfSections = 1
tableView.backgroundView = nil
}
else
{
let noDataLabel: UILabel = UILabel(frame: CGRect(x: 0, y: 0, width: tableView.bounds.size.width, height: tableView.bounds.size.height))
noDataLabel.text = LS("no_data")
noDataLabel.textColor = UIColor.blackColor()
noDataLabel.textAlignment = NSTextAlignment.Center
tableView.backgroundView = noDataLabel
tableView.separatorStyle = UITableViewCellSeparatorStyle.None
}
return numOfSections
}
}
......
kt/ViewControllers/FastPay/UICreateFastPayViewController.swift
......@@ -8,7 +8,7 @@
import Foundation
class UICreateFastPayViewController : UIViewController, UITableViewDelegate, UITableViewDataSource,
class UICreateFastPayViewController : KeyboardedViewController, UITableViewDelegate, UITableViewDataSource,
UIPickerViewDelegate, UIPickerViewDataSource {
//MARK: - IBOutlets
......@@ -40,7 +40,9 @@ class UICreateFastPayViewController : UIViewController, UITableViewDelegate, UIT
override func viewDidLoad() {
super.viewDidLoad()
createCells()
self.regionPicker.delegate = self
self.regionPicker.dataSource = self
......@@ -69,8 +71,10 @@ class UICreateFastPayViewController : UIViewController, UITableViewDelegate, UIT
loadAccountView()
}
}
}
@IBAction func onItemSelected(sender: UISegmentedControl) {
tableView.reloadData()
if ( toggle.selectedSegmentIndex == 0 ) {
......@@ -352,8 +356,6 @@ class UICreateFastPayViewController : UIViewController, UITableViewDelegate, UIT
}
}
func getGuidWithoutDash(input: String ) -> String {
var guid = input
if let range = guid.rangeOfString("-") {
......@@ -397,6 +399,7 @@ extension UICreateFastPayViewController {
return cellsAccount.count
}
}
}
//MARK: UITableViewDelegate
......
kt/ViewControllers/Service/ServiceCalculatorViewController.swift deleted 100644 → 0
//
// ServiceCalculatorViewController.swift
// kt
//
// Created by neox on 02.11.17.
// Copyright © 2017 SimpleCode. All rights reserved.
//
import Foundation
import UIKit
class ServiceCalculatorViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
var serviceItem : ServiceItem?
@IBOutlet weak var scrollView: UIScrollView!
@IBOutlet weak var serviceImage: UIImageView!
@IBOutlet weak var servicePriceView: UILabel!
@IBOutlet weak var serviceNameView: UILabel!
@IBOutlet weak var labelWhatIsNew: UILabel!
@IBOutlet weak var labelSafeInternet: UILabel!
@IBOutlet weak var labelFastInternet: UILabel!
@IBOutlet weak var labelKaspersky: UILabel!
@IBOutlet weak var labelParentControl: UILabel!
@IBOutlet weak var labelPremiumTV: UILabel!
@IBOutlet weak var labelPremiumTV1: UILabel!
@IBOutlet weak var labelPremiumTV2: UILabel!
@IBOutlet weak var labelPremiumTV3: UILabel!
@IBOutlet weak var labelPremiumTV4: UILabel!
@IBOutlet weak var labelServiceOptions: UILabel!
@IBOutlet weak var tableViewServiceOption: UITableView!
var tableData = ["Almaty", "Aqtau", "Astana", "Atyrau"]
override func loadView() {
super.loadView()
self.title = serviceItem?.name
self.scrollView.hidden = true
requestService()
}
override func viewDidLoad() {
super.viewDidLoad()
self.tableViewServiceOption.dataSource = self
self.tableViewServiceOption.delegate = self
}
func load() {
self.scrollView.hidden = false
ImageLoader.sharedLoader.imageForUrl((self.serviceItem?.image.absoluteString)!) { (image, url) in
if ( image != nil ) {
self.serviceImage.image = image?.imageWithRenderingMode(.AlwaysOriginal)
} else {
self.serviceImage.backgroundColor = UIColor.lightGrayColor()
}
}
//
self.serviceNameView.text = self.serviceItem?.seoTitle?.uppercaseString
self.servicePriceView.text = (self.serviceItem?.rates[0].price)!// + " " + LS("service_price_per_month_unit")
self.labelWhatIsNew.text = LS("service_what_is_in_package")
self.labelSafeInternet.text = LS("service_safe_internet").uppercaseString
self.labelFastInternet.text = LS("service_fast_internet")
self.labelKaspersky.text = LS("service_kaspersky")
self.labelParentControl.text = LS("service_parent_control")
self.labelPremiumTV.text = LS("service_premium_tv")
self.labelPremiumTV1.text = LS("service_premium_tv_1")
self.labelPremiumTV2.text = LS("service_premium_tv_2")
self.labelPremiumTV3.text = LS("service_premium_tv_3")
self.labelPremiumTV4.text = LS("service_premium_tv_4")
self.labelServiceOptions.text = ""
}
func requestService() {
let params: [String: AnyObject] = ["service_id": (serviceItem?.id)!, "type": "landing" ]
Facade.sharedInstance().getLanding(params, onSuccess: { (serviceItem) in
self.serviceItem = serviceItem
self.load()
}, onError: { (error) in
print(error)
}, onFinish: {
})
}
@IBAction func buttonAddClicked(sender: UIButtonRoundedBlue) {
}
@IBAction func buttonCallbackClicked(sender: UIButtonRoundedGray) {
}
}
extension ServiceCalculatorViewController {
func numberOfSectionsInTableView(tableView: UITableView) -> Int {
return 1//servicesList.count
}
func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return self.tableData.count
}
// func tableView(tableView: UITableView, didDeselectRowAtIndexPath indexPath: NSIndexPath) {
// if let cell = tableView.cellForRowAtIndexPath(indexPath) {
// cell.accessoryType = .None
// }
// }
// func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
// if let cell = tableView.cellForRowAtIndexPath(indexPath) {
// cell.accessoryType = .Checkmark
//
// }
// }
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCellWithIdentifier("cellServiceOption", forIndexPath: indexPath) as UITableViewCell
let text = tableData[indexPath.row]
cell.textLabel?.text = text
return cell
}
}
kt/ViewControllers/Service/ServiceVIPTableViewController.swift
......@@ -40,7 +40,8 @@ class ServiceVIPTableViewController : UIViewController, UITableViewDataSource, U
var serviceTotal = ""
var optionRussianPhone = false
var optionTVPackageNastroiKino = false
//var optionTVPackageNastroiKino = false
var optionTVPackageIndex = 0
@IBAction func connectButton(sender: UIButtonRoundedBlue) {
let vc = self.storyboard!.instantiateViewControllerWithIdentifier("CallbackViewController") as! CallbackViewController
......@@ -273,7 +274,7 @@ extension ServiceVIPTableViewController {
totalPrice = 0
serviceTotal = ""
for index in 0...numberOfRows()-1 {
if ( index == 5 && selection[index] && optionTVPackageNastroiKino && selection[1] ) {
if ( index == 5 && selection[index] && optionTVPackageIndex == 2 && selection[1] ) {
// skip
print("nastroi kino - true")
}
......@@ -281,6 +282,14 @@ extension ServiceVIPTableViewController {
// skip
print("russian phone - true")
}
else if ( index == 8 && selection[index] && selection[1] && optionTVPackageIndex == 1 ) {
// skip
print("hd base")
}
else if ( index == 9 && selection[index] && selection[1] && optionTVPackageIndex == 0 ) {
// skip
print("id tv online")
}
else if ( selection[4] && 5 <= index && index <= 9 && (selection[5] || selection[6] || selection[7] || selection[8] || selection[9] )) {
// if vip max is selected, then skip additionals
print("vip max - true")
......@@ -352,11 +361,16 @@ extension ServiceVIPTableViewController {
updateTotal()
}
func setBoolOptionTVPackageNastroiKino(bool: Bool) {
optionTVPackageNastroiKino = bool
func setOptionTVPackage(index: Int) {
optionTVPackageIndex = index
updateTotal()
}
// func setBoolOptionTVPackageNastroiKino(bool: Bool) {
// optionTVPackageNastroiKino = bool
// updateTotal()
// }
func decrementAmount(index: Int) {
amounts[index] = amounts[index] - 1
}
......
kt/ViewControllers/WiFi/WiFiTableViewController.swift
......@@ -92,6 +92,7 @@ extension WiFiTableViewController: UITableViewDataSource {
}
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
print(indexPath.row)
let cell = tableView.dequeueReusableCellWithIdentifier(cellIdentifier, forIndexPath: indexPath) as UITableViewCell
cell.textLabel?.text = wifiPoints?[indexPath.row].title
// cell.titleLabel.text = wifiPoints?[indexPath.row].title
......
kt/Views/VIPTVCell.swift
......@@ -52,11 +52,14 @@ class VIPTVCell : UITableViewCell {
func radioButtonClick(sender: DLRadioButton) {
if ( sender == optionButton1 ) {
vc.setBoolOptionTVPackageNastroiKino(false)
vc.setOptionTVPackage(0)
// vc.setBoolOptionTVPackageNastroiKino(false)
} else if ( sender == optionButton2 ) {
vc.setBoolOptionTVPackageNastroiKino(false)
vc.setOptionTVPackage(1)
// vc.setBoolOptionTVPackageNastroiKino(false)
} else if ( sender == optionButton3 ) {
vc.setBoolOptionTVPackageNastroiKino(true)
vc.setOptionTVPackage(2)
// vc.setBoolOptionTVPackageNastroiKino(true)
}
}
......
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