open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
e51b47c3 1 parent 0c138a3e

CouponVC fixes

Inline Side-by-side
Showing 5 changed files with 19 additions and 14 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>1</integer> 10 + <integer>0</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>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -122,7 +122,7 @@ import UIKit ...@@ -122,7 +122,7 @@ import UIKit
122 mapButton.setTitle("Καταστήματα κοντά μου", for: .normal) 122 mapButton.setTitle("Καταστήματα κοντά μου", for: .normal)
123 mapButton.setTitleColor(UIColor(rgb: 0xFFFFFF), for: .normal) 123 mapButton.setTitleColor(UIColor(rgb: 0xFFFFFF), for: .normal)
124 mapButton.layer.cornerRadius = 4.0 124 mapButton.layer.cornerRadius = 4.0
125 - websiteButton.backgroundColor = UIColor(rgb: 0x000F1E) 125 + mapButton.backgroundColor = UIColor(rgb: 0x000F1E)
126 126
127 websiteButton.titleLabel?.font = UIFont(name: "PingLCG-Bold", size: 16) 127 websiteButton.titleLabel?.font = UIFont(name: "PingLCG-Bold", size: 16)
128 websiteButton.setTitle("Δες το website", for: .normal) 128 websiteButton.setTitle("Δες το website", for: .normal)
...@@ -201,6 +201,8 @@ import UIKit ...@@ -201,6 +201,8 @@ import UIKit
201 UIView.animate(withDuration: 0.3) { 201 UIView.animate(withDuration: 0.3) {
202 self.couponCodeArrowImage.image = UIImage(named: self.isCouponCodeExpanded ? "arrow_up" : "arrow_down", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 202 self.couponCodeArrowImage.image = UIImage(named: self.isCouponCodeExpanded ? "arrow_up" : "arrow_down", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
203 self.couponCodeContentHeightConstraint.constant = self.isCouponCodeExpanded ? self.couponCodeContentView.intrinsicContentSize.height : 0 203 self.couponCodeContentHeightConstraint.constant = self.isCouponCodeExpanded ? self.couponCodeContentView.intrinsicContentSize.height : 0
204 + self.couponCodeContentView.isHidden = !self.isCouponCodeExpanded
205 + self.couponCodeContainerView.frame.size.height = self.couponCodeContainerView.intrinsicContentSize.height
204 self.view.layoutIfNeeded() 206 self.view.layoutIfNeeded()
205 } 207 }
206 } 208 }
...@@ -211,6 +213,8 @@ import UIKit ...@@ -211,6 +213,8 @@ import UIKit
211 UIView.animate(withDuration: 0.3) { 213 UIView.animate(withDuration: 0.3) {
212 self.couponQRArrowImage.image = UIImage(named: self.isCouponQRExpanded ? "arrow_up" : "arrow_down", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 214 self.couponQRArrowImage.image = UIImage(named: self.isCouponQRExpanded ? "arrow_up" : "arrow_down", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
213 self.couponQRContentHeightConstraint.constant = self.isCouponQRExpanded ? self.couponQRContentView.intrinsicContentSize.height : 0 215 self.couponQRContentHeightConstraint.constant = self.isCouponQRExpanded ? self.couponQRContentView.intrinsicContentSize.height : 0
216 + self.couponQRContentView.isHidden = !self.isCouponQRExpanded
217 + self.couponQRContainerView.frame.size.height = self.couponQRContainerView.intrinsicContentSize.height
214 self.view.layoutIfNeeded() 218 self.view.layoutIfNeeded()
215 } 219 }
216 } 220 }
......
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
57 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XaT-fU-eNh" userLabel="Main View"> 57 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XaT-fU-eNh" userLabel="Main View">
58 <rect key="frame" x="0.0" y="59" width="393" height="793"/> 58 <rect key="frame" x="0.0" y="59" width="393" height="793"/>
59 <subviews> 59 <subviews>
60 - <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YpC-uS-mhw"> 60 + <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YpC-uS-mhw">
61 <rect key="frame" x="0.0" y="0.0" width="393" height="793"/> 61 <rect key="frame" x="0.0" y="0.0" width="393" height="793"/>
62 <subviews> 62 <subviews>
63 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qrm-40-JLT" userLabel="Scroll Content View"> 63 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qrm-40-JLT" userLabel="Scroll Content View">
64 <rect key="frame" x="0.0" y="0.0" width="393" height="1225.6666666666667"/> 64 <rect key="frame" x="0.0" y="0.0" width="393" height="1225.6666666666667"/>
65 <subviews> 65 <subviews>
66 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xiw-td-OMd" userLabel="Coupon Image View"> 66 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Xiw-td-OMd" userLabel="Coupon Image View">
...@@ -309,16 +309,16 @@ ...@@ -309,16 +309,16 @@
309 </constraints> 309 </constraints>
310 </view> 310 </view>
311 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HAh-BZ-4Ka" userLabel="TermsButtonView"> 311 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HAh-BZ-4Ka" userLabel="TermsButtonView">
312 - <rect key="frame" x="24" y="1349.3333333333333" width="75" height="35"/> 312 + <rect key="frame" x="23.999999999999993" y="944.33333333333337" width="123.33333333333331" height="35"/>
313 <subviews> 313 <subviews>
314 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vj-gt-dKJ" userLabel="TermsButtonTitleLabel"> 314 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Όροι Χρήσης" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Vj-gt-dKJ" userLabel="TermsButtonTitleLabel">
315 - <rect key="frame" x="0.0" y="5" width="53" height="25"/> 315 + <rect key="frame" x="0.0" y="5" width="101.33333333333333" height="25"/>
316 <fontDescription key="fontDescription" type="system" pointSize="17"/> 316 <fontDescription key="fontDescription" type="system" pointSize="17"/>
317 <nil key="textColor"/> 317 <nil key="textColor"/>
318 <nil key="highlightedColor"/> 318 <nil key="highlightedColor"/>
319 </label> 319 </label>
320 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="C8k-TU-LiL" userLabel="TermsButtonArrowImage"> 320 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="C8k-TU-LiL" userLabel="TermsButtonArrowImage">
321 - <rect key="frame" x="61" y="15" width="9" height="5"/> 321 + <rect key="frame" x="109.33333333333334" y="15" width="9" height="5"/>
322 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 322 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
323 <constraints> 323 <constraints>
324 <constraint firstAttribute="height" constant="5" id="ERb-FD-j0Y"/> 324 <constraint firstAttribute="height" constant="5" id="ERb-FD-j0Y"/>
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
326 </constraints> 326 </constraints>
327 </imageView> 327 </imageView>
328 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Id4-Xw-01i" userLabel="TermsButton"> 328 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Id4-Xw-01i" userLabel="TermsButton">
329 - <rect key="frame" x="0.0" y="0.0" width="75" height="35"/> 329 + <rect key="frame" x="0.0" y="0.0" width="123.33333333333333" height="35"/>
330 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 330 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
331 <state key="normal" title="Button"/> 331 <state key="normal" title="Button"/>
332 <buttonConfiguration key="configuration" style="plain" title="Button"> 332 <buttonConfiguration key="configuration" style="plain" title="Button">
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
348 <constraint firstAttribute="bottom" secondItem="Id4-Xw-01i" secondAttribute="bottom" id="xfI-kZ-4H2"/> 348 <constraint firstAttribute="bottom" secondItem="Id4-Xw-01i" secondAttribute="bottom" id="xfI-kZ-4H2"/>
349 </constraints> 349 </constraints>
350 </view> 350 </view>
351 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ak8-Tc-k8X" userLabel="TermsLabel"> 351 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ak8-Tc-k8X" userLabel="TermsLabel">
352 <rect key="frame" x="24" y="989.33333333333326" width="345" height="20.333333333333371"/> 352 <rect key="frame" x="24" y="989.33333333333326" width="345" height="20.333333333333371"/>
353 <constraints> 353 <constraints>
354 <constraint firstAttribute="height" constant="20.329999999999998" id="ZA1-TX-m9Y"/> 354 <constraint firstAttribute="height" constant="20.329999999999998" id="ZA1-TX-m9Y"/>
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
357 <nil key="textColor"/> 357 <nil key="textColor"/>
358 <nil key="highlightedColor"/> 358 <nil key="highlightedColor"/>
359 </label> 359 </label>
360 - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j1U-rV-0FP" userLabel="MapButton"> 360 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j1U-rV-0FP" userLabel="MapButton">
361 <rect key="frame" x="24" y="1049.6666666666667" width="345" height="55"/> 361 <rect key="frame" x="24" y="1049.6666666666667" width="345" height="55"/>
362 <constraints> 362 <constraints>
363 <constraint firstAttribute="height" constant="55" id="BZv-RS-JfU"/> 363 <constraint firstAttribute="height" constant="55" id="BZv-RS-JfU"/>
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
365 <state key="normal" title="Button"/> 365 <state key="normal" title="Button"/>
366 <buttonConfiguration key="configuration" style="plain" title="Button"/> 366 <buttonConfiguration key="configuration" style="plain" title="Button"/>
367 </button> 367 </button>
368 - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t8z-s1-rIA" userLabel="WebsiteButton"> 368 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t8z-s1-rIA" userLabel="WebsiteButton">
369 <rect key="frame" x="24" y="1124.6666666666667" width="345" height="55"/> 369 <rect key="frame" x="24" y="1124.6666666666667" width="345" height="55"/>
370 <constraints> 370 <constraints>
371 <constraint firstAttribute="height" constant="55" id="EUh-DN-fJh"/> 371 <constraint firstAttribute="height" constant="55" id="EUh-DN-fJh"/>
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
390 <constraint firstAttribute="trailing" secondItem="89U-JU-Imv" secondAttribute="trailing" constant="16" id="QJ1-AA-bn9"/> 390 <constraint firstAttribute="trailing" secondItem="89U-JU-Imv" secondAttribute="trailing" constant="16" id="QJ1-AA-bn9"/>
391 <constraint firstItem="u54-xs-f5a" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="ScM-kH-ZEe"/> 391 <constraint firstItem="u54-xs-f5a" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="ScM-kH-ZEe"/>
392 <constraint firstItem="VJr-Mc-WMf" firstAttribute="top" secondItem="u54-xs-f5a" secondAttribute="bottom" id="Ssw-da-ntM"/> 392 <constraint firstItem="VJr-Mc-WMf" firstAttribute="top" secondItem="u54-xs-f5a" secondAttribute="bottom" id="Ssw-da-ntM"/>
393 - <constraint firstItem="HAh-BZ-4Ka" firstAttribute="top" secondItem="X7C-0H-IhU" secondAttribute="bottom" constant="1000" id="Su5-M8-vrC"/> 393 + <constraint firstItem="HAh-BZ-4Ka" firstAttribute="top" secondItem="Cwz-uh-Zn5" secondAttribute="bottom" constant="50" id="Su5-M8-vrC"/>
394 <constraint firstAttribute="trailing" secondItem="Xiw-td-OMd" secondAttribute="trailing" id="TGH-lz-pn5"/> 394 <constraint firstAttribute="trailing" secondItem="Xiw-td-OMd" secondAttribute="trailing" id="TGH-lz-pn5"/>
395 <constraint firstItem="ElJ-Te-N4M" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="abd-4G-pI5"/> 395 <constraint firstItem="ElJ-Te-N4M" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="abd-4G-pI5"/>
396 <constraint firstItem="Xiw-td-OMd" firstAttribute="top" secondItem="qrm-40-JLT" secondAttribute="top" id="ajI-sR-3Pt"/> 396 <constraint firstItem="Xiw-td-OMd" firstAttribute="top" secondItem="qrm-40-JLT" secondAttribute="top" id="ajI-sR-3Pt"/>
...@@ -403,6 +403,7 @@ ...@@ -403,6 +403,7 @@
403 <constraint firstAttribute="trailing" secondItem="ElJ-Te-N4M" secondAttribute="trailing" constant="24" id="f9R-SZ-ReV"/> 403 <constraint firstAttribute="trailing" secondItem="ElJ-Te-N4M" secondAttribute="trailing" constant="24" id="f9R-SZ-ReV"/>
404 <constraint firstItem="j1U-rV-0FP" firstAttribute="top" secondItem="Ak8-Tc-k8X" secondAttribute="bottom" constant="40" id="gym-1h-ewZ"/> 404 <constraint firstItem="j1U-rV-0FP" firstAttribute="top" secondItem="Ak8-Tc-k8X" secondAttribute="bottom" constant="40" id="gym-1h-ewZ"/>
405 <constraint firstItem="HLR-Nk-7Gm" firstAttribute="top" secondItem="VJr-Mc-WMf" secondAttribute="bottom" constant="14" id="hfN-OE-fbk"/> 405 <constraint firstItem="HLR-Nk-7Gm" firstAttribute="top" secondItem="VJr-Mc-WMf" secondAttribute="bottom" constant="14" id="hfN-OE-fbk"/>
406 + <constraint firstItem="Ak8-Tc-k8X" firstAttribute="top" secondItem="HAh-BZ-4Ka" secondAttribute="bottom" constant="9.9999999999998863" id="i4i-57-H76"/>
406 <constraint firstItem="j1U-rV-0FP" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="jac-wq-3ZZ"/> 407 <constraint firstItem="j1U-rV-0FP" firstAttribute="leading" secondItem="qrm-40-JLT" secondAttribute="leading" constant="24" id="jac-wq-3ZZ"/>
407 <constraint firstItem="ElJ-Te-N4M" firstAttribute="top" secondItem="X7C-0H-IhU" secondAttribute="bottom" constant="34" id="jpp-m0-Hqs"/> 408 <constraint firstItem="ElJ-Te-N4M" firstAttribute="top" secondItem="X7C-0H-IhU" secondAttribute="bottom" constant="34" id="jpp-m0-Hqs"/>
408 <constraint firstItem="t8z-s1-rIA" firstAttribute="top" secondItem="j1U-rV-0FP" secondAttribute="bottom" constant="20" id="lPW-dz-sru"/> 409 <constraint firstItem="t8z-s1-rIA" firstAttribute="top" secondItem="j1U-rV-0FP" secondAttribute="bottom" constant="20" id="lPW-dz-sru"/>
......