open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
2352f505 1 parent fdca785a

Added no vouchers UI in myRewards

Inline Side-by-side
Showing 5 changed files with 77 additions and 32 deletions
...@@ -2644,23 +2644,23 @@ ...@@ -2644,23 +2644,23 @@
2644 </connections> 2644 </connections>
2645 </tableViewCell> 2645 </tableViewCell>
2646 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponsTableViewCellId" id="DUH-nG-QWi" customClass="UnifiedCouponsTableViewCell" customModule="SwiftWarplyFramework"> 2646 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponsTableViewCellId" id="DUH-nG-QWi" customClass="UnifiedCouponsTableViewCell" customModule="SwiftWarplyFramework">
2647 - <rect key="frame" x="0.0" y="883" width="414" height="64.5"/> 2647 + <rect key="frame" x="0.0" y="883" width="414" height="44"/>
2648 <autoresizingMask key="autoresizingMask"/> 2648 <autoresizingMask key="autoresizingMask"/>
2649 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DUH-nG-QWi" id="rx6-wA-MYI"> 2649 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DUH-nG-QWi" id="rx6-wA-MYI">
2650 - <rect key="frame" x="0.0" y="0.0" width="414" height="64.5"/> 2650 + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
2651 <autoresizingMask key="autoresizingMask"/> 2651 <autoresizingMask key="autoresizingMask"/>
2652 <subviews> 2652 <subviews>
2653 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WW2-mP-ZJD"> 2653 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WW2-mP-ZJD">
2654 - <rect key="frame" x="10" y="0.0" width="394" height="64.5"/> 2654 + <rect key="frame" x="10" y="0.0" width="394" height="44"/>
2655 <subviews> 2655 <subviews>
2656 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Gde-3J-Ew9"> 2656 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupon_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Gde-3J-Ew9">
2657 - <rect key="frame" x="0.0" y="0.0" width="394" height="64.5"/> 2657 + <rect key="frame" x="0.0" y="0.0" width="394" height="44"/>
2658 </imageView> 2658 </imageView>
2659 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87q-5c-uea"> 2659 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87q-5c-uea">
2660 - <rect key="frame" x="20" y="10" width="79" height="44.5"/> 2660 + <rect key="frame" x="20" y="10" width="79" height="24"/>
2661 <subviews> 2661 <subviews>
2662 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XsA-Nw-7Pr"> 2662 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XsA-Nw-7Pr">
2663 - <rect key="frame" x="18" y="18" width="43" height="8.5"/> 2663 + <rect key="frame" x="18" y="18" width="43" height="0.0"/>
2664 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2664 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2665 </imageView> 2665 </imageView>
2666 </subviews> 2666 </subviews>
...@@ -2673,7 +2673,7 @@ ...@@ -2673,7 +2673,7 @@
2673 </constraints> 2673 </constraints>
2674 </view> 2674 </view>
2675 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u97-5H-Y40"> 2675 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u97-5H-Y40">
2676 - <rect key="frame" x="104" y="10" width="10" height="44.5"/> 2676 + <rect key="frame" x="104" y="10" width="10" height="24"/>
2677 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2677 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2678 <constraints> 2678 <constraints>
2679 <constraint firstAttribute="width" constant="10" id="Tcx-FG-KC0"/> 2679 <constraint firstAttribute="width" constant="10" id="Tcx-FG-KC0"/>
...@@ -2686,13 +2686,13 @@ ...@@ -2686,13 +2686,13 @@
2686 <nil key="highlightedColor"/> 2686 <nil key="highlightedColor"/>
2687 </label> 2687 </label>
2688 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t"> 2688 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJD-Db-B4t">
2689 - <rect key="frame" x="292.5" y="25" width="81.5" height="15"/> 2689 + <rect key="frame" x="292.5" y="14.5" width="81.5" height="15"/>
2690 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2690 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2691 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2691 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2692 <nil key="highlightedColor"/> 2692 <nil key="highlightedColor"/>
2693 </label> 2693 </label>
2694 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO"> 2694 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C5t-xz-oAO">
2695 - <rect key="frame" x="119" y="34.5" width="255" height="15"/> 2695 + <rect key="frame" x="119" y="14" width="255" height="15"/>
2696 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2696 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2697 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2697 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2698 <nil key="highlightedColor"/> 2698 <nil key="highlightedColor"/>
...@@ -2742,7 +2742,7 @@ ...@@ -2742,7 +2742,7 @@
2742 </connections> 2742 </connections>
2743 </tableViewCell> 2743 </tableViewCell>
2744 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBadgesTableViewCellId" id="TeS-tP-Ilh" customClass="WalletBadgesTableViewCell" customModule="SwiftWarplyFramework"> 2744 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBadgesTableViewCellId" id="TeS-tP-Ilh" customClass="WalletBadgesTableViewCell" customModule="SwiftWarplyFramework">
2745 - <rect key="frame" x="0.0" y="947.5" width="414" height="260"/> 2745 + <rect key="frame" x="0.0" y="927" width="414" height="260"/>
2746 <autoresizingMask key="autoresizingMask"/> 2746 <autoresizingMask key="autoresizingMask"/>
2747 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TeS-tP-Ilh" id="FFV-uA-HHA"> 2747 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TeS-tP-Ilh" id="FFV-uA-HHA">
2748 <rect key="frame" x="0.0" y="0.0" width="414" height="260"/> 2748 <rect key="frame" x="0.0" y="0.0" width="414" height="260"/>
...@@ -2969,7 +2969,7 @@ ...@@ -2969,7 +2969,7 @@
2969 </connections> 2969 </connections>
2970 </tableViewCell> 2970 </tableViewCell>
2971 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBannersTableViewCellId" id="fgI-zL-RPZ" customClass="WalletBannersTableViewCell" customModule="SwiftWarplyFramework"> 2971 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletBannersTableViewCellId" id="fgI-zL-RPZ" customClass="WalletBannersTableViewCell" customModule="SwiftWarplyFramework">
2972 - <rect key="frame" x="0.0" y="1207.5" width="414" height="404"/> 2972 + <rect key="frame" x="0.0" y="1187" width="414" height="404"/>
2973 <autoresizingMask key="autoresizingMask"/> 2973 <autoresizingMask key="autoresizingMask"/>
2974 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fgI-zL-RPZ" id="gNB-PU-R1J"> 2974 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fgI-zL-RPZ" id="gNB-PU-R1J">
2975 <rect key="frame" x="0.0" y="0.0" width="414" height="404"/> 2975 <rect key="frame" x="0.0" y="0.0" width="414" height="404"/>
...@@ -3337,7 +3337,7 @@ ...@@ -3337,7 +3337,7 @@
3337 </connections> 3337 </connections>
3338 </tableViewCell> 3338 </tableViewCell>
3339 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletActiveCouponsTableViewCellId" id="qaY-Zw-d8E" customClass="WalletActiveCouponsTableViewCell" customModule="SwiftWarplyFramework"> 3339 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletActiveCouponsTableViewCellId" id="qaY-Zw-d8E" customClass="WalletActiveCouponsTableViewCell" customModule="SwiftWarplyFramework">
3340 - <rect key="frame" x="0.0" y="1611.5" width="414" height="103"/> 3340 + <rect key="frame" x="0.0" y="1591" width="414" height="103"/>
3341 <autoresizingMask key="autoresizingMask"/> 3341 <autoresizingMask key="autoresizingMask"/>
3342 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qaY-Zw-d8E" id="MoF-lG-k6u"> 3342 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qaY-Zw-d8E" id="MoF-lG-k6u">
3343 <rect key="frame" x="0.0" y="0.0" width="414" height="103"/> 3343 <rect key="frame" x="0.0" y="0.0" width="414" height="103"/>
...@@ -3620,7 +3620,7 @@ ...@@ -3620,7 +3620,7 @@
3620 </connections> 3620 </connections>
3621 </tableViewCell> 3621 </tableViewCell>
3622 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletVouchersBannerTableViewCellId" id="F1i-u5-1v2" customClass="WalletVouchersBannerTableViewCell" customModule="SwiftWarplyFramework"> 3622 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletVouchersBannerTableViewCellId" id="F1i-u5-1v2" customClass="WalletVouchersBannerTableViewCell" customModule="SwiftWarplyFramework">
3623 - <rect key="frame" x="0.0" y="1714.5" width="414" height="181"/> 3623 + <rect key="frame" x="0.0" y="1694" width="414" height="181"/>
3624 <autoresizingMask key="autoresizingMask"/> 3624 <autoresizingMask key="autoresizingMask"/>
3625 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F1i-u5-1v2" id="q9T-Eg-Gxw"> 3625 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F1i-u5-1v2" id="q9T-Eg-Gxw">
3626 <rect key="frame" x="0.0" y="0.0" width="414" height="181"/> 3626 <rect key="frame" x="0.0" y="0.0" width="414" height="181"/>
...@@ -3653,11 +3653,29 @@ ...@@ -3653,11 +3653,29 @@
3653 </constraints> 3653 </constraints>
3654 </imageView> 3654 </imageView>
3655 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Υπόλοιπο επιδότησης" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2p1-v2-lAL"> 3655 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Υπόλοιπο επιδότησης" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2p1-v2-lAL">
3656 - <rect key="frame" x="66" y="28" width="263" height="20"/> 3656 + <rect key="frame" x="66" y="28" width="164" height="20"/>
3657 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> 3657 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/>
3658 <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> 3658 <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
3659 <nil key="highlightedColor"/> 3659 <nil key="highlightedColor"/>
3660 </label> 3660 </label>
3661 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AKD-A9-ah0">
3662 + <rect key="frame" x="230" y="19" width="17.5" height="18"/>
3663 + <subviews>
3664 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BwW-J2-1Sz">
3665 + <rect key="frame" x="5" y="2" width="7.5" height="14"/>
3666 + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="11"/>
3667 + <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
3668 + <nil key="highlightedColor"/>
3669 + </label>
3670 + </subviews>
3671 + <color key="backgroundColor" red="0.91764705879999997" green="0.74901960779999999" blue="0.40784313729999999" alpha="1" colorSpace="calibratedRGB"/>
3672 + <constraints>
3673 + <constraint firstItem="BwW-J2-1Sz" firstAttribute="top" secondItem="AKD-A9-ah0" secondAttribute="top" constant="2" id="P9j-kH-8X7"/>
3674 + <constraint firstAttribute="bottom" secondItem="BwW-J2-1Sz" secondAttribute="bottom" constant="2" id="eI0-YG-mRB"/>
3675 + <constraint firstItem="BwW-J2-1Sz" firstAttribute="leading" secondItem="AKD-A9-ah0" secondAttribute="leading" constant="5" id="hlf-PL-cVe"/>
3676 + <constraint firstAttribute="trailing" secondItem="BwW-J2-1Sz" secondAttribute="trailing" constant="5" id="ncp-fn-LRV"/>
3677 + </constraints>
3678 + </view>
3661 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cSu-mM-1Ep"> 3679 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cSu-mM-1Ep">
3662 <rect key="frame" x="334" y="28" width="20" height="20"/> 3680 <rect key="frame" x="334" y="28" width="20" height="20"/>
3663 <constraints> 3681 <constraints>
...@@ -3668,14 +3686,16 @@ ...@@ -3668,14 +3686,16 @@
3668 </subviews> 3686 </subviews>
3669 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 3687 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3670 <constraints> 3688 <constraints>
3671 - <constraint firstItem="cSu-mM-1Ep" firstAttribute="leading" secondItem="2p1-v2-lAL" secondAttribute="trailing" constant="5" id="0RF-Lr-hdi"/> 3689 + <constraint firstItem="cSu-mM-1Ep" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2p1-v2-lAL" secondAttribute="trailing" constant="5" id="0RF-Lr-hdi"/>
3672 <constraint firstItem="U9f-Ar-TCE" firstAttribute="top" secondItem="eBr-vb-7oH" secondAttribute="top" constant="20" id="Gnc-a7-lVn"/> 3690 <constraint firstItem="U9f-Ar-TCE" firstAttribute="top" secondItem="eBr-vb-7oH" secondAttribute="top" constant="20" id="Gnc-a7-lVn"/>
3673 <constraint firstItem="U9f-Ar-TCE" firstAttribute="leading" secondItem="eBr-vb-7oH" secondAttribute="leading" constant="20" id="O3t-rA-Xoi"/> 3691 <constraint firstItem="U9f-Ar-TCE" firstAttribute="leading" secondItem="eBr-vb-7oH" secondAttribute="leading" constant="20" id="O3t-rA-Xoi"/>
3674 <constraint firstItem="2p1-v2-lAL" firstAttribute="centerY" secondItem="U9f-Ar-TCE" secondAttribute="centerY" id="bWi-vx-lud"/> 3692 <constraint firstItem="2p1-v2-lAL" firstAttribute="centerY" secondItem="U9f-Ar-TCE" secondAttribute="centerY" id="bWi-vx-lud"/>
3675 <constraint firstItem="cSu-mM-1Ep" firstAttribute="centerY" secondItem="U9f-Ar-TCE" secondAttribute="centerY" id="bwI-YH-DDm"/> 3693 <constraint firstItem="cSu-mM-1Ep" firstAttribute="centerY" secondItem="U9f-Ar-TCE" secondAttribute="centerY" id="bwI-YH-DDm"/>
3676 <constraint firstAttribute="trailing" secondItem="cSu-mM-1Ep" secondAttribute="trailing" constant="20" id="fLn-8r-nUC"/> 3694 <constraint firstAttribute="trailing" secondItem="cSu-mM-1Ep" secondAttribute="trailing" constant="20" id="fLn-8r-nUC"/>
3695 + <constraint firstItem="AKD-A9-ah0" firstAttribute="leading" secondItem="2p1-v2-lAL" secondAttribute="trailing" id="hZ8-wn-M57"/>
3677 <constraint firstAttribute="bottom" secondItem="U9f-Ar-TCE" secondAttribute="bottom" constant="20" id="jCC-NV-1nD"/> 3696 <constraint firstAttribute="bottom" secondItem="U9f-Ar-TCE" secondAttribute="bottom" constant="20" id="jCC-NV-1nD"/>
3678 <constraint firstItem="2p1-v2-lAL" firstAttribute="leading" secondItem="U9f-Ar-TCE" secondAttribute="trailing" constant="10" id="kv2-9q-gc9"/> 3697 <constraint firstItem="2p1-v2-lAL" firstAttribute="leading" secondItem="U9f-Ar-TCE" secondAttribute="trailing" constant="10" id="kv2-9q-gc9"/>
3698 + <constraint firstItem="AKD-A9-ah0" firstAttribute="centerY" secondItem="2p1-v2-lAL" secondAttribute="centerY" constant="-10" id="vGu-1o-rr0"/>
3679 </constraints> 3699 </constraints>
3680 </view> 3700 </view>
3681 </subviews> 3701 </subviews>
...@@ -3710,20 +3730,21 @@ ...@@ -3710,20 +3730,21 @@
3710 <outlet property="voucherBannerIconImage" destination="U9f-Ar-TCE" id="cy8-jG-sg7"/> 3730 <outlet property="voucherBannerIconImage" destination="U9f-Ar-TCE" id="cy8-jG-sg7"/>
3711 <outlet property="voucherBannerLabel" destination="2p1-v2-lAL" id="Wlm-z2-nrW"/> 3731 <outlet property="voucherBannerLabel" destination="2p1-v2-lAL" id="Wlm-z2-nrW"/>
3712 <outlet property="voucherBannerView" destination="eBr-vb-7oH" id="RU1-Lx-048"/> 3732 <outlet property="voucherBannerView" destination="eBr-vb-7oH" id="RU1-Lx-048"/>
3733 + <outlet property="voucherCountView" destination="AKD-A9-ah0" id="dEs-FI-5Ns"/>
3713 </connections> 3734 </connections>
3714 </tableViewCell> 3735 </tableViewCell>
3715 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletSpinnerTableViewCellId" id="ShU-xo-DhW" customClass="WalletSpinnerTableViewCell" customModule="SwiftWarplyFramework"> 3736 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletSpinnerTableViewCellId" id="ShU-xo-DhW" customClass="WalletSpinnerTableViewCell" customModule="SwiftWarplyFramework">
3716 - <rect key="frame" x="0.0" y="1895.5" width="414" height="98"/> 3737 + <rect key="frame" x="0.0" y="1875" width="414" height="88"/>
3717 <autoresizingMask key="autoresizingMask"/> 3738 <autoresizingMask key="autoresizingMask"/>
3718 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ShU-xo-DhW" id="U4r-xF-gbA"> 3739 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ShU-xo-DhW" id="U4r-xF-gbA">
3719 - <rect key="frame" x="0.0" y="0.0" width="414" height="98"/> 3740 + <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
3720 <autoresizingMask key="autoresizingMask"/> 3741 <autoresizingMask key="autoresizingMask"/>
3721 <subviews> 3742 <subviews>
3722 <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hm4-ma-8T7" userLabel="ParentView"> 3743 <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hm4-ma-8T7" userLabel="ParentView">
3723 - <rect key="frame" x="0.0" y="0.0" width="414" height="98"/> 3744 + <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
3724 <subviews> 3745 <subviews>
3725 <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="Kes-eE-1K8"> 3746 <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="Kes-eE-1K8">
3726 - <rect key="frame" x="183" y="30" width="48" height="48"/> 3747 + <rect key="frame" x="183" y="20" width="48" height="48"/>
3727 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 3748 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3728 <constraints> 3749 <constraints>
3729 <constraint firstAttribute="height" constant="48" id="MxX-gd-WB6"/> 3750 <constraint firstAttribute="height" constant="48" id="MxX-gd-WB6"/>
......
...@@ -93,6 +93,8 @@ import SwiftEventBus ...@@ -93,6 +93,8 @@ import SwiftEventBus
93 self.coupons = swiftApi().getCouponList() 93 self.coupons = swiftApi().getCouponList()
94 self.totalCouponDiscount = Float(round(100 * swiftApi().getLoyaltyBadge()._value) / 100) 94 self.totalCouponDiscount = Float(round(100 * swiftApi().getLoyaltyBadge()._value) / 100)
95 self.loyaltyBadge = swiftApi().getLoyaltyBadge() 95 self.loyaltyBadge = swiftApi().getLoyaltyBadge()
96 +
97 + self.handleSpinnerAndEmptyView()
96 self.tableView.reloadData() 98 self.tableView.reloadData()
97 } 99 }
98 } 100 }
...@@ -753,7 +755,7 @@ import SwiftEventBus ...@@ -753,7 +755,7 @@ import SwiftEventBus
753 if (self.dfyCoupons.count == 0 && self.unifiedCoupons.count == 0 && self.coupons.count == 0) { 755 if (self.dfyCoupons.count == 0 && self.unifiedCoupons.count == 0 && self.coupons.count == 0) {
754 self.showActiveCouponsBanners = false 756 self.showActiveCouponsBanners = false
755 757
756 - if (swiftApi().getShowVouchersBanner() == "false") { 758 + if (swiftApi().getShowVouchersBanner() == "null") {
757 self.emptyView.isHidden = false 759 self.emptyView.isHidden = false
758 self.emptyViewHeight.constant = self.emptyView.intrinsicContentSize.height 760 self.emptyViewHeight.constant = self.emptyView.intrinsicContentSize.height
759 761
...@@ -1058,7 +1060,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -1058,7 +1060,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
1058 return 0 1060 return 0
1059 } 1061 }
1060 } else if (section == 1) { 1062 } else if (section == 1) {
1061 - if (swiftApi().getShowVouchersBanner() == "true") { 1063 + if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") {
1062 return 1 1064 return 1
1063 } else { 1065 } else {
1064 return 0 1066 return 0
...@@ -1112,7 +1114,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -1112,7 +1114,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
1112 return 0.0 1114 return 0.0
1113 } 1115 }
1114 } else if (indexPath.section == 1) { 1116 } else if (indexPath.section == 1) {
1115 - if (swiftApi().getShowVouchersBanner() == "true") { 1117 + if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") {
1116 return UITableView.automaticDimension 1118 return UITableView.automaticDimension
1117 } else { 1119 } else {
1118 return 0.0 1120 return 0.0
...@@ -1208,7 +1210,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -1208,7 +1210,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
1208 return nil 1210 return nil
1209 } 1211 }
1210 } else if (section == 1) { 1212 } else if (section == 1) {
1211 -// if (swiftApi().getShowVouchersBanner() == "true") { 1213 +// if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") {
1212 // let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 70)) 1214 // let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 70))
1213 // view.backgroundColor = .clear 1215 // view.backgroundColor = .clear
1214 1216
...@@ -1268,7 +1270,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -1268,7 +1270,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
1268 return 0.0 1270 return 0.0
1269 } 1271 }
1270 } else if (section == 1) { 1272 } else if (section == 1) {
1271 -// if (swiftApi().getShowVouchersBanner() == "true") { 1273 +// if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") {
1272 // return 70.0 1274 // return 70.0
1273 // } else { 1275 // } else {
1274 return 0.0 1276 return 0.0
...@@ -1322,7 +1324,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ ...@@ -1322,7 +1324,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
1322 1324
1323 } else if (indexPath.section == 1) { 1325 } else if (indexPath.section == 1) {
1324 let cell = tableView.dequeueReusableCell(withIdentifier: "WalletVouchersBannerTableViewCellId", for: indexPath) as! WalletVouchersBannerTableViewCell 1326 let cell = tableView.dequeueReusableCell(withIdentifier: "WalletVouchersBannerTableViewCellId", for: indexPath) as! WalletVouchersBannerTableViewCell
1325 - cell.configureCell(showSeparator: self.showActiveCouponsBanners) 1327 + cell.configureCell(showSeparator: self.showActiveCouponsBanners, active: swiftApi().getShowVouchersBanner() == "true")
1326 return cell 1328 return cell
1327 } else { 1329 } else {
1328 let cell = tableView.dequeueReusableCell(withIdentifier: "WalletSpinnerTableViewCellId", for: indexPath) as! WalletSpinnerTableViewCell 1330 let cell = tableView.dequeueReusableCell(withIdentifier: "WalletSpinnerTableViewCellId", for: indexPath) as! WalletSpinnerTableViewCell
......
...@@ -15,6 +15,7 @@ import UIKit ...@@ -15,6 +15,7 @@ import UIKit
15 @IBOutlet weak var voucherBannerIconImage: UIImageView! 15 @IBOutlet weak var voucherBannerIconImage: UIImageView!
16 @IBOutlet weak var voucherBannerLabel: UILabel! 16 @IBOutlet weak var voucherBannerLabel: UILabel!
17 @IBOutlet weak var voucherBannerArrowImage: UIImageView! 17 @IBOutlet weak var voucherBannerArrowImage: UIImageView!
18 + @IBOutlet weak var voucherCountView: UIView!
18 19
19 public override func awakeFromNib() { 20 public override func awakeFromNib() {
20 super.awakeFromNib() 21 super.awakeFromNib()
...@@ -35,7 +36,10 @@ import UIKit ...@@ -35,7 +36,10 @@ import UIKit
35 voucherBannerIconImage.image = UIImage(named: "wallet_voucher", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 36 voucherBannerIconImage.image = UIImage(named: "wallet_voucher", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
36 voucherBannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 37 voucherBannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
37 38
38 - voucherBannerLabel.text = "Ενημερώσου για το υπόλοιπο επιδότησης" 39 +// voucherBannerLabel.text = "Ενημερώσου για το υπόλοιπο επιδότησης"
40 +
41 + voucherCountView.layer.cornerRadius = 4.0
42 + voucherCountView.backgroundColor = UIColor(red: 0.92, green: 0.75, blue: 0.41, alpha: 1.00)
39 } 43 }
40 44
41 public override func setSelected(_ selected: Bool, animated: Bool) { 45 public override func setSelected(_ selected: Bool, animated: Bool) {
...@@ -44,7 +48,7 @@ import UIKit ...@@ -44,7 +48,7 @@ import UIKit
44 // Configure the view for the selected state 48 // Configure the view for the selected state
45 } 49 }
46 50
47 - func configureCell(showSeparator: Bool) { 51 + func configureCell(showSeparator: Bool, active: Bool) {
48 if (showSeparator == true) { 52 if (showSeparator == true) {
49 separatorView.isHidden = false 53 separatorView.isHidden = false
50 separatorTopSpace.constant = 25 54 separatorTopSpace.constant = 25
...@@ -53,6 +57,25 @@ import UIKit ...@@ -53,6 +57,25 @@ import UIKit
53 separatorView.isHidden = true 57 separatorView.isHidden = true
54 separatorTopSpace.constant = 0 58 separatorTopSpace.constant = 0
55 } 59 }
60 +
61 + if (active == true) {
62 + voucherBannerView.backgroundColor = .white
63 + voucherBannerIconImage.image = voucherBannerIconImage.image?.withRenderingMode(.alwaysTemplate)
64 + voucherBannerIconImage.tintColor = UIColor(red: 0.00, green: 0.65, blue: 0.89, alpha: 1.00)
65 + voucherBannerLabel.text = "Ενημερώσου για το υπόλοιπο επιδότησης"
66 + voucherBannerLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00)
67 + voucherBannerLabel.frame.size.width = voucherBannerLabel.intrinsicContentSize.width
68 + voucherCountView.isHidden = true
69 +
70 + } else {
71 + voucherBannerView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00)
72 + voucherBannerIconImage.image = voucherBannerIconImage.image?.withRenderingMode(.alwaysTemplate)
73 + voucherBannerIconImage.tintColor = UIColor(red: 0.52, green: 0.52, blue: 0.52, alpha: 1.00)
74 + voucherBannerLabel.text = "Διαθέσιμο υπόλοιπο"
75 + voucherBannerLabel.textColor = UIColor(red: 0.52, green: 0.52, blue: 0.52, alpha: 1.00)
76 + voucherBannerLabel.frame.size.width = voucherBannerLabel.intrinsicContentSize.width
77 + voucherCountView.isHidden = false
78 + }
56 } 79 }
57 80
58 } 81 }
......
...@@ -183,11 +183,10 @@ public class swiftApi { ...@@ -183,11 +183,10 @@ public class swiftApi {
183 } 183 }
184 184
185 185
186 - public func setVouchersFetched(_ success: Bool) -> Void { 186 + public func setVouchersFetched(_ success: String) -> Void {
187 - if (success == true) { 187 + // Possible values "true", "false", "null"
188 - setShowVouchersBanner("true") 188 + if (success == "true" || success == "false" || success == "null") {
189 - } else { 189 + setShowVouchersBanner(success)
190 - setShowVouchersBanner("false")
191 } 190 }
192 191
193 SwiftEventBus.post("vouchers_fetched") 192 SwiftEventBus.post("vouchers_fetched")
......