open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
b3c7a11d 1 parent 670c3955

MyRewardsOffersScrollTableViewCell redesign

Inline Side-by-side
Showing 11 changed files with 99 additions and 54 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>
......
1 +{
2 + "images" : [
3 + {
4 + "filename" : "arrow_right_blue.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "arrow_right_blue 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "arrow_right_blue 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
...@@ -61,8 +61,8 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell { ...@@ -61,8 +61,8 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell {
61 // Initialization code 61 // Initialization code
62 62
63 parentView.layer.borderWidth = 1.0 63 parentView.layer.borderWidth = 1.0
64 - parentView.layer.borderColor = UIColor(rgb: 0xCCCCCC).cgColor 64 + parentView.layer.borderColor = UIColor(rgb: 0xD2D6D9).cgColor
65 - parentView.layer.cornerRadius = 8.0 65 + parentView.layer.cornerRadius = 12.0
66 parentView.clipsToBounds = true 66 parentView.clipsToBounds = true
67 67
68 discountView.layer.cornerRadius = 34.0 68 discountView.layer.cornerRadius = 34.0
...@@ -83,12 +83,13 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell { ...@@ -83,12 +83,13 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell {
83 // discountLabel.text = "\(data.discount)\(discountSymbol)" 83 // discountLabel.text = "\(data.discount)\(discountSymbol)"
84 discountLabel.text = data.discount 84 discountLabel.text = data.discount
85 discountLabel.font = UIFont(name: "PingLCG-Bold", size: 17) 85 discountLabel.font = UIFont(name: "PingLCG-Bold", size: 17)
86 - discountLabel.textColor = UIColor(rgb: 0xF2F2F2) 86 + discountLabel.textColor = UIColor(rgb: 0xFFFFFF)
87 87
88 - discountView.backgroundColor = UIColor(rgb: data.color) 88 + // discountView.backgroundColor = UIColor(rgb: data.color)
89 + discountView.backgroundColor = UIColor(rgb: 0xCBCBCB)
89 90
90 titleLabel.text = data.title 91 titleLabel.text = data.title
91 - titleLabel.font = UIFont(name: "PingLCG-Bold", size: 17) 92 + titleLabel.font = UIFont(name: "PingLCG-Bold", size: 16)
92 titleLabel.textColor = UIColor(rgb: 0x000F1E) 93 titleLabel.textColor = UIColor(rgb: 0x000F1E)
93 94
94 subtitleLabel.text = data.description 95 subtitleLabel.text = data.description
...@@ -96,8 +97,8 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell { ...@@ -96,8 +97,8 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell {
96 subtitleLabel.textColor = UIColor(rgb: 0x00111B) 97 subtitleLabel.textColor = UIColor(rgb: 0x00111B)
97 98
98 expirationLabel.text = data.expirationDate 99 expirationLabel.text = data.expirationDate
99 - expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 13) 100 + expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 12)
100 - expirationLabel.textColor = UIColor(rgb: 0x00111B) 101 + expirationLabel.textColor = UIColor(rgb: 0x9BA1A6)
101 102
102 logoImage.image = UIImage(named: data.merchantLogo, in: Bundle.frameworkResourceBundle, compatibleWith: nil) 103 logoImage.image = UIImage(named: data.merchantLogo, in: Bundle.frameworkResourceBundle, compatibleWith: nil)
103 } 104 }
...@@ -113,7 +114,7 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell { ...@@ -113,7 +114,7 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell {
113 // Use coupon set discount 114 // Use coupon set discount
114 discountLabel.text = data._discount 115 discountLabel.text = data._discount
115 discountLabel.font = UIFont(name: "PingLCG-Bold", size: 17) 116 discountLabel.font = UIFont(name: "PingLCG-Bold", size: 17)
116 - discountLabel.textColor = UIColor(rgb: 0xF2F2F2) 117 + discountLabel.textColor = UIColor(rgb: 0xFFFFFF)
117 118
118 // Color based on discount type 119 // Color based on discount type
119 let discountColor: UInt = { 120 let discountColor: UInt = {
...@@ -128,19 +129,21 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell { ...@@ -128,19 +129,21 @@ public class MyRewardsOfferCollectionViewCell: UICollectionViewCell {
128 return 0xEE417D 129 return 0xEE417D
129 } 130 }
130 }() 131 }()
131 - discountView.backgroundColor = UIColor(rgb: discountColor) 132 + // discountView.backgroundColor = UIColor(rgb: discountColor)
133 + discountView.backgroundColor = UIColor(rgb: 0xCBCBCB)
132 134
133 titleLabel.text = data._name 135 titleLabel.text = data._name
134 - titleLabel.font = UIFont(name: "PingLCG-Bold", size: 17) 136 + titleLabel.font = UIFont(name: "PingLCG-Bold", size: 16)
135 titleLabel.textColor = UIColor(rgb: 0x000F1E) 137 titleLabel.textColor = UIColor(rgb: 0x000F1E)
136 138
137 subtitleLabel.text = data._short_description 139 subtitleLabel.text = data._short_description
138 subtitleLabel.font = UIFont(name: "PingLCG-Regular", size: 14) 140 subtitleLabel.font = UIFont(name: "PingLCG-Regular", size: 14)
139 subtitleLabel.textColor = UIColor(rgb: 0x00111B) 141 subtitleLabel.textColor = UIColor(rgb: 0x00111B)
140 142
141 - expirationLabel.text = "έως " + data.formattedEndDate(format: "dd-MM") 143 + // expirationLabel.text = "έως " + data.formattedEndDate(format: "dd-MM")
142 - expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 13) 144 + expirationLabel.text = "until " + data.formattedEndDate(format: "dd-MM")
143 - expirationLabel.textColor = UIColor(rgb: 0x00111B) 145 + expirationLabel.font = UIFont(name: "PingLCG-Regular", size: 12)
146 + expirationLabel.textColor = UIColor(rgb: 0x9BA1A6)
144 147
145 // Use merchant logo from bound merchant data 148 // Use merchant logo from bound merchant data
146 if let merchant = data._merchant, !merchant._img_preview.isEmpty { 149 if let merchant = data._merchant, !merchant._img_preview.isEmpty {
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina6_12" orientation="portrait" appearance="light"/> 3 <device id="retina6_12" orientation="portrait" appearance="light"/>
4 <dependencies> 4 <dependencies>
5 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/> 5 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
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"/> 7 <capability name="System colors in document resources" minToolsVersion="11.0"/>
8 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 8 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 </constraints> 45 </constraints>
46 </view> 46 </view>
47 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ke4-P2-jW4" userLabel="Discount View"> 47 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ke4-P2-jW4" userLabel="Discount View">
48 - <rect key="frame" x="192" y="6" width="68" height="68"/> 48 + <rect key="frame" x="194" y="6" width="68" height="68"/>
49 <subviews> 49 <subviews>
50 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dlB-Ci-f8K"> 50 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dlB-Ci-f8K">
51 <rect key="frame" x="5" y="23.666666666666671" width="58" height="21"/> 51 <rect key="frame" x="5" y="23.666666666666671" width="58" height="21"/>
...@@ -72,9 +72,14 @@ ...@@ -72,9 +72,14 @@
72 <constraint firstItem="gqm-4L-lda" firstAttribute="leading" secondItem="nG0-KL-IyC" secondAttribute="leading" id="DMQ-RI-Dqo"/> 72 <constraint firstItem="gqm-4L-lda" firstAttribute="leading" secondItem="nG0-KL-IyC" secondAttribute="leading" id="DMQ-RI-Dqo"/>
73 <constraint firstAttribute="bottom" secondItem="gqm-4L-lda" secondAttribute="bottom" id="IXr-0J-fEF"/> 73 <constraint firstAttribute="bottom" secondItem="gqm-4L-lda" secondAttribute="bottom" id="IXr-0J-fEF"/>
74 <constraint firstItem="ke4-P2-jW4" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="top" constant="6" id="T5E-w8-e65"/> 74 <constraint firstItem="ke4-P2-jW4" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="top" constant="6" id="T5E-w8-e65"/>
75 - <constraint firstAttribute="trailing" secondItem="ke4-P2-jW4" secondAttribute="trailing" constant="8" id="VcX-22-qep"/> 75 + <constraint firstAttribute="trailing" secondItem="ke4-P2-jW4" secondAttribute="trailing" constant="6" id="VcX-22-qep"/>
76 <constraint firstItem="gqm-4L-lda" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="top" id="rzs-LV-a8h"/> 76 <constraint firstItem="gqm-4L-lda" firstAttribute="top" secondItem="nG0-KL-IyC" secondAttribute="top" id="rzs-LV-a8h"/>
77 </constraints> 77 </constraints>
78 + <variation key="default">
79 + <mask key="subviews">
80 + <exclude reference="QOx-tV-FfU"/>
81 + </mask>
82 + </variation>
78 </view> 83 </view>
79 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZh-nd-i9h" userLabel="Bottom View"> 84 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZh-nd-i9h" userLabel="Bottom View">
80 <rect key="frame" x="0.0" y="64" width="268" height="101"/> 85 <rect key="frame" x="0.0" y="64" width="268" height="101"/>
......
...@@ -17,6 +17,7 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell { ...@@ -17,6 +17,7 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell {
17 @IBOutlet weak var categoryLabel: UILabel! 17 @IBOutlet weak var categoryLabel: UILabel!
18 @IBOutlet weak var allButtonView: UIView! 18 @IBOutlet weak var allButtonView: UIView!
19 @IBOutlet weak var allButtonLabel: UILabel! 19 @IBOutlet weak var allButtonLabel: UILabel!
20 + @IBOutlet weak var allButtonArrowImage: UIImageView!
20 @IBOutlet weak var collectionView: UICollectionView! 21 @IBOutlet weak var collectionView: UICollectionView!
21 @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint! 22 @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint!
22 @IBOutlet weak var collectionViewBottom: NSLayoutConstraint! 23 @IBOutlet weak var collectionViewBottom: NSLayoutConstraint!
...@@ -28,13 +29,16 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell { ...@@ -28,13 +29,16 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell {
28 super.awakeFromNib() 29 super.awakeFromNib()
29 // Initialization code 30 // Initialization code
30 31
31 - allButtonView.layer.borderWidth = 1.0 32 + // allButtonView.layer.borderWidth = 1.0
32 - allButtonView.layer.borderColor = UIColor(rgb: 0x000F1E).cgColor 33 + // allButtonView.layer.borderColor = UIColor(rgb: 0x000F1E).cgColor
33 - allButtonView.layer.cornerRadius = 4.0 34 + // allButtonView.layer.cornerRadius = 4.0
35 +
36 + allButtonArrowImage.image = UIImage(named: "arrow_right_blue", in: Bundle.frameworkResourceBundle, compatibleWith: nil)
34 37
35 - allButtonLabel.text = "Όλα" 38 + // allButtonLabel.text = "Όλα"
36 - allButtonLabel.font = UIFont(name: "PingLCG-Regular", size: 16) 39 + allButtonLabel.text = "All"
37 - allButtonLabel.textColor = UIColor(rgb: 0x00111B) 40 + allButtonLabel.font = UIFont(name: "PingLCG-Regular", size: 15)
41 + allButtonLabel.textColor = UIColor(rgb: 0x004E6E)
38 allButtonLabel.frame.size.width = allButtonLabel.intrinsicContentSize.width 42 allButtonLabel.frame.size.width = allButtonLabel.intrinsicContentSize.width
39 allButtonLabel.frame.size.height = allButtonLabel.intrinsicContentSize.height 43 allButtonLabel.frame.size.height = allButtonLabel.intrinsicContentSize.height
40 44
...@@ -86,7 +90,7 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell { ...@@ -86,7 +90,7 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell {
86 layout.scrollDirection = .horizontal 90 layout.scrollDirection = .horizontal
87 layout.minimumLineSpacing = 7 91 layout.minimumLineSpacing = 7
88 layout.minimumInteritemSpacing = 0 92 layout.minimumInteritemSpacing = 0
89 - layout.sectionInset = UIEdgeInsets(top: 0, left: 24, bottom: 0, right: 24) 93 + layout.sectionInset = UIEdgeInsets(top: 0, left: 18, bottom: 0, right: 18)
90 } 94 }
91 } 95 }
92 96
...@@ -106,26 +110,26 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell { ...@@ -106,26 +110,26 @@ public class MyRewardsOffersScrollTableViewCell: UITableViewCell {
106 } 110 }
107 111
108 // Update collection view height based on section 112 // Update collection view height based on section
109 - if data?.title == "Αγαπημένα" { 113 + // if data?.title == "Αγαπημένα" {
110 - collectionViewHeightConstraint.constant = 350 // Match cell height 114 + // collectionViewHeightConstraint.constant = 350 // Match cell height
111 - } else { 115 + // } else {
112 collectionViewHeightConstraint.constant = 232 // Default height 116 collectionViewHeightConstraint.constant = 232 // Default height
113 - } 117 + // }
114 118
115 // Configure layout based on section type 119 // Configure layout based on section type
116 if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout { 120 if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout {
117 - if data?.title == "Αγαπημένα" { 121 + // if data?.title == "Αγαπημένα" {
118 - layout.minimumLineSpacing = 24 122 + // layout.minimumLineSpacing = 24
119 - } else { 123 + // } else {
120 layout.minimumLineSpacing = 7 124 layout.minimumLineSpacing = 7
121 - } 125 + // }
122 } 126 }
123 127
124 let catBoldText = (data?.title ?? "") + " " 128 let catBoldText = (data?.title ?? "") + " "
125 let catRegText = "(" + String(data?.count ?? 0) + ")" 129 let catRegText = "(" + String(data?.count ?? 0) + ")"
126 130
127 - let attrBold = [NSAttributedString.Key.font : UIFont(name: "PingLCG-Bold", size: 18) ?? UIFont.boldSystemFont(ofSize: 17), NSAttributedString.Key.foregroundColor: UIColor(rgb: 0x000F1E)] 131 + let attrBold = [NSAttributedString.Key.font : UIFont(name: "PingLCG-Bold", size: 15) ?? UIFont.boldSystemFont(ofSize: 15), NSAttributedString.Key.foregroundColor: UIColor(rgb: 0x000F1E)]
128 - let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PingLCG-Regular", size: 18) ?? UIFont.systemFont(ofSize: 17), NSAttributedString.Key.foregroundColor: UIColor(rgb: 0x000F1E)] 132 + let attrRegular = [NSAttributedString.Key.font : UIFont(name: "PingLCG-Regular", size: 15) ?? UIFont.systemFont(ofSize: 15), NSAttributedString.Key.foregroundColor: UIColor(rgb: 0x000F1E)]
129 133
130 let catAttributedString = NSMutableAttributedString(string:catBoldText, attributes:attrBold) 134 let catAttributedString = NSMutableAttributedString(string:catBoldText, attributes:attrBold)
131 let catRegString = NSMutableAttributedString(string: catRegText, attributes:attrRegular) 135 let catRegString = NSMutableAttributedString(string: catRegText, attributes:attrRegular)
...@@ -198,20 +202,20 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UIColl ...@@ -198,20 +202,20 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UIColl
198 202
199 // MARK: - UICollectionViewDelegateFlowLayout 203 // MARK: - UICollectionViewDelegateFlowLayout
200 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { 204 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
201 - if self.data?.title == "Αγαπημένα" { 205 + // if self.data?.title == "Αγαπημένα" {
202 - return CGSize(width: 275, height: 350) 206 + // return CGSize(width: 275, height: 350)
203 - } else { 207 + // } else {
204 return CGSize(width: 257, height: 232) 208 return CGSize(width: 257, height: 232)
205 - } 209 + // }
206 } 210 }
207 211
208 // Distance Between Item Cells 212 // Distance Between Item Cells
209 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { 213 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
210 - if self.data?.title == "Αγαπημένα" { 214 + // if self.data?.title == "Αγαπημένα" {
211 - return 24 215 + // return 24
212 - } else { 216 + // } else {
213 return 7 217 return 7
214 - } 218 + // }
215 } 219 }
216 220
217 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { 221 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
...@@ -220,6 +224,6 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UIColl ...@@ -220,6 +224,6 @@ extension MyRewardsOffersScrollTableViewCell: UICollectionViewDataSource, UIColl
220 224
221 // Cell Margin 225 // Cell Margin
222 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { 226 public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
223 - return UIEdgeInsets(top: 0, left: 24, bottom: 0, right: 24) 227 + return UIEdgeInsets(top: 0, left: 18, bottom: 0, right: 18)
224 } 228 }
225 } 229 }
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina6_12" orientation="portrait" appearance="light"/> 3 <device id="retina6_12" orientation="portrait" appearance="light"/>
4 <dependencies> 4 <dependencies>
5 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/> 5 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
6 <capability name="Safe area layout guides" minToolsVersion="9.0"/> 6 <capability name="Safe area layout guides" minToolsVersion="9.0"/>
7 <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"/>
8 </dependencies> 8 </dependencies>
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 <autoresizingMask key="autoresizingMask"/> 17 <autoresizingMask key="autoresizingMask"/>
18 <subviews> 18 <subviews>
19 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3yR-f0-cq6" userLabel="Parent View"> 19 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3yR-f0-cq6" userLabel="Parent View">
20 - <rect key="frame" x="0.0" y="0.0" width="403" height="335"/> 20 + <rect key="frame" x="0.0" y="0.0" width="403" height="317"/>
21 <subviews> 21 <subviews>
22 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iQa-jk-pTS" userLabel="Top View"> 22 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iQa-jk-pTS" userLabel="Top View">
23 - <rect key="frame" x="24" y="50" width="355" height="35"/> 23 + <rect key="frame" x="24" y="43" width="355" height="35"/>
24 <subviews> 24 <subviews>
25 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2GN-Th-7DN"> 25 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2GN-Th-7DN">
26 <rect key="frame" x="0.0" y="7" width="270" height="21"/> 26 <rect key="frame" x="0.0" y="7" width="270" height="21"/>
...@@ -32,11 +32,18 @@ ...@@ -32,11 +32,18 @@
32 <rect key="frame" x="280" y="0.0" width="75" height="35"/> 32 <rect key="frame" x="280" y="0.0" width="75" height="35"/>
33 <subviews> 33 <subviews>
34 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Όλα" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGA-M6-mox"> 34 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Όλα" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGA-M6-mox">
35 - <rect key="frame" x="17" y="7" width="41" height="21"/> 35 + <rect key="frame" x="17" y="7" width="50" height="21"/>
36 <fontDescription key="fontDescription" type="system" pointSize="17"/> 36 <fontDescription key="fontDescription" type="system" pointSize="17"/>
37 <nil key="textColor"/> 37 <nil key="textColor"/>
38 <nil key="highlightedColor"/> 38 <nil key="highlightedColor"/>
39 </label> 39 </label>
40 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ScT-dl-H7N">
41 + <rect key="frame" x="71" y="13.666666666666664" width="4" height="8"/>
42 + <constraints>
43 + <constraint firstAttribute="width" constant="4" id="fPm-t1-TQF"/>
44 + <constraint firstAttribute="height" constant="8" id="vm9-GN-BYx"/>
45 + </constraints>
46 + </imageView>
40 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3xd-DO-x7D"> 47 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3xd-DO-x7D">
41 <rect key="frame" x="0.0" y="0.0" width="75" height="35"/> 48 <rect key="frame" x="0.0" y="0.0" width="75" height="35"/>
42 <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"/>
...@@ -49,12 +56,14 @@ ...@@ -49,12 +56,14 @@
49 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 56 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
50 <constraints> 57 <constraints>
51 <constraint firstAttribute="trailing" secondItem="3xd-DO-x7D" secondAttribute="trailing" id="JPz-In-GKK"/> 58 <constraint firstAttribute="trailing" secondItem="3xd-DO-x7D" secondAttribute="trailing" id="JPz-In-GKK"/>
59 + <constraint firstItem="ScT-dl-H7N" firstAttribute="centerY" secondItem="9Qp-M4-KdO" secondAttribute="centerY" id="Juh-Ho-gwG"/>
52 <constraint firstItem="3xd-DO-x7D" firstAttribute="top" secondItem="9Qp-M4-KdO" secondAttribute="top" id="Tja-OQ-C2l"/> 60 <constraint firstItem="3xd-DO-x7D" firstAttribute="top" secondItem="9Qp-M4-KdO" secondAttribute="top" id="Tja-OQ-C2l"/>
53 <constraint firstItem="KGA-M6-mox" firstAttribute="leading" secondItem="9Qp-M4-KdO" secondAttribute="leading" constant="17" id="VmX-L4-pUZ"/> 61 <constraint firstItem="KGA-M6-mox" firstAttribute="leading" secondItem="9Qp-M4-KdO" secondAttribute="leading" constant="17" id="VmX-L4-pUZ"/>
54 <constraint firstItem="KGA-M6-mox" firstAttribute="top" secondItem="9Qp-M4-KdO" secondAttribute="top" constant="7" id="Wfv-az-eWF"/> 62 <constraint firstItem="KGA-M6-mox" firstAttribute="top" secondItem="9Qp-M4-KdO" secondAttribute="top" constant="7" id="Wfv-az-eWF"/>
63 + <constraint firstAttribute="trailing" secondItem="ScT-dl-H7N" secondAttribute="trailing" id="X9a-ST-Z68"/>
55 <constraint firstItem="3xd-DO-x7D" firstAttribute="leading" secondItem="9Qp-M4-KdO" secondAttribute="leading" id="a6e-3u-98H"/> 64 <constraint firstItem="3xd-DO-x7D" firstAttribute="leading" secondItem="9Qp-M4-KdO" secondAttribute="leading" id="a6e-3u-98H"/>
56 <constraint firstAttribute="bottom" secondItem="KGA-M6-mox" secondAttribute="bottom" constant="7" id="e7a-OL-xbA"/> 65 <constraint firstAttribute="bottom" secondItem="KGA-M6-mox" secondAttribute="bottom" constant="7" id="e7a-OL-xbA"/>
57 - <constraint firstAttribute="trailing" secondItem="KGA-M6-mox" secondAttribute="trailing" constant="17" id="eK1-vy-dDM"/> 66 + <constraint firstItem="ScT-dl-H7N" firstAttribute="leading" secondItem="KGA-M6-mox" secondAttribute="trailing" constant="4" id="eK1-vy-dDM"/>
58 <constraint firstAttribute="bottom" secondItem="3xd-DO-x7D" secondAttribute="bottom" id="xGA-AA-7JP"/> 67 <constraint firstAttribute="bottom" secondItem="3xd-DO-x7D" secondAttribute="bottom" id="xGA-AA-7JP"/>
59 </constraints> 68 </constraints>
60 </view> 69 </view>
...@@ -70,7 +79,7 @@ ...@@ -70,7 +79,7 @@
70 </constraints> 79 </constraints>
71 </view> 80 </view>
72 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="E9Q-uB-Uvd"> 81 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="E9Q-uB-Uvd">
73 - <rect key="frame" x="0.0" y="103" width="403" height="232"/> 82 + <rect key="frame" x="0.0" y="85" width="403" height="232"/>
74 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 83 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
75 <constraints> 84 <constraints>
76 <constraint firstAttribute="height" constant="232" id="kSx-su-PE4"/> 85 <constraint firstAttribute="height" constant="232" id="kSx-su-PE4"/>
...@@ -90,10 +99,10 @@ ...@@ -90,10 +99,10 @@
90 </subviews> 99 </subviews>
91 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 100 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
92 <constraints> 101 <constraints>
93 - <constraint firstItem="E9Q-uB-Uvd" firstAttribute="top" secondItem="iQa-jk-pTS" secondAttribute="bottom" constant="18" id="BbT-IJ-sg4"/> 102 + <constraint firstItem="E9Q-uB-Uvd" firstAttribute="top" secondItem="iQa-jk-pTS" secondAttribute="bottom" constant="7" id="BbT-IJ-sg4"/>
94 <constraint firstItem="iQa-jk-pTS" firstAttribute="leading" secondItem="3yR-f0-cq6" secondAttribute="leading" constant="24" id="C0X-4S-oP1"/> 103 <constraint firstItem="iQa-jk-pTS" firstAttribute="leading" secondItem="3yR-f0-cq6" secondAttribute="leading" constant="24" id="C0X-4S-oP1"/>
95 <constraint firstAttribute="trailing" secondItem="E9Q-uB-Uvd" secondAttribute="trailing" id="KNV-Sk-0rr"/> 104 <constraint firstAttribute="trailing" secondItem="E9Q-uB-Uvd" secondAttribute="trailing" id="KNV-Sk-0rr"/>
96 - <constraint firstItem="iQa-jk-pTS" firstAttribute="top" secondItem="3yR-f0-cq6" secondAttribute="top" constant="50" id="Saf-QC-O71"/> 105 + <constraint firstItem="iQa-jk-pTS" firstAttribute="top" secondItem="3yR-f0-cq6" secondAttribute="top" constant="43" id="Saf-QC-O71"/>
97 <constraint firstItem="E9Q-uB-Uvd" firstAttribute="leading" secondItem="3yR-f0-cq6" secondAttribute="leading" id="ToF-ce-EMM"/> 106 <constraint firstItem="E9Q-uB-Uvd" firstAttribute="leading" secondItem="3yR-f0-cq6" secondAttribute="leading" id="ToF-ce-EMM"/>
98 <constraint firstAttribute="bottom" secondItem="E9Q-uB-Uvd" secondAttribute="bottom" id="ssj-8N-2gP"/> 107 <constraint firstAttribute="bottom" secondItem="E9Q-uB-Uvd" secondAttribute="bottom" id="ssj-8N-2gP"/>
99 <constraint firstAttribute="trailing" secondItem="iQa-jk-pTS" secondAttribute="trailing" constant="24" id="zI6-rP-3kk"/> 108 <constraint firstAttribute="trailing" secondItem="iQa-jk-pTS" secondAttribute="trailing" constant="24" id="zI6-rP-3kk"/>
...@@ -111,6 +120,7 @@ ...@@ -111,6 +120,7 @@
111 <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> 120 <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
112 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 121 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
113 <connections> 122 <connections>
123 + <outlet property="allButtonArrowImage" destination="ScT-dl-H7N" id="nMs-HW-P4D"/>
114 <outlet property="allButtonLabel" destination="KGA-M6-mox" id="34J-92-2Fb"/> 124 <outlet property="allButtonLabel" destination="KGA-M6-mox" id="34J-92-2Fb"/>
115 <outlet property="allButtonView" destination="9Qp-M4-KdO" id="dwb-fV-WAm"/> 125 <outlet property="allButtonView" destination="9Qp-M4-KdO" id="dwb-fV-WAm"/>
116 <outlet property="categoryLabel" destination="2GN-Th-7DN" id="wGT-fB-Ktd"/> 126 <outlet property="categoryLabel" destination="2GN-Th-7DN" id="wGT-fB-Ktd"/>
......