Showing
4 changed files
with
9 additions
and
15 deletions
No preview for this file type
| ... | @@ -4,7 +4,6 @@ | ... | @@ -4,7 +4,6 @@ |
| 4 | <dependencies> | 4 | <dependencies> |
| 5 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/> | 5 | <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/> |
| 6 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> | 6 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 7 | - <capability name="System colors in document resources" minToolsVersion="11.0"/> | ||
| 8 | <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | 7 | <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 9 | </dependencies> | 8 | </dependencies> |
| 10 | <objects> | 9 | <objects> |
| ... | @@ -13,7 +12,7 @@ | ... | @@ -13,7 +12,7 @@ |
| 13 | <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MyRewardsBannerOffersScrollTableViewCell" rowHeight="119" id="KGk-i7-Jjw" customClass="MyRewardsBannerOffersScrollTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> | 12 | <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MyRewardsBannerOffersScrollTableViewCell" rowHeight="119" id="KGk-i7-Jjw" customClass="MyRewardsBannerOffersScrollTableViewCell" customModule="SwiftWarplyFramework" customModuleProvider="target"> |
| 14 | <rect key="frame" x="0.0" y="0.0" width="388" height="119"/> | 13 | <rect key="frame" x="0.0" y="0.0" width="388" height="119"/> |
| 15 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 14 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 16 | - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> | 15 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> |
| 17 | <rect key="frame" x="0.0" y="0.0" width="388" height="119"/> | 16 | <rect key="frame" x="0.0" y="0.0" width="388" height="119"/> |
| 18 | <autoresizingMask key="autoresizingMask"/> | 17 | <autoresizingMask key="autoresizingMask"/> |
| 19 | <subviews> | 18 | <subviews> |
| ... | @@ -24,7 +23,7 @@ | ... | @@ -24,7 +23,7 @@ |
| 24 | <rect key="frame" x="24" y="36" width="340" height="43"/> | 23 | <rect key="frame" x="24" y="36" width="340" height="43"/> |
| 25 | <subviews> | 24 | <subviews> |
| 26 | <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h09-MS-XKy"> | 25 | <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h09-MS-XKy"> |
| 27 | - <rect key="frame" x="128.33333333333334" y="8.6666666666666643" width="58" height="26"/> | 26 | + <rect key="frame" x="0.0" y="8.6666666666666643" width="58" height="26"/> |
| 28 | <subviews> | 27 | <subviews> |
| 29 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Green" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4m7-JY-MDY"> | 28 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Green" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4m7-JY-MDY"> |
| 30 | <rect key="frame" x="6" y="3" width="46" height="20"/> | 29 | <rect key="frame" x="6" y="3" width="46" height="20"/> |
| ... | @@ -43,10 +42,10 @@ | ... | @@ -43,10 +42,10 @@ |
| 43 | </constraints> | 42 | </constraints> |
| 44 | </view> | 43 | </view> |
| 45 | <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H5g-xq-68p"> | 44 | <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H5g-xq-68p"> |
| 46 | - <rect key="frame" x="194.33333333333337" y="8.6666666666666643" width="61.666666666666629" height="26"/> | 45 | + <rect key="frame" x="66" y="8.6666666666666643" width="61.666666666666657" height="26"/> |
| 47 | <subviews> | 46 | <subviews> |
| 48 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Family" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WN9-wM-hV8"> | 47 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Family" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WN9-wM-hV8"> |
| 49 | - <rect key="frame" x="5.9999999999999716" y="3" width="49.666666666666664" height="20"/> | 48 | + <rect key="frame" x="6" y="3" width="49.666666666666664" height="20"/> |
| 50 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 49 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 51 | <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> | 50 | <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/> |
| 52 | <nil key="textColor"/> | 51 | <nil key="textColor"/> |
| ... | @@ -73,7 +72,7 @@ | ... | @@ -73,7 +72,7 @@ |
| 73 | </constraints> | 72 | </constraints> |
| 74 | </imageView> | 73 | </imageView> |
| 75 | </subviews> | 74 | </subviews> |
| 76 | - <color key="backgroundColor" systemColor="systemBackgroundColor"/> | 75 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 77 | <constraints> | 76 | <constraints> |
| 78 | <constraint firstItem="fZO-NB-UyL" firstAttribute="leading" secondItem="5cf-tr-Vjf" secondAttribute="leading" id="Bfw-5S-wqz"/> | 77 | <constraint firstItem="fZO-NB-UyL" firstAttribute="leading" secondItem="5cf-tr-Vjf" secondAttribute="leading" id="Bfw-5S-wqz"/> |
| 79 | <constraint firstItem="fZO-NB-UyL" firstAttribute="top" secondItem="5cf-tr-Vjf" secondAttribute="top" id="WCt-TJ-XQc"/> | 78 | <constraint firstItem="fZO-NB-UyL" firstAttribute="top" secondItem="5cf-tr-Vjf" secondAttribute="top" id="WCt-TJ-XQc"/> |
| ... | @@ -85,6 +84,7 @@ | ... | @@ -85,6 +84,7 @@ |
| 85 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 84 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 86 | <constraints> | 85 | <constraints> |
| 87 | <constraint firstItem="5cf-tr-Vjf" firstAttribute="top" secondItem="JTs-J5-DO2" secondAttribute="top" id="GGh-C1-OfA"/> | 86 | <constraint firstItem="5cf-tr-Vjf" firstAttribute="top" secondItem="JTs-J5-DO2" secondAttribute="top" id="GGh-C1-OfA"/> |
| 87 | + <constraint firstItem="h09-MS-XKy" firstAttribute="leading" secondItem="JTs-J5-DO2" secondAttribute="leading" id="HNw-gn-pHJ"/> | ||
| 88 | <constraint firstItem="H5g-xq-68p" firstAttribute="centerY" secondItem="JTs-J5-DO2" secondAttribute="centerY" id="Lwo-5b-tgm"/> | 88 | <constraint firstItem="H5g-xq-68p" firstAttribute="centerY" secondItem="JTs-J5-DO2" secondAttribute="centerY" id="Lwo-5b-tgm"/> |
| 89 | <constraint firstAttribute="trailing" secondItem="5cf-tr-Vjf" secondAttribute="trailing" id="PBw-4p-3qC"/> | 89 | <constraint firstAttribute="trailing" secondItem="5cf-tr-Vjf" secondAttribute="trailing" id="PBw-4p-3qC"/> |
| 90 | <constraint firstItem="5cf-tr-Vjf" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="H5g-xq-68p" secondAttribute="trailing" constant="8" id="Wot-lB-jmI"/> | 90 | <constraint firstItem="5cf-tr-Vjf" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="H5g-xq-68p" secondAttribute="trailing" constant="8" id="Wot-lB-jmI"/> |
| ... | @@ -122,9 +122,4 @@ | ... | @@ -122,9 +122,4 @@ |
| 122 | <point key="canvasLocation" x="53.435114503816791" y="14.43661971830986"/> | 122 | <point key="canvasLocation" x="53.435114503816791" y="14.43661971830986"/> |
| 123 | </tableViewCell> | 123 | </tableViewCell> |
| 124 | </objects> | 124 | </objects> |
| 125 | - <resources> | ||
| 126 | - <systemColor name="systemBackgroundColor"> | ||
| 127 | - <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 128 | - </systemColor> | ||
| 129 | - </resources> | ||
| 130 | </document> | 125 | </document> | ... | ... |
| ... | @@ -303,8 +303,8 @@ struct OfferModel { | ... | @@ -303,8 +303,8 @@ struct OfferModel { |
| 303 | super.viewDidLoad() | 303 | super.viewDidLoad() |
| 304 | 304 | ||
| 305 | // Register XIBs for table view cells | 305 | // Register XIBs for table view cells |
| 306 | - tableView.register(UINib(nibName: "MyRewardsBannerOffersScrollTableViewCell", bundle: Bundle(for: MyEmptyClass.self)), forCellReuseIdentifier: "BannerCell") | 306 | + tableView.register(UINib(nibName: "MyRewardsBannerOffersScrollTableViewCell", bundle: Bundle(for: MyEmptyClass.self)), forCellReuseIdentifier: "MyRewardsBannerOffersScrollTableViewCell") |
| 307 | - tableView.register(UINib(nibName: "MyRewardsOffersScrollTableViewCell", bundle: Bundle(for: MyEmptyClass.self)), forCellReuseIdentifier: "OffersCell") | 307 | + tableView.register(UINib(nibName: "MyRewardsOffersScrollTableViewCell", bundle: Bundle(for: MyEmptyClass.self)), forCellReuseIdentifier: "MyRewardsOffersScrollTableViewCell") |
| 308 | 308 | ||
| 309 | // Set up table view | 309 | // Set up table view |
| 310 | tableView.delegate = self | 310 | tableView.delegate = self |
| ... | @@ -430,7 +430,6 @@ extension MyRewardsViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -430,7 +430,6 @@ extension MyRewardsViewController: UITableViewDelegate, UITableViewDataSource{ |
| 430 | public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | 430 | public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { |
| 431 | if (indexPath.section == 0) { | 431 | if (indexPath.section == 0) { |
| 432 | let cell = tableView.dequeueReusableCell(withIdentifier: "MyRewardsBannerOffersScrollTableViewCell", for: indexPath) as! MyRewardsBannerOffersScrollTableViewCell | 432 | let cell = tableView.dequeueReusableCell(withIdentifier: "MyRewardsBannerOffersScrollTableViewCell", for: indexPath) as! MyRewardsBannerOffersScrollTableViewCell |
| 433 | - let smCount = 1 | ||
| 434 | cell.configureCell(data: self.bannerOffersSection) | 433 | cell.configureCell(data: self.bannerOffersSection) |
| 435 | // cell.parent = self | 434 | // cell.parent = self |
| 436 | return cell | 435 | return cell | ... | ... |
| ... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
| 22 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="scR-yg-okd" userLabel="Main View"> | 22 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="scR-yg-okd" userLabel="Main View"> |
| 23 | <rect key="frame" x="0.0" y="59" width="393" height="793"/> | 23 | <rect key="frame" x="0.0" y="59" width="393" height="793"/> |
| 24 | <subviews> | 24 | <subviews> |
| 25 | - <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" estimatedSectionFooterHeight="-1" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2it-5M-CR6"> | 25 | + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" estimatedSectionHeaderHeight="-1" sectionFooterHeight="28" estimatedSectionFooterHeight="-1" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2it-5M-CR6"> |
| 26 | <rect key="frame" x="0.0" y="0.0" width="393" height="793"/> | 26 | <rect key="frame" x="0.0" y="0.0" width="393" height="793"/> |
| 27 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 27 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 28 | <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 28 | <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ... | ... |
-
Please register or login to post a comment