Showing
6 changed files
with
15 additions
and
15 deletions
| ... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
| 7 | <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> | 7 | <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> |
| 8 | <dict> | 8 | <dict> |
| 9 | <key>orderHint</key> | 9 | <key>orderHint</key> |
| 10 | - <integer>0</integer> | 10 | + <integer>1</integer> |
| 11 | </dict> | 11 | </dict> |
| 12 | </dict> | 12 | </dict> |
| 13 | </dict> | 13 | </dict> | ... | ... |
| ... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
| 7 | <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> | 7 | <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> |
| 8 | <dict> | 8 | <dict> |
| 9 | <key>orderHint</key> | 9 | <key>orderHint</key> |
| 10 | - <integer>1</integer> | 10 | + <integer>0</integer> |
| 11 | </dict> | 11 | </dict> |
| 12 | </dict> | 12 | </dict> |
| 13 | </dict> | 13 | </dict> | ... | ... |
No preview for this file type
| ... | @@ -25,6 +25,7 @@ import UIKit | ... | @@ -25,6 +25,7 @@ import UIKit |
| 25 | parentView.layer.borderWidth = 1.0 | 25 | parentView.layer.borderWidth = 1.0 |
| 26 | parentView.layer.borderColor = UIColor(rgb: 0xCCCCCC).cgColor | 26 | parentView.layer.borderColor = UIColor(rgb: 0xCCCCCC).cgColor |
| 27 | parentView.layer.cornerRadius = 8.0 | 27 | parentView.layer.cornerRadius = 8.0 |
| 28 | + parentView.clipsToBounds = true | ||
| 28 | 29 | ||
| 29 | discountView.layer.cornerRadius = 34.0 | 30 | discountView.layer.cornerRadius = 34.0 |
| 30 | 31 | ||
| ... | @@ -42,7 +43,7 @@ import UIKit | ... | @@ -42,7 +43,7 @@ import UIKit |
| 42 | : "" | 43 | : "" |
| 43 | 44 | ||
| 44 | discountLabel.text = "\(data.discount)\(discountSymbol)" | 45 | discountLabel.text = "\(data.discount)\(discountSymbol)" |
| 45 | - discountLabel.font = UIFont(name: "PingLCG-Bold", size: 18) | 46 | + discountLabel.font = UIFont(name: "PingLCG-Bold", size: 17) |
| 46 | discountLabel.textColor = UIColor(rgb: 0xF2F2F2) | 47 | discountLabel.textColor = UIColor(rgb: 0xF2F2F2) |
| 47 | 48 | ||
| 48 | discountView.backgroundColor = UIColor(rgb: data.color) | 49 | discountView.backgroundColor = UIColor(rgb: data.color) | ... | ... |
| ... | @@ -77,25 +77,25 @@ | ... | @@ -77,25 +77,25 @@ |
| 77 | </constraints> | 77 | </constraints> |
| 78 | </view> | 78 | </view> |
| 79 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZh-nd-i9h" userLabel="Bottom View"> | 79 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZh-nd-i9h" userLabel="Bottom View"> |
| 80 | - <rect key="frame" x="14" y="64" width="254" height="101"/> | 80 | + <rect key="frame" x="0.0" y="64" width="268" height="101"/> |
| 81 | <subviews> | 81 | <subviews> |
| 82 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0lx-ek-fAp"> | 82 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0lx-ek-fAp"> |
| 83 | - <rect key="frame" x="11" y="8" width="148" height="82"/> | 83 | + <rect key="frame" x="11" y="8" width="162" height="82"/> |
| 84 | <subviews> | 84 | <subviews> |
| 85 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JDi-AY-Oai"> | 85 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JDi-AY-Oai"> |
| 86 | - <rect key="frame" x="0.0" y="0.0" width="148" height="21"/> | 86 | + <rect key="frame" x="0.0" y="0.0" width="162" height="21"/> |
| 87 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 87 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 88 | <nil key="textColor"/> | 88 | <nil key="textColor"/> |
| 89 | <nil key="highlightedColor"/> | 89 | <nil key="highlightedColor"/> |
| 90 | </label> | 90 | </label> |
| 91 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNz-HU-dYm"> | 91 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aNz-HU-dYm"> |
| 92 | - <rect key="frame" x="0.0" y="23" width="148" height="20.333333333333329"/> | 92 | + <rect key="frame" x="0.0" y="23" width="162" height="20.333333333333329"/> |
| 93 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 93 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 94 | <nil key="textColor"/> | 94 | <nil key="textColor"/> |
| 95 | <nil key="highlightedColor"/> | 95 | <nil key="highlightedColor"/> |
| 96 | </label> | 96 | </label> |
| 97 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIt-Gd-bbg"> | 97 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIt-Gd-bbg"> |
| 98 | - <rect key="frame" x="0.0" y="61" width="148" height="21"/> | 98 | + <rect key="frame" x="0.0" y="61" width="162" height="21"/> |
| 99 | <fontDescription key="fontDescription" type="system" pointSize="17"/> | 99 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 100 | <nil key="textColor"/> | 100 | <nil key="textColor"/> |
| 101 | <nil key="highlightedColor"/> | 101 | <nil key="highlightedColor"/> |
| ... | @@ -115,7 +115,7 @@ | ... | @@ -115,7 +115,7 @@ |
| 115 | </constraints> | 115 | </constraints> |
| 116 | </view> | 116 | </view> |
| 117 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3me-Qd-ALg"> | 117 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3me-Qd-ALg"> |
| 118 | - <rect key="frame" x="177" y="13" width="59" height="59"/> | 118 | + <rect key="frame" x="191" y="13" width="59" height="59"/> |
| 119 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 119 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 120 | <constraints> | 120 | <constraints> |
| 121 | <constraint firstAttribute="height" constant="59" id="Ij1-x5-I27"/> | 121 | <constraint firstAttribute="height" constant="59" id="Ij1-x5-I27"/> |
| ... | @@ -140,7 +140,7 @@ | ... | @@ -140,7 +140,7 @@ |
| 140 | <constraint firstAttribute="bottom" secondItem="VZh-nd-i9h" secondAttribute="bottom" id="0Kf-vE-Wru"/> | 140 | <constraint firstAttribute="bottom" secondItem="VZh-nd-i9h" secondAttribute="bottom" id="0Kf-vE-Wru"/> |
| 141 | <constraint firstAttribute="trailing" secondItem="nG0-KL-IyC" secondAttribute="trailing" id="3PK-aE-vjr"/> | 141 | <constraint firstAttribute="trailing" secondItem="nG0-KL-IyC" secondAttribute="trailing" id="3PK-aE-vjr"/> |
| 142 | <constraint firstItem="VZh-nd-i9h" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="bottom" id="7xf-0u-A8S"/> | 142 | <constraint firstItem="VZh-nd-i9h" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="bottom" id="7xf-0u-A8S"/> |
| 143 | - <constraint firstItem="VZh-nd-i9h" firstAttribute="leading" secondItem="5If-VV-K9F" secondAttribute="leading" constant="14" id="P5a-2H-UoS"/> | 143 | + <constraint firstItem="VZh-nd-i9h" firstAttribute="leading" secondItem="5If-VV-K9F" secondAttribute="leading" id="P5a-2H-UoS"/> |
| 144 | <constraint firstAttribute="trailing" secondItem="VZh-nd-i9h" secondAttribute="trailing" id="dzM-oX-xd7"/> | 144 | <constraint firstAttribute="trailing" secondItem="VZh-nd-i9h" secondAttribute="trailing" id="dzM-oX-xd7"/> |
| 145 | <constraint firstItem="nG0-KL-IyC" firstAttribute="top" secondItem="5If-VV-K9F" secondAttribute="top" id="l7a-R3-Wjx"/> | 145 | <constraint firstItem="nG0-KL-IyC" firstAttribute="top" secondItem="5If-VV-K9F" secondAttribute="top" id="l7a-R3-Wjx"/> |
| 146 | <constraint firstItem="nG0-KL-IyC" firstAttribute="leading" secondItem="5If-VV-K9F" secondAttribute="leading" id="vz8-lp-dsA"/> | 146 | <constraint firstItem="nG0-KL-IyC" firstAttribute="leading" secondItem="5If-VV-K9F" secondAttribute="leading" id="vz8-lp-dsA"/> | ... | ... |
| ... | @@ -48,13 +48,13 @@ import UIKit | ... | @@ -48,13 +48,13 @@ import UIKit |
| 48 | // Configure collection view layout | 48 | // Configure collection view layout |
| 49 | if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout { | 49 | if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout { |
| 50 | layout.scrollDirection = .horizontal | 50 | layout.scrollDirection = .horizontal |
| 51 | - layout.minimumLineSpacing = 0 | 51 | + layout.minimumLineSpacing = 7 |
| 52 | layout.minimumInteritemSpacing = 0 | 52 | layout.minimumInteritemSpacing = 0 |
| 53 | - layout.sectionInset = UIEdgeInsets.zero | 53 | + layout.sectionInset = UIEdgeInsets(top: 0, left: 24, bottom: 0, right: 24) |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | // Enable paging for smooth banner scrolling | 56 | // Enable paging for smooth banner scrolling |
| 57 | - collectionView.isPagingEnabled = true | 57 | + // collectionView.isPagingEnabled = true |
| 58 | collectionView.showsHorizontalScrollIndicator = false | 58 | collectionView.showsHorizontalScrollIndicator = false |
| 59 | 59 | ||
| 60 | // Set delegates | 60 | // Set delegates |
| ... | @@ -130,7 +130,6 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UICol | ... | @@ -130,7 +130,6 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UICol |
| 130 | 130 | ||
| 131 | // Cell Margin | 131 | // Cell Margin |
| 132 | public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { | 132 | public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { |
| 133 | - return UIEdgeInsets.zero | 133 | + return UIEdgeInsets(top: 0, left: 24, bottom: 0, right: 24) |
| 134 | -// UIEdgeInsets(top: 0, left: 7, bottom: 0, right: 0) | ||
| 135 | } | 134 | } |
| 136 | } | 135 | } | ... | ... |
-
Please register or login to post a comment