open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
78fb19e2 1 parent ce5be0e4

fix UnifiedCouponBarcodeVC show coupons button

Inline Side-by-side
Showing 5 changed files with 15 additions and 13 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>
......
...@@ -3247,7 +3247,7 @@ ...@@ -3247,7 +3247,7 @@
3247 <nil key="highlightedColor"/> 3247 <nil key="highlightedColor"/>
3248 </label> 3248 </label>
3249 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="52P-0b-ua5"> 3249 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="52P-0b-ua5">
3250 - <rect key="frame" x="103.5" y="773.5" width="207" height="40"/> 3250 + <rect key="frame" x="113" y="773.5" width="188" height="40"/>
3251 <constraints> 3251 <constraints>
3252 <constraint firstAttribute="height" constant="40" id="W45-Tv-hXa"/> 3252 <constraint firstAttribute="height" constant="40" id="W45-Tv-hXa"/>
3253 </constraints> 3253 </constraints>
...@@ -3275,7 +3275,6 @@ ...@@ -3275,7 +3275,6 @@
3275 <constraint firstAttribute="trailing" secondItem="7Ha-h1-G5Y" secondAttribute="trailing" constant="20" id="JCb-Z3-NVb"/> 3275 <constraint firstAttribute="trailing" secondItem="7Ha-h1-G5Y" secondAttribute="trailing" constant="20" id="JCb-Z3-NVb"/>
3276 <constraint firstItem="33M-UT-Ysb" firstAttribute="leading" secondItem="zYD-ey-wun" secondAttribute="leading" constant="20" id="Oe2-NA-u35"/> 3276 <constraint firstItem="33M-UT-Ysb" firstAttribute="leading" secondItem="zYD-ey-wun" secondAttribute="leading" constant="20" id="Oe2-NA-u35"/>
3277 <constraint firstItem="7Ha-h1-G5Y" firstAttribute="top" secondItem="KgC-mB-kHF" secondAttribute="bottom" constant="15" id="OkX-gf-S8Z"/> 3277 <constraint firstItem="7Ha-h1-G5Y" firstAttribute="top" secondItem="KgC-mB-kHF" secondAttribute="bottom" constant="15" id="OkX-gf-S8Z"/>
3278 - <constraint firstItem="52P-0b-ua5" firstAttribute="width" secondItem="zYD-ey-wun" secondAttribute="width" multiplier="0.5" id="OpZ-1t-VZF"/>
3279 <constraint firstItem="9Cx-1R-FqG" firstAttribute="leading" secondItem="zYD-ey-wun" secondAttribute="leading" constant="30" id="RS0-3d-Ahq"/> 3278 <constraint firstItem="9Cx-1R-FqG" firstAttribute="leading" secondItem="zYD-ey-wun" secondAttribute="leading" constant="30" id="RS0-3d-Ahq"/>
3280 <constraint firstAttribute="trailing" secondItem="luU-pw-7jY" secondAttribute="trailing" constant="20" id="TVb-zK-d3G"/> 3279 <constraint firstAttribute="trailing" secondItem="luU-pw-7jY" secondAttribute="trailing" constant="20" id="TVb-zK-d3G"/>
3281 <constraint firstAttribute="trailing" secondItem="SPU-J6-4re" secondAttribute="trailing" constant="20" id="Trv-gg-FoN"/> 3280 <constraint firstAttribute="trailing" secondItem="SPU-J6-4re" secondAttribute="trailing" constant="20" id="Trv-gg-FoN"/>
...@@ -3480,17 +3479,17 @@ ...@@ -3480,17 +3479,17 @@
3480 </connections> 3479 </connections>
3481 </tableViewCell> 3480 </tableViewCell>
3482 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> 3481 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework">
3483 - <rect key="frame" x="0.0" y="935.5" width="414" height="44"/> 3482 + <rect key="frame" x="0.0" y="935.5" width="414" height="160"/>
3484 <autoresizingMask key="autoresizingMask"/> 3483 <autoresizingMask key="autoresizingMask"/>
3485 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> 3484 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5">
3486 - <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> 3485 + <rect key="frame" x="0.0" y="0.0" width="414" height="160"/>
3487 <autoresizingMask key="autoresizingMask"/> 3486 <autoresizingMask key="autoresizingMask"/>
3488 <subviews> 3487 <subviews>
3489 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ"> 3488 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ">
3490 - <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> 3489 + <rect key="frame" x="0.0" y="0.0" width="414" height="160"/>
3491 <subviews> 3490 <subviews>
3492 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ"> 3491 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-w7-eKZ">
3493 - <rect key="frame" x="123.5" y="20" width="167" height="33"/> 3492 + <rect key="frame" x="123.5" y="20" width="167" height="50"/>
3494 <constraints> 3493 <constraints>
3495 <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/> 3494 <constraint firstAttribute="height" constant="50" id="SUG-HC-XQH"/>
3496 </constraints> 3495 </constraints>
...@@ -3504,7 +3503,7 @@ ...@@ -3504,7 +3503,7 @@
3504 </connections> 3503 </connections>
3505 </button> 3504 </button>
3506 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2"> 3505 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sq7-ea-Nx2">
3507 - <rect key="frame" x="103.5" y="-10" width="207" height="24"/> 3506 + <rect key="frame" x="103.5" y="90" width="207" height="40"/>
3508 <constraints> 3507 <constraints>
3509 <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/> 3508 <constraint firstAttribute="height" constant="40" id="UgG-aB-OOw"/>
3510 </constraints> 3509 </constraints>
...@@ -3519,7 +3518,7 @@ ...@@ -3519,7 +3518,7 @@
3519 </connections> 3518 </connections>
3520 </button> 3519 </button>
3521 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework"> 3520 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kkr-9H-ZSx" customClass="UnselectableTappableTextView" customModule="SwiftWarplyFramework">
3522 - <rect key="frame" x="20" y="14" width="374" height="0.0"/> 3521 + <rect key="frame" x="20" y="130" width="374" height="0.0"/>
3523 <color key="backgroundColor" systemColor="systemBackgroundColor"/> 3522 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
3524 <constraints> 3523 <constraints>
3525 <constraint firstAttribute="height" id="oLt-F6-WA7"/> 3524 <constraint firstAttribute="height" id="oLt-F6-WA7"/>
......
...@@ -107,10 +107,10 @@ import AVFoundation ...@@ -107,10 +107,10 @@ import AVFoundation
107 showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) 107 showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal)
108 showCouponsButton.semanticContentAttribute = .forceRightToLeft 108 showCouponsButton.semanticContentAttribute = .forceRightToLeft
109 showCouponsButton.tintColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 1.00) 109 showCouponsButton.tintColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 1.00)
110 - showCouponsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); 110 + showCouponsButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0);
111 - showCouponsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 5); 111 + showCouponsButton.titleEdgeInsets = UIEdgeInsets(top: 0, left: -10, bottom: 0, right: 10);
112 showCouponsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8) 112 showCouponsButton.imageView?.layer.transform = CATransform3DMakeScale(0.8, 0.8, 0.8)
113 - 113 + showCouponsButton.frame = CGRect(x: 0.0, y: 0.0, width: showCouponsButton.intrinsicContentSize.width+10, height: 40)
114 } 114 }
115 115
116 public override func setSelected(_ selected: Bool, animated: Bool) { 116 public override func setSelected(_ selected: Bool, animated: Bool) {
...@@ -294,9 +294,12 @@ import AVFoundation ...@@ -294,9 +294,12 @@ import AVFoundation
294 if (couponsVisible) { 294 if (couponsVisible) {
295 showCouponsButton.setTitle("Απόκρυψη προσφορών", for: .normal) 295 showCouponsButton.setTitle("Απόκρυψη προσφορών", for: .normal)
296 showCouponsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) 296 showCouponsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal)
297 + showCouponsButton.frame = CGRect(x: 0.0, y: 0.0, width: showCouponsButton.intrinsicContentSize.width+10, height: 40)
298 +
297 } else { 299 } else {
298 showCouponsButton.setTitle("Εμφάνιση προσφορών", for: .normal) 300 showCouponsButton.setTitle("Εμφάνιση προσφορών", for: .normal)
299 showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) 301 showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal)
302 + showCouponsButton.frame = CGRect(x: 0.0, y: 0.0, width: showCouponsButton.intrinsicContentSize.width+10, height: 40)
300 } 303 }
301 } 304 }
302 305
......