open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
eacf4fd4 1 parent 388d8a39

fix empty rewardsView

Inline Side-by-side
Showing 5 changed files with 14 additions and 9 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>
......
...@@ -763,10 +763,10 @@ ...@@ -763,10 +763,10 @@
763 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 763 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
764 <subviews> 764 <subviews>
765 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Et1-y7-npI" userLabel="HeaderView"> 765 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Et1-y7-npI" userLabel="HeaderView">
766 - <rect key="frame" x="0.0" y="0.0" width="414" height="175"/> 766 + <rect key="frame" x="0.0" y="0.0" width="414" height="181"/>
767 <subviews> 767 <subviews>
768 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_background_circle" translatesAutoresizingMaskIntoConstraints="NO" id="wP5-YG-vSP"> 768 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_background_circle" translatesAutoresizingMaskIntoConstraints="NO" id="wP5-YG-vSP">
769 - <rect key="frame" x="0.0" y="0.0" width="414" height="175"/> 769 + <rect key="frame" x="0.0" y="0.0" width="414" height="181"/>
770 </imageView> 770 </imageView>
771 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf"> 771 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf">
772 <rect key="frame" x="174.5" y="30" width="65" height="65"/> 772 <rect key="frame" x="174.5" y="30" width="65" height="65"/>
...@@ -782,7 +782,7 @@ ...@@ -782,7 +782,7 @@
782 <nil key="highlightedColor"/> 782 <nil key="highlightedColor"/>
783 </label> 783 </label>
784 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV"> 784 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV">
785 - <rect key="frame" x="176.5" y="131" width="61" height="24"/> 785 + <rect key="frame" x="176.5" y="131" width="61" height="30"/>
786 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 786 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
787 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="14"/> 787 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="14"/>
788 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/> 788 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
...@@ -814,16 +814,16 @@ ...@@ -814,16 +814,16 @@
814 </constraints> 814 </constraints>
815 </view> 815 </view>
816 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukv-zL-7sQ"> 816 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukv-zL-7sQ">
817 - <rect key="frame" x="0.0" y="175" width="414" height="488"/> 817 + <rect key="frame" x="0.0" y="181" width="414" height="482"/>
818 <subviews> 818 <subviews>
819 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="COSMOTE Επιβράβευση" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BXF-rK-wmD"> 819 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="COSMOTE Επιβράβευση" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BXF-rK-wmD">
820 - <rect key="frame" x="20" y="30" width="374" height="249"/> 820 + <rect key="frame" x="20" y="30" width="374" height="243"/>
821 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="21"/> 821 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="21"/>
822 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 822 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
823 <nil key="highlightedColor"/> 823 <nil key="highlightedColor"/>
824 </label> 824 </label>
825 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DVa-Te-Sw4" userLabel="BadgesView"> 825 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DVa-Te-Sw4" userLabel="BadgesView">
826 - <rect key="frame" x="0.0" y="293" width="414" height="195"/> 826 + <rect key="frame" x="0.0" y="287" width="414" height="195"/>
827 <subviews> 827 <subviews>
828 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_badge_lines" translatesAutoresizingMaskIntoConstraints="NO" id="1Zm-yc-xEI"> 828 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_badge_lines" translatesAutoresizingMaskIntoConstraints="NO" id="1Zm-yc-xEI">
829 <rect key="frame" x="7" y="50" width="400" height="80"/> 829 <rect key="frame" x="7" y="50" width="400" height="80"/>
...@@ -1007,6 +1007,7 @@ ...@@ -1007,6 +1007,7 @@
1007 <constraint firstAttribute="trailing" secondItem="DVa-Te-Sw4" secondAttribute="trailing" id="DVL-xb-SoS"/> 1007 <constraint firstAttribute="trailing" secondItem="DVa-Te-Sw4" secondAttribute="trailing" id="DVL-xb-SoS"/>
1008 <constraint firstItem="BXF-rK-wmD" firstAttribute="leading" secondItem="Ukv-zL-7sQ" secondAttribute="leading" constant="20" id="If1-7K-I0v"/> 1008 <constraint firstItem="BXF-rK-wmD" firstAttribute="leading" secondItem="Ukv-zL-7sQ" secondAttribute="leading" constant="20" id="If1-7K-I0v"/>
1009 <constraint firstAttribute="bottom" secondItem="DVa-Te-Sw4" secondAttribute="bottom" id="Pkq-41-lNE"/> 1009 <constraint firstAttribute="bottom" secondItem="DVa-Te-Sw4" secondAttribute="bottom" id="Pkq-41-lNE"/>
1010 + <constraint firstAttribute="height" constant="482" id="gon-df-lCc"/>
1010 <constraint firstItem="BXF-rK-wmD" firstAttribute="top" secondItem="Ukv-zL-7sQ" secondAttribute="top" constant="30" id="zGx-VM-5zU"/> 1011 <constraint firstItem="BXF-rK-wmD" firstAttribute="top" secondItem="Ukv-zL-7sQ" secondAttribute="top" constant="30" id="zGx-VM-5zU"/>
1011 </constraints> 1012 </constraints>
1012 </view> 1013 </view>
...@@ -1237,7 +1238,7 @@ ...@@ -1237,7 +1238,7 @@
1237 <nil key="highlightedColor"/> 1238 <nil key="highlightedColor"/>
1238 </label> 1239 </label>
1239 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8YP-uG-vbV"> 1240 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8YP-uG-vbV">
1240 - <rect key="frame" x="20" y="205" width="374" height="458"/> 1241 + <rect key="frame" x="20" y="211" width="374" height="452"/>
1241 <subviews> 1242 <subviews>
1242 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aYf-dv-3Ik"> 1243 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aYf-dv-3Ik">
1243 <rect key="frame" x="149.5" y="0.0" width="75" height="75"/> 1244 <rect key="frame" x="149.5" y="0.0" width="75" height="75"/>
...@@ -1712,6 +1713,7 @@ ...@@ -1712,6 +1713,7 @@
1712 <outlet property="questionnaireButton" destination="UNL-Oh-sPV" id="EPs-OW-Oai"/> 1713 <outlet property="questionnaireButton" destination="UNL-Oh-sPV" id="EPs-OW-Oai"/>
1713 <outlet property="rewardsLabel" destination="BXF-rK-wmD" id="OXr-Xm-cgX"/> 1714 <outlet property="rewardsLabel" destination="BXF-rK-wmD" id="OXr-Xm-cgX"/>
1714 <outlet property="rewardsView" destination="Ukv-zL-7sQ" id="GgM-WZ-8Wm"/> 1715 <outlet property="rewardsView" destination="Ukv-zL-7sQ" id="GgM-WZ-8Wm"/>
1716 + <outlet property="rewardsViewHeight" destination="gon-df-lCc" id="YAV-U7-dEG"/>
1715 <outlet property="sumBadgeImage" destination="J7v-XB-iCp" id="TW3-lb-CJu"/> 1717 <outlet property="sumBadgeImage" destination="J7v-XB-iCp" id="TW3-lb-CJu"/>
1716 <outlet property="sumBadgeLabel" destination="E1I-Ms-Wub" id="bQy-8X-MhK"/> 1718 <outlet property="sumBadgeLabel" destination="E1I-Ms-Wub" id="bQy-8X-MhK"/>
1717 <outlet property="tableView" destination="jYz-96-Lp1" id="VZ8-9Y-cax"/> 1719 <outlet property="tableView" destination="jYz-96-Lp1" id="VZ8-9Y-cax"/>
......
...@@ -45,6 +45,7 @@ import SwiftEventBus ...@@ -45,6 +45,7 @@ import SwiftEventBus
45 @IBOutlet weak var activeCodeContentView: UIView! 45 @IBOutlet weak var activeCodeContentView: UIView!
46 @IBOutlet weak var activeCodeContentViewHeight: NSLayoutConstraint! 46 @IBOutlet weak var activeCodeContentViewHeight: NSLayoutConstraint!
47 @IBOutlet weak var rewardsView: UIView! 47 @IBOutlet weak var rewardsView: UIView!
48 + @IBOutlet weak var rewardsViewHeight: NSLayoutConstraint!
48 @IBOutlet weak var rewardsLabel: UILabel! 49 @IBOutlet weak var rewardsLabel: UILabel!
49 @IBOutlet weak var sumBadgeImage: UIImageView! 50 @IBOutlet weak var sumBadgeImage: UIImageView!
50 @IBOutlet weak var sumBadgeLabel: UILabel! 51 @IBOutlet weak var sumBadgeLabel: UILabel!
...@@ -433,8 +434,10 @@ import SwiftEventBus ...@@ -433,8 +434,10 @@ import SwiftEventBus
433 // TODO: FIX emptyView check - add market badge check 434 // TODO: FIX emptyView check - add market badge check
434 if (totalCouponValue == 0.0 && loyaltyBadge._couponCount == 0) { 435 if (totalCouponValue == 0.0 && loyaltyBadge._couponCount == 0) {
435 rewardsView.isHidden = true 436 rewardsView.isHidden = true
437 + rewardsViewHeight.constant = 0
436 } else { 438 } else {
437 rewardsView.isHidden = false 439 rewardsView.isHidden = false
440 + rewardsViewHeight.constant = rewardsView.intrinsicContentSize.height
438 } 441 }
439 442
440 // TODO: FIX emptyView check - add market badge check 443 // TODO: FIX emptyView check - add market badge check
......