Skip to content

K
kt-ios
Commit bf925785 by Olzhas Aldabergenov
Options

fixing chat screen. simplified service view

parent aa50502f
Showing with 170 additions and 143 deletions
kt.xcodeproj/project.pbxproj
......@@ -83,7 +83,6 @@
3E197E611F44454A000BC88D /* FeedPackagesXIBView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E197E601F44454A000BC88D /* FeedPackagesXIBView.swift */; };
3E197E651F4563BB000BC88D /* FeedCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E197E641F4563BB000BC88D /* FeedCollectionViewCell.swift */; };
3E197E781F4D2C87000BC88D /* MainHelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E197E771F4D2C87000BC88D /* MainHelpViewController.swift */; };
3E1D32241F9F54CA00373ADA /* XCGLogger.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 984CED471D7F0AC20096B2BF /* XCGLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3E2C3E8E1EFA482D00E553CD /* GetCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E2C3E8D1EFA482D00E553CD /* GetCodeViewController.swift */; };
3E2C3E9B1EFCB17E00E553CD /* Validator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E2C3E9A1EFCB17E00E553CD /* Validator.swift */; };
3E2E1E821F84DB0100DC0FE5 /* LKSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E2E1E811F84DB0100DC0FE5 /* LKSettingsViewController.swift */; };
......@@ -526,16 +525,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
3E1D32221F9F546700373ADA /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
3E1D32241F9F54CA00373ADA /* XCGLogger.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
984CED8A1D7F15B80096B2BF /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
......@@ -2317,7 +2306,6 @@
984CED8A1D7F15B80096B2BF /* Embed Frameworks */,
50FC3F9466E4A5C981E595DE /* [CP] Embed Pods Frameworks */,
EEFCC45EB3F16D936889FAAA /* [CP] Copy Pods Resources */,
3E1D32221F9F546700373ADA /* CopyFiles */,
);
buildRules = (
);
......
kt.xcworkspace/xcuserdata/neox.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -90,11 +90,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530690727.240538"
timestampString = "530792686.165663"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "601"
endingLineNumber = "601"
startingLineNumber = "595"
endingLineNumber = "595"
landmarkName = "applicationWillResignActive()"
landmarkType = "7">
</BreakpointContent>
......@@ -106,11 +106,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530690727.240538"
timestampString = "530792686.165663"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "601"
endingLineNumber = "601"
startingLineNumber = "595"
endingLineNumber = "595"
landmarkName = "applicationWillResignActive()"
landmarkType = "7">
</BreakpointContent>
......@@ -122,11 +122,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530690727.240538"
timestampString = "530792686.165663"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "571"
endingLineNumber = "571"
startingLineNumber = "565"
endingLineNumber = "565"
landmarkName = "showHelpAlert()"
landmarkType = "7">
</BreakpointContent>
......@@ -138,11 +138,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Cabinet/Login/LoginViewController.swift"
timestampString = "530690727.240538"
timestampString = "530792686.165663"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "576"
endingLineNumber = "576"
startingLineNumber = "570"
endingLineNumber = "570"
landmarkName = "showHelpAlert()"
landmarkType = "7">
</BreakpointContent>
......@@ -186,11 +186,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceItemScrollViewController.swift"
timestampString = "530712033.421239"
timestampString = "530767730.950769"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "280"
endingLineNumber = "280"
startingLineNumber = "287"
endingLineNumber = "287"
landmarkName = "prepareForSegue(segue:sender:)"
landmarkType = "7">
</BreakpointContent>
......@@ -198,22 +198,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "kt/ViewControllers/Service/ServiceItemScrollViewController.swift"
timestampString = "530713210.852928"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "286"
endingLineNumber = "286"
landmarkName = "prepareForSegue(_:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
......
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="79"/>
<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">
......@@ -1151,7 +1151,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="166"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ym-kb-mRZ" id="FGA-mi-AGb">
<frame key="frameInset" width="375" height="165.5"/>
<frame key="frameInset" width="375" height="165"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Моя семья" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QCj-NY-AqY">
......@@ -1286,7 +1286,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OZp-jL-1bb" id="L76-f9-HLK">
<frame key="frameInset" width="375" height="59.5"/>
<frame key="frameInset" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Адрес электронной почты" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OpU-aT-0as">
......@@ -1427,7 +1427,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SQN-x5-07i" id="zUj-fk-hK8">
<frame key="frameInset" width="414" height="43.5"/>
<frame key="frameInset" width="414" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZu-i5-IkV">
......@@ -1951,7 +1951,7 @@
<rect key="frame" x="0.0" y="65" width="375" height="217"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BcJ-QN-cZr" id="2oa-Tb-KB1">
<frame key="frameInset" width="375" height="216.5"/>
<frame key="frameInset" width="375" height="216"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KRa-O0-3cA">
......@@ -2050,7 +2050,7 @@
<rect key="frame" x="0.0" y="282" width="375" height="359"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ASd-vV-7ps" id="rQ0-MH-iGO">
<frame key="frameInset" width="375" height="358.5"/>
<frame key="frameInset" width="375" height="358"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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="tHw-4T-nXe">
......@@ -2079,7 +2079,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="top" reuseIdentifier="cell" id="52o-7e-ad7" customClass="FeedCollectionViewCell" customModule="telecom" customModuleProvider="target">
<rect key="frame" x="0.0" y="9.5" width="300" height="300"/>
<rect key="frame" x="0.0" y="10" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -2173,7 +2173,7 @@
<rect key="frame" x="0.0" y="641" width="375" height="191"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="Xc9-jj-Bd1" id="sZn-nh-awp">
<frame key="frameInset" width="375" height="190.5"/>
<frame key="frameInset" width="375" height="190"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3YG-o0-ctD">
......@@ -2330,7 +2330,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="99"/>
<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">
......@@ -2363,7 +2363,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="99"/>
<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">
......@@ -2396,7 +2396,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="99"/>
<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">
......@@ -2515,7 +2515,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="99"/>
<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">
......@@ -2551,7 +2551,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="89"/>
<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">
......@@ -2677,7 +2677,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vmx-Ap-Zh9" id="q1X-yY-KQg">
<frame key="frameInset" width="600" height="199.5"/>
<frame key="frameInset" width="600" height="199"/>
<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="7HI-0O-Glg">
......@@ -2885,7 +2885,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LJW-S3-YEb" id="jCx-Gc-Dvb">
<frame key="frameInset" width="375" height="129.5"/>
<frame key="frameInset" width="375" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZCR-YT-3OG">
......@@ -3060,7 +3060,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="49"/>
<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">
......@@ -3145,7 +3145,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="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R6G-yX-gQ1">
......@@ -3188,7 +3188,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="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Gy-0e-uKm">
......@@ -3291,6 +3291,7 @@
<outlet property="circleButton" destination="L4n-Lz-hxG" id="QXP-yg-jD6"/>
<outlet property="messageField" destination="1mT-0l-OAh" id="az8-hS-XqP"/>
<outlet property="tableView" destination="vb8-oV-1DK" id="WGN-jL-Pma"/>
<outlet property="textFieldConstraint" destination="9LO-S1-iWg" id="ogD-xc-x6I"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5Kr-RI-PNE" userLabel="First Responder" sceneMemberID="firstResponder"/>
......@@ -3444,7 +3445,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dpj-6y-3dR" id="0Im-f5-utg">
<frame key="frameInset" width="375" height="43.5"/>
<frame key="frameInset" width="375" height="43"/>
<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="H8t-l8-IAE">
......@@ -3542,7 +3543,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="249"/>
<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">
......@@ -3705,7 +3706,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="119"/>
<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">
......@@ -3783,7 +3784,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="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqi-tN-QfC">
......@@ -4209,7 +4210,7 @@
<rect key="frame" x="0.0" y="28" width="343" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="QBg-MG-ZSv" id="k1Z-FH-KYY">
<frame key="frameInset" width="343" height="119.5"/>
<frame key="frameInset" width="343" height="119"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gsf-cj-W08">
......@@ -4264,7 +4265,7 @@
<rect key="frame" x="0.0" y="148" width="343" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Y26-HA-gXR" id="0Nu-EG-OVX">
<frame key="frameInset" width="343" height="149.5"/>
<frame key="frameInset" width="343" height="149"/>
<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="qQr-2d-DLG">
......@@ -4379,7 +4380,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="87"/>
<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">
......@@ -4632,7 +4633,7 @@
<rect key="frame" x="0.0" y="92" width="561" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C3b-7f-Eis" id="1Ya-7Y-Yhe">
<frame key="frameInset" width="561" height="59.5"/>
<frame key="frameInset" width="561" height="59"/>
<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="UPt-cT-j6J">
......@@ -4914,7 +4915,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="86"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OPV-kp-TRp" id="lZf-5Q-tHg">
<frame key="frameInset" width="342" height="85.5"/>
<frame key="frameInset" width="342" height="85"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2016.04.28" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gy0-2L-s6L">
......@@ -5006,7 +5007,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LRy-H4-FPr" id="cfQ-IR-xSw">
<frame key="frameInset" width="600" height="149.5"/>
<frame key="frameInset" width="600" height="149"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Label" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RR7-9R-Oij">
......@@ -5115,7 +5116,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="59"/>
<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">
......@@ -5290,7 +5291,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="Rb4-5J-Gyf" id="ZeQ-bB-7Os">
<frame key="frameInset" width="375" height="279.5"/>
<frame key="frameInset" width="375" height="279"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqz-Ow-Dsp">
......@@ -5489,7 +5490,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="279"/>
<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">
......@@ -5769,7 +5770,7 @@
<rect key="frame" x="0.0" y="92" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="llT-GK-2t1" id="u5C-DY-lHG">
<frame key="frameInset" width="375" height="54.5"/>
<frame key="frameInset" width="375" height="54"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GFE-wX-oVv">
......@@ -5854,7 +5855,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="310"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" autoresizesSubviews="NO" opaque="NO" multipleTouchEnabled="YES" contentMode="top" tableViewCell="dVD-RI-2Ub" id="bi1-TT-A70">
<frame key="frameInset" width="375" height="309.5"/>
<frame key="frameInset" width="375" height="309"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="serviceslist_pack_icon" translatesAutoresizingMaskIntoConstraints="NO" id="k82-E5-QhZ" userLabel="IconView"/>
......@@ -6012,7 +6013,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zt9-cG-Yl5" id="DrX-x9-F77">
<frame key="frameInset" width="375" height="49.5"/>
<frame key="frameInset" width="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="218-f5-tfr">
......@@ -6036,7 +6037,7 @@
<rect key="frame" x="0.0" y="78" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RZk-Cn-MFo" id="wOZ-AU-13f">
<frame key="frameInset" width="375" height="43.5"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3tn-5k-gUY">
......@@ -6060,7 +6061,7 @@
<rect key="frame" x="0.0" y="122" width="375" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vs5-Ob-TlT" id="9ey-Nw-64d">
<frame key="frameInset" width="375" height="219.5"/>
<frame key="frameInset" width="375" height="219"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BwK-LW-CFm">
......@@ -6085,7 +6086,7 @@
<rect key="frame" x="0.0" y="342" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FRY-cY-ADr" id="1KT-MC-Bpm">
<frame key="frameInset" width="375" height="49.5"/>
<frame key="frameInset" width="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MVS-Kx-4bd">
......@@ -6109,7 +6110,7 @@
<rect key="frame" x="0.0" y="392" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7wd-hi-8fO" id="oU0-Z4-eSi">
<frame key="frameInset" width="375" height="299.5"/>
<frame key="frameInset" width="375" height="299"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
......@@ -6117,7 +6118,7 @@
<rect key="frame" x="0.0" y="692" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9FQ-n3-0sl" id="PfR-Ku-Vrv">
<frame key="frameInset" width="342" height="49.5"/>
<frame key="frameInset" width="342" height="49"/>
<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="X7F-0L-o2F">
......@@ -6181,12 +6182,26 @@
<view key="view" contentMode="scaleToFill" id="5Ro-BC-XpV">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wPf-FY-8GD">
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</webView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="wPf-FY-8GD" firstAttribute="leading" secondItem="5Ro-BC-XpV" secondAttribute="leading" id="eXl-fx-v4p"/>
<constraint firstItem="wPf-FY-8GD" firstAttribute="top" secondItem="5Ro-BC-XpV" secondAttribute="top" id="jwT-Vt-H8N"/>
<constraint firstItem="XHP-Bc-A7K" firstAttribute="top" secondItem="wPf-FY-8GD" secondAttribute="bottom" id="ltC-up-sqq"/>
<constraint firstAttribute="trailing" secondItem="wPf-FY-8GD" secondAttribute="trailing" id="wR2-Wr-ECQ"/>
</constraints>
</view>
<connections>
<outlet property="webView" destination="wPf-FY-8GD" id="ELj-65-wme"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nqt-aH-lRT" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5476" y="2355"/>
<point key="canvasLocation" x="5476" y="2355.472263868066"/>
</scene>
<!--Service Item Content Controller-->
<scene sceneID="Aa7-gu-cLI">
......@@ -6207,7 +6222,7 @@
<rect key="frame" x="0.0" y="22" width="600" height="280"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sme-g8-b76" id="mkR-0y-Fxz">
<frame key="frameInset" width="600" height="279.5"/>
<frame key="frameInset" width="600" height="279"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mbo-dN-7Ay">
......@@ -6240,7 +6255,7 @@
<rect key="frame" x="0.0" y="302" width="600" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yAb-Q7-Kgf" id="TyR-W9-p8U">
<frame key="frameInset" width="600" height="299.5"/>
<frame key="frameInset" width="600" height="299"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2CW-2A-uJk">
......@@ -6267,7 +6282,7 @@
<rect key="frame" x="0.0" y="602" width="600" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BZ8-y6-3dG" id="qDf-NC-bQj">
<frame key="frameInset" width="600" height="49.5"/>
<frame key="frameInset" width="600" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D5P-jR-FA5">
......@@ -6291,7 +6306,7 @@
<rect key="frame" x="0.0" y="652" width="600" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pl5-ab-ksy" id="wpC-l4-c5Q">
<frame key="frameInset" width="567" height="49.5"/>
<frame key="frameInset" width="567" height="49"/>
<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="vxM-1Z-au1">
......@@ -6567,14 +6582,14 @@
<color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="RegionCell" textLabel="7xj-02-2Dw" style="IBUITableViewCellStyleDefault" id="uew-Fr-Rr7">
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uew-Fr-Rr7" id="O5X-gF-b9W">
<frame key="frameInset" width="375" height="43.5"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7xj-02-2Dw">
<frame key="frameInset" minX="15" width="345" height="43.5"/>
<frame key="frameInset" minX="15" width="345" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -6613,11 +6628,11 @@
<rect key="frame" x="0.0" y="92" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6jH-Cy-sfi" id="x81-dt-Ins">
<frame key="frameInset" width="375" height="43.5"/>
<frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7fb-gt-KO6">
<frame key="frameInset" minX="15" width="345" height="43.5"/>
<frame key="frameInset" minX="15" width="345" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -6705,7 +6720,7 @@
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RFo-Gl-pY8" id="ySy-UG-sdV">
<frame key="frameInset" width="567" height="43.5"/>
<frame key="frameInset" width="567" height="43"/>
<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="bRq-oO-kGg">
......@@ -7026,18 +7041,18 @@
<rect key="frame" x="0.0" y="22" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3uf-i1-R9a" id="AU1-gz-qFB">
<frame key="frameInset" width="600" height="59.5"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C2u-iO-UCj">
<frame key="frameInset" minX="15" minY="10" width="34" height="22"/>
<frame key="frameInset" minX="15" minY="9" width="34" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Bold" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bVU-gq-8l0">
<frame key="frameInset" minX="15" minY="32" width="47" height="18.5"/>
<frame key="frameInset" minX="15" minY="31" width="47" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="14"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -7885,18 +7900,18 @@
<rect key="frame" x="0.0" y="22" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3pk-oN-VCk" id="9dl-5H-NYx">
<frame key="frameInset" width="600" height="59.5"/>
<frame key="frameInset" width="600" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f3l-ZK-I4R">
<frame key="frameInset" minX="15" minY="10" width="34" height="22"/>
<frame key="frameInset" minX="15" minY="9" width="34" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Bold" family="PT Sans" pointSize="17"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="agj-0P-9r3">
<frame key="frameInset" minX="15" minY="32" width="47" height="18.5"/>
<frame key="frameInset" minX="15" minY="31" width="47" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="14"/>
<color key="textColor" red="0.15793392062187195" green="0.20146258175373077" blue="0.23560458421707153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -8503,7 +8518,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="59"/>
<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">
......@@ -9352,7 +9367,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P1m-QL-zI0" id="SRv-UP-BuJ">
<frame key="frameInset" width="600" height="59.5"/>
<frame key="frameInset" width="600" height="59"/>
<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="Xji-cJ-5wS">
......@@ -9416,7 +9431,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yNp-lb-Hs5" id="zHX-IS-W9f">
<frame key="frameInset" width="600" height="59.5"/>
<frame key="frameInset" width="600" height="59"/>
<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="hFm-cX-B99">
......@@ -9480,7 +9495,7 @@
<rect key="frame" x="0.0" y="92" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2XE-UQ-ssK" id="Vja-gC-n47">
<frame key="frameInset" width="600" height="59.5"/>
<frame key="frameInset" width="600" height="59"/>
<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="q3b-6m-kNL">
......@@ -9581,11 +9596,11 @@
<rect key="frame" x="0.0" y="22" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6L0-sG-Xwx" id="5Yj-w5-ur4">
<frame key="frameInset" width="567" height="42.5"/>
<frame key="frameInset" width="567" height="42"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="iD TV базовый" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8Rb-D8-nW6">
<frame key="frameInset" minX="15" width="550" height="42.5"/>
<frame key="frameInset" minX="15" width="550" height="42"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PTSans-Regular" family="PT Sans" pointSize="15"/>
<color key="textColor" red="0.17968405779999999" green="0.20799672599999999" blue="0.23909254369999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -9669,7 +9684,7 @@
<rect key="frame" x="0.0" y="28" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I3L-fo-wiq" id="nqP-bD-zze">
<frame key="frameInset" width="414" height="49.5"/>
<frame key="frameInset" width="414" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="iD TV — Гибкое телевидение для тех, кто не любит себя ограничивать!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P43-2z-q46">
......@@ -9693,7 +9708,7 @@
<rect key="frame" x="0.0" y="78" width="414" height="220"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="hgB-UO-dTb" id="fDS-Jh-C4K">
<frame key="frameInset" width="414" height="219.5"/>
<frame key="frameInset" width="414" height="219"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Me-Gr-PsO">
......@@ -9718,7 +9733,7 @@
<rect key="frame" x="0.0" y="298" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qMR-Sz-bKt" id="xds-Ec-KOg">
<frame key="frameInset" width="414" height="49.5"/>
<frame key="frameInset" width="414" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Тарифы" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SGH-Ci-igu">
......@@ -9742,7 +9757,7 @@
<rect key="frame" x="0.0" y="348" width="414" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fLM-2t-NeZ" id="NAb-k8-kqd">
<frame key="frameInset" width="414" height="299.5"/>
<frame key="frameInset" width="414" height="299"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snr-GA-iQi">
......@@ -9770,7 +9785,7 @@
<rect key="frame" x="0.0" y="648" width="414" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="etf-If-U77" id="1fa-q0-1X7">
<frame key="frameInset" width="381" height="49.5"/>
<frame key="frameInset" width="381" height="49"/>
<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="7OQ-OS-2TQ">
......@@ -10205,7 +10220,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="53"/>
<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">
......@@ -10318,7 +10333,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="79"/>
<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">
......@@ -10384,7 +10399,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="99"/>
<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
......@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>57</string>
<string>58</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
kt/ViewControllers/BotViewController.swift
......@@ -14,6 +14,8 @@ class BotViewController: UIViewController {
@IBOutlet weak var tableView: UITableView!
@IBOutlet weak var circleButton: UIView!
@IBOutlet weak var textFieldConstraint: NSLayoutConstraint!
weak var activeField: UITextField?
var messagesList : [BotResult] = []
......@@ -28,20 +30,46 @@ class BotViewController: UIViewController {
let tap = UITapGestureRecognizer(target: self, action: #selector(BotViewController.sendButtonTap))
self.circleButton.userInteractionEnabled = true
self.circleButton.addGestureRecognizer(tap)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(BotViewController.keyboardWillShow(_:)), name: UIKeyboardWillShowNotification, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(BotViewController.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil)
addMessage("Здравствуйте! Я Ваш помощник на сайте Казахтелеком. Постараюсь ответить на большинство Ваших вопросов.", type: 0)
}
func keyboardWillShow(notification: NSNotification) {
if let keyboardSize = (notification.userInfo?[UIKeyboardFrameBeginUserInfoKey] as? NSValue)?.CGRectValue() {
self.view.frame.origin.y -= keyboardSize.height
}
}
func keyboardWillHide(notification: NSNotification) {
if let keyboardSize = (notification.userInfo?[UIKeyboardFrameBeginUserInfoKey] as? NSValue)?.CGRectValue() {
self.view.frame.origin.y += keyboardSize.height
NSNotificationCenter.defaultCenter().addObserver(self,
selector: #selector(self.keyboardNotification(_:)),
name: UIKeyboardWillChangeFrameNotification,
object: nil)
initializeTap()
}
func initializeTap() {
let tap: UITapGestureRecognizer = UITapGestureRecognizer(
target: self,
action: #selector(dismissKeyboard))
view.addGestureRecognizer(tap)
}
func dismissKeyboard() {
view.endEditing(true)
}
func keyboardNotification(notification: NSNotification) {
if let userInfo = notification.userInfo {
let endFrame = (userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue)?.CGRectValue()
let duration:NSTimeInterval = (userInfo[UIKeyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue ?? 0
let animationCurveRawNSN = userInfo[UIKeyboardAnimationCurveUserInfoKey] as? NSNumber
let animationCurveRaw = animationCurveRawNSN?.unsignedLongValue ?? UIViewAnimationOptions.CurveEaseInOut.rawValue
let animationCurve:UIViewAnimationOptions = UIViewAnimationOptions(rawValue: animationCurveRaw)
if endFrame?.origin.y >= UIScreen.mainScreen().bounds.size.height {
self.textFieldConstraint?.constant = 0.0
} else {
self.textFieldConstraint?.constant = endFrame?.size.height ?? 0.0
}
UIView.animateWithDuration(duration,
delay: NSTimeInterval(0),
options: animationCurve,
animations: { self.view.layoutIfNeeded() },
completion: nil)
}
}
......@@ -132,20 +160,26 @@ class BotViewController: UIViewController {
if messageField.text?.characters.count == 0 {
return
}
addMessage(messageField.text!, type: 1)
Facade.sharedInstance().askBot(messageField.text!, onSuccess: { (botResult) in
let messageStr = messageField.text!
self.messageField.text = ""
addMessage(messageStr, type: 1)
self.tableView.scrollToBottom(true)
Facade.sharedInstance().askBot(messageStr, onSuccess: { (botResult) in
if botResult.count != 0 {
self.messagesList.append(botResult)
self.tableView.reloadData()
} else {
self.addMessage("Извините, по вашему запросу ничего не нашлось", type: 0)
}
self.messageField.text = ""
self.view.endEditing(true)
self.tableView.scrollToBottom(true)
}) { (error) in
AlertViewUtil.showErrorAlert(error, vc: self)
}
//dismissKeyboard()
}
}
......
kt/ViewControllers/Cabinet/Login/LoginViewController.swift
......@@ -37,13 +37,7 @@ class LoginViewController: ScrolledViewController, UIViewControllerTransitioning
}
private func registerObservers() {
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(BotViewController.keyboardWillShow(_:)),
name: UIKeyboardWillShowNotification, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(BotViewController.keyboardWillHide(_:)),
name: UIKeyboardWillHideNotification, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(LoginViewController.updateUserInfoSuccess(_:)),
name: Facade.AbonentInfoNotificationNames.Success, object: nil)
......
kt/ViewControllers/Service/ServiceDetailsViewController.swift
......@@ -10,4 +10,11 @@ import Foundation
class ServiceDetailsViewController: UIViewController {
@IBOutlet weak var webView: UIWebView!
var htmlToLoad = ""
override func viewDidLoad() {
super.viewDidLoad()
webView.loadHTMLString(htmlToLoad, baseURL: nil)
}
}
kt/ViewControllers/Service/ServiceItemScrollViewController.swift
......@@ -38,6 +38,7 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
var webViewHeight: NSLayoutConstraint!
@IBOutlet weak var webViewWrapperView: UIView!
var heightForRow: [Int: CGFloat] = [Int: CGFloat]()
var htmlToLoad : String?
@IBAction func connectButton(sender: AnyObject) {
......@@ -210,6 +211,9 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
self.containerHeightConstrant.constant = 80
}
self.htmlToLoad = self.observeHtml(respServiceItem.html)
self.webView.loadHTMLString(self.observeHtml(respServiceItem.html), baseURL: nil)
// let delay = 1 * Double(NSEC_PER_SEC)
......@@ -267,9 +271,6 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
vc.title = LS("service.connect")
}
break
case Segue.ShowServiceDetails:
print ("open service details")
break
default:
break
}
......@@ -280,7 +281,7 @@ class ServiceItemScrollViewController: UIViewController, UITableViewDataSource,
vc.serviceItem = serviceItemForLoading
} else if ( segue.identifier == Segue.ShowServiceDetails) {
let vc = segue.destinationViewController as! ServiceDetailsViewController
vc.htmlToLoad = self.htmlToLoad!
} else {
let vc = segue.destinationViewController as! ServiceCallbackController
vc.serviceItem = serviceItemForLoading
......
kt/Views/ServiceCell.swift
......@@ -27,7 +27,11 @@ class ServiceCell: UITableViewCell {
if ( servicesItem.imageUrl != nil ) {
ImageLoader.sharedLoader.imageForUrl(servicesItem.imageUrl!) { (image, url) in
self.backgroundImage.image = image?.imageWithRenderingMode(.AlwaysOriginal)
if ( image != nil ) {
self.backgroundImage.image = image?.imageWithRenderingMode(.AlwaysOriginal)
} else {
self.backgroundImage.backgroundColor = UIColor.lightGrayColor()
}
}
self.iconView.alpha = 0.0
self.nameLabel.textColor = UIColor.blackColor()
......
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