Showing
5 changed files
with
270 additions
and
124 deletions
No preview for this file type
| ... | @@ -3368,15 +3368,71 @@ | ... | @@ -3368,15 +3368,71 @@ |
| 3368 | </connections> | 3368 | </connections> |
| 3369 | </tableViewCell> | 3369 | </tableViewCell> |
| 3370 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletActiveCouponsTableViewCellId" id="qaY-Zw-d8E" customClass="WalletActiveCouponsTableViewCell" customModule="SwiftWarplyFramework"> | 3370 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletActiveCouponsTableViewCellId" id="qaY-Zw-d8E" customClass="WalletActiveCouponsTableViewCell" customModule="SwiftWarplyFramework"> |
| 3371 | - <rect key="frame" x="0.0" y="948.5" width="414" height="103"/> | 3371 | + <rect key="frame" x="0.0" y="948.5" width="414" height="175"/> |
| 3372 | <autoresizingMask key="autoresizingMask"/> | 3372 | <autoresizingMask key="autoresizingMask"/> |
| 3373 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qaY-Zw-d8E" id="MoF-lG-k6u"> | 3373 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qaY-Zw-d8E" id="MoF-lG-k6u"> |
| 3374 | - <rect key="frame" x="0.0" y="0.0" width="414" height="103"/> | 3374 | + <rect key="frame" x="0.0" y="0.0" width="414" height="175"/> |
| 3375 | <autoresizingMask key="autoresizingMask"/> | 3375 | <autoresizingMask key="autoresizingMask"/> |
| 3376 | <subviews> | 3376 | <subviews> |
| 3377 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t2C-9l-nWs" userLabel="ParentView"> | 3377 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t2C-9l-nWs" userLabel="ParentView"> |
| 3378 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 3378 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
| 3379 | <subviews> | 3379 | <subviews> |
| 3380 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gO0-Pa-kWS" userLabel="SectionHeaderView"> | ||
| 3381 | + <rect key="frame" x="20" y="0.0" width="374" height="0.0"/> | ||
| 3382 | + <subviews> | ||
| 3383 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Κουπόνια" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IXl-Ba-HgN"> | ||
| 3384 | + <rect key="frame" x="0.0" y="25" width="330" height="0.0"/> | ||
| 3385 | + <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="19"/> | ||
| 3386 | + <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | ||
| 3387 | + <nil key="highlightedColor"/> | ||
| 3388 | + </label> | ||
| 3389 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P3a-gV-vNS"> | ||
| 3390 | + <rect key="frame" x="330" y="0.0" width="44" height="0.0"/> | ||
| 3391 | + <subviews> | ||
| 3392 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XbI-ey-mgh"> | ||
| 3393 | + <rect key="frame" x="10" y="-12" width="24" height="24"/> | ||
| 3394 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 3395 | + <constraints> | ||
| 3396 | + <constraint firstAttribute="height" constant="24" id="c60-7W-8Dq"/> | ||
| 3397 | + <constraint firstAttribute="width" constant="24" id="lso-Fs-WSe"/> | ||
| 3398 | + </constraints> | ||
| 3399 | + </imageView> | ||
| 3400 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YMc-Qb-txy"> | ||
| 3401 | + <rect key="frame" x="0.0" y="0.0" width="44" height="0.0"/> | ||
| 3402 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 3403 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/> | ||
| 3404 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | ||
| 3405 | + <state key="normal" title="Button"> | ||
| 3406 | + <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 3407 | + </state> | ||
| 3408 | + <connections> | ||
| 3409 | + <action selector="historyButtonAction:" destination="pKQ-52-a1r" eventType="touchUpInside" id="2px-ZM-YHR"/> | ||
| 3410 | + </connections> | ||
| 3411 | + </button> | ||
| 3412 | + </subviews> | ||
| 3413 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 3414 | + <constraints> | ||
| 3415 | + <constraint firstItem="XbI-ey-mgh" firstAttribute="centerY" secondItem="P3a-gV-vNS" secondAttribute="centerY" id="2tl-Fg-2nj"/> | ||
| 3416 | + <constraint firstItem="YMc-Qb-txy" firstAttribute="top" secondItem="P3a-gV-vNS" secondAttribute="top" id="6hy-YM-NSe"/> | ||
| 3417 | + <constraint firstItem="YMc-Qb-txy" firstAttribute="leading" secondItem="P3a-gV-vNS" secondAttribute="leading" id="8pR-JN-fjf"/> | ||
| 3418 | + <constraint firstAttribute="trailing" secondItem="YMc-Qb-txy" secondAttribute="trailing" id="HoG-j5-iZH"/> | ||
| 3419 | + <constraint firstAttribute="bottom" secondItem="YMc-Qb-txy" secondAttribute="bottom" id="ZNo-rt-yAX"/> | ||
| 3420 | + <constraint firstItem="XbI-ey-mgh" firstAttribute="leading" secondItem="P3a-gV-vNS" secondAttribute="leading" constant="10" id="p2w-3D-9AC"/> | ||
| 3421 | + <constraint firstAttribute="trailing" secondItem="XbI-ey-mgh" secondAttribute="trailing" constant="10" id="xxh-q5-Bog"/> | ||
| 3422 | + </constraints> | ||
| 3423 | + </view> | ||
| 3424 | + </subviews> | ||
| 3425 | + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 3426 | + <constraints> | ||
| 3427 | + <constraint firstItem="P3a-gV-vNS" firstAttribute="top" secondItem="gO0-Pa-kWS" secondAttribute="top" id="JTJ-8p-I0c"/> | ||
| 3428 | + <constraint firstAttribute="bottom" secondItem="P3a-gV-vNS" secondAttribute="bottom" id="Pe0-Hf-DHg"/> | ||
| 3429 | + <constraint firstItem="P3a-gV-vNS" firstAttribute="leading" secondItem="IXl-Ba-HgN" secondAttribute="trailing" id="eZy-dP-0g7"/> | ||
| 3430 | + <constraint firstAttribute="bottom" secondItem="IXl-Ba-HgN" secondAttribute="bottom" constant="25" id="kYf-kX-sEz"/> | ||
| 3431 | + <constraint firstItem="IXl-Ba-HgN" firstAttribute="top" secondItem="gO0-Pa-kWS" secondAttribute="top" constant="25" id="mDJ-pl-bbB"/> | ||
| 3432 | + <constraint firstItem="IXl-Ba-HgN" firstAttribute="leading" secondItem="gO0-Pa-kWS" secondAttribute="leading" id="mYS-4d-RkY"/> | ||
| 3433 | + <constraint firstAttribute="trailing" secondItem="P3a-gV-vNS" secondAttribute="trailing" id="ydM-MC-abC"/> | ||
| 3434 | + </constraints> | ||
| 3435 | + </view> | ||
| 3380 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ago-Pf-BGo"> | 3436 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ago-Pf-BGo"> |
| 3381 | <rect key="frame" x="20" y="3" width="111.5" height="38"/> | 3437 | <rect key="frame" x="20" y="3" width="111.5" height="38"/> |
| 3382 | <subviews> | 3438 | <subviews> |
| ... | @@ -3608,17 +3664,20 @@ | ... | @@ -3608,17 +3664,20 @@ |
| 3608 | </subviews> | 3664 | </subviews> |
| 3609 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3665 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 3610 | <constraints> | 3666 | <constraints> |
| 3667 | + <constraint firstAttribute="trailing" secondItem="gO0-Pa-kWS" secondAttribute="trailing" constant="20" id="2z1-Bc-QDh"/> | ||
| 3611 | <constraint firstAttribute="bottom" secondItem="gZG-f4-H22" secondAttribute="bottom" constant="3" id="AhC-oY-oF3"/> | 3668 | <constraint firstAttribute="bottom" secondItem="gZG-f4-H22" secondAttribute="bottom" constant="3" id="AhC-oY-oF3"/> |
| 3612 | <constraint firstAttribute="trailing" secondItem="hW7-Fh-jaW" secondAttribute="trailing" constant="20" id="E3i-Y4-mVj"/> | 3669 | <constraint firstAttribute="trailing" secondItem="hW7-Fh-jaW" secondAttribute="trailing" constant="20" id="E3i-Y4-mVj"/> |
| 3613 | - <constraint firstItem="gZG-f4-H22" firstAttribute="top" secondItem="t2C-9l-nWs" secondAttribute="top" constant="3" id="KPV-Rj-PJv"/> | 3670 | + <constraint firstItem="gZG-f4-H22" firstAttribute="top" secondItem="gO0-Pa-kWS" secondAttribute="bottom" constant="3" id="KPV-Rj-PJv"/> |
| 3614 | <constraint firstAttribute="bottom" secondItem="Ago-Pf-BGo" secondAttribute="bottom" constant="3" id="KhN-mk-jlA"/> | 3671 | <constraint firstAttribute="bottom" secondItem="Ago-Pf-BGo" secondAttribute="bottom" constant="3" id="KhN-mk-jlA"/> |
| 3615 | <constraint firstItem="gZG-f4-H22" firstAttribute="width" secondItem="Ago-Pf-BGo" secondAttribute="width" id="PUN-Vu-fVw"/> | 3672 | <constraint firstItem="gZG-f4-H22" firstAttribute="width" secondItem="Ago-Pf-BGo" secondAttribute="width" id="PUN-Vu-fVw"/> |
| 3616 | - <constraint firstItem="Ago-Pf-BGo" firstAttribute="top" secondItem="t2C-9l-nWs" secondAttribute="top" constant="3" id="UAL-d1-YPB"/> | 3673 | + <constraint firstItem="gO0-Pa-kWS" firstAttribute="top" secondItem="t2C-9l-nWs" secondAttribute="top" id="T9h-2A-Mlu"/> |
| 3674 | + <constraint firstItem="Ago-Pf-BGo" firstAttribute="top" secondItem="gO0-Pa-kWS" secondAttribute="bottom" constant="3" id="UAL-d1-YPB"/> | ||
| 3617 | <constraint firstItem="hW7-Fh-jaW" firstAttribute="width" secondItem="Ago-Pf-BGo" secondAttribute="width" id="Yfd-mp-doF"/> | 3675 | <constraint firstItem="hW7-Fh-jaW" firstAttribute="width" secondItem="Ago-Pf-BGo" secondAttribute="width" id="Yfd-mp-doF"/> |
| 3618 | <constraint firstItem="gZG-f4-H22" firstAttribute="leading" secondItem="Ago-Pf-BGo" secondAttribute="trailing" constant="20" id="cri-7i-oKr"/> | 3676 | <constraint firstItem="gZG-f4-H22" firstAttribute="leading" secondItem="Ago-Pf-BGo" secondAttribute="trailing" constant="20" id="cri-7i-oKr"/> |
| 3677 | + <constraint firstItem="gO0-Pa-kWS" firstAttribute="leading" secondItem="t2C-9l-nWs" secondAttribute="leading" constant="20" id="diF-4g-TLY"/> | ||
| 3619 | <constraint firstItem="hW7-Fh-jaW" firstAttribute="leading" secondItem="gZG-f4-H22" secondAttribute="trailing" constant="20" id="mPD-Yj-gS9"/> | 3678 | <constraint firstItem="hW7-Fh-jaW" firstAttribute="leading" secondItem="gZG-f4-H22" secondAttribute="trailing" constant="20" id="mPD-Yj-gS9"/> |
| 3620 | <constraint firstItem="Ago-Pf-BGo" firstAttribute="leading" secondItem="t2C-9l-nWs" secondAttribute="leading" constant="20" id="nWu-UL-F5g"/> | 3679 | <constraint firstItem="Ago-Pf-BGo" firstAttribute="leading" secondItem="t2C-9l-nWs" secondAttribute="leading" constant="20" id="nWu-UL-F5g"/> |
| 3621 | - <constraint firstItem="hW7-Fh-jaW" firstAttribute="top" secondItem="t2C-9l-nWs" secondAttribute="top" constant="3" id="nlA-fB-mNW"/> | 3680 | + <constraint firstItem="hW7-Fh-jaW" firstAttribute="top" secondItem="gO0-Pa-kWS" secondAttribute="bottom" constant="3" id="nlA-fB-mNW"/> |
| 3622 | <constraint firstAttribute="bottom" secondItem="hW7-Fh-jaW" secondAttribute="bottom" constant="3" id="tip-cx-cM6"/> | 3681 | <constraint firstAttribute="bottom" secondItem="hW7-Fh-jaW" secondAttribute="bottom" constant="3" id="tip-cx-cM6"/> |
| 3623 | </constraints> | 3682 | </constraints> |
| 3624 | </view> | 3683 | </view> |
| ... | @@ -3643,6 +3702,8 @@ | ... | @@ -3643,6 +3702,8 @@ |
| 3643 | <outlet property="gfyImage" destination="JSL-ST-Uzv" id="i2n-1U-2Sp"/> | 3702 | <outlet property="gfyImage" destination="JSL-ST-Uzv" id="i2n-1U-2Sp"/> |
| 3644 | <outlet property="gfyLabel" destination="QVo-4f-20j" id="0yc-bx-aFb"/> | 3703 | <outlet property="gfyLabel" destination="QVo-4f-20j" id="0yc-bx-aFb"/> |
| 3645 | <outlet property="gfyView" destination="hW7-Fh-jaW" id="APi-eV-QZx"/> | 3704 | <outlet property="gfyView" destination="hW7-Fh-jaW" id="APi-eV-QZx"/> |
| 3705 | + <outlet property="historyButtonImage" destination="XbI-ey-mgh" id="Iwb-qD-yGJ"/> | ||
| 3706 | + <outlet property="sectionTitleLabel" destination="IXl-Ba-HgN" id="NZo-DB-Kof"/> | ||
| 3646 | <outlet property="smCountLabel" destination="STg-je-8uL" id="KVj-g4-r9B"/> | 3707 | <outlet property="smCountLabel" destination="STg-je-8uL" id="KVj-g4-r9B"/> |
| 3647 | <outlet property="smCountView" destination="5lx-Id-hmz" id="6eQ-pm-3Kl"/> | 3708 | <outlet property="smCountView" destination="5lx-Id-hmz" id="6eQ-pm-3Kl"/> |
| 3648 | <outlet property="smImage" destination="qYJ-x0-9v3" id="Vhd-QA-uss"/> | 3709 | <outlet property="smImage" destination="qYJ-x0-9v3" id="Vhd-QA-uss"/> |
| ... | @@ -3651,7 +3712,7 @@ | ... | @@ -3651,7 +3712,7 @@ |
| 3651 | </connections> | 3712 | </connections> |
| 3652 | </tableViewCell> | 3713 | </tableViewCell> |
| 3653 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletVouchersBannerTableViewCellId" id="F1i-u5-1v2" customClass="WalletVouchersBannerTableViewCell" customModule="SwiftWarplyFramework"> | 3714 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletVouchersBannerTableViewCellId" id="F1i-u5-1v2" customClass="WalletVouchersBannerTableViewCell" customModule="SwiftWarplyFramework"> |
| 3654 | - <rect key="frame" x="0.0" y="1051.5" width="414" height="141"/> | 3715 | + <rect key="frame" x="0.0" y="1123.5" width="414" height="141"/> |
| 3655 | <autoresizingMask key="autoresizingMask"/> | 3716 | <autoresizingMask key="autoresizingMask"/> |
| 3656 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F1i-u5-1v2" id="q9T-Eg-Gxw"> | 3717 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F1i-u5-1v2" id="q9T-Eg-Gxw"> |
| 3657 | <rect key="frame" x="0.0" y="0.0" width="414" height="141"/> | 3718 | <rect key="frame" x="0.0" y="0.0" width="414" height="141"/> |
| ... | @@ -3673,24 +3734,24 @@ | ... | @@ -3673,24 +3734,24 @@ |
| 3673 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3734 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> |
| 3674 | <nil key="highlightedColor"/> | 3735 | <nil key="highlightedColor"/> |
| 3675 | </label> | 3736 | </label> |
| 3676 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eBr-vb-7oH"> | 3737 | + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eBr-vb-7oH"> |
| 3677 | - <rect key="frame" x="20" y="41" width="374" height="0.0"/> | 3738 | + <rect key="frame" x="20" y="72" width="374" height="66"/> |
| 3678 | <subviews> | 3739 | <subviews> |
| 3679 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="U9f-Ar-TCE"> | 3740 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U9f-Ar-TCE"> |
| 3680 | - <rect key="frame" x="20" y="18" width="30" height="0.0"/> | 3741 | + <rect key="frame" x="20" y="18" width="30" height="30"/> |
| 3681 | <constraints> | 3742 | <constraints> |
| 3682 | <constraint firstAttribute="width" constant="30" id="06g-Cm-Q4z"/> | 3743 | <constraint firstAttribute="width" constant="30" id="06g-Cm-Q4z"/> |
| 3683 | <constraint firstAttribute="height" constant="30" id="GoZ-qT-Whp"/> | 3744 | <constraint firstAttribute="height" constant="30" id="GoZ-qT-Whp"/> |
| 3684 | </constraints> | 3745 | </constraints> |
| 3685 | </imageView> | 3746 | </imageView> |
| 3686 | - <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"> | 3747 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Υπόλοιπο επιδότησης" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2p1-v2-lAL"> |
| 3687 | - <rect key="frame" x="60" y="8" width="164" height="20"/> | 3748 | + <rect key="frame" x="60" y="23" width="164" height="20"/> |
| 3688 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> | 3749 | <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> |
| 3689 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3750 | <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> |
| 3690 | <nil key="highlightedColor"/> | 3751 | <nil key="highlightedColor"/> |
| 3691 | </label> | 3752 | </label> |
| 3692 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AKD-A9-ah0"> | 3753 | + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AKD-A9-ah0"> |
| 3693 | - <rect key="frame" x="224" y="-1" width="17.5" height="18"/> | 3754 | + <rect key="frame" x="224" y="14" width="17.5" height="18"/> |
| 3694 | <subviews> | 3755 | <subviews> |
| 3695 | <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"> | 3756 | <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"> |
| 3696 | <rect key="frame" x="5" y="2" width="7.5" height="14"/> | 3757 | <rect key="frame" x="5" y="2" width="7.5" height="14"/> |
| ... | @@ -3707,8 +3768,8 @@ | ... | @@ -3707,8 +3768,8 @@ |
| 3707 | <constraint firstAttribute="trailing" secondItem="BwW-J2-1Sz" secondAttribute="trailing" constant="5" id="ncp-fn-LRV"/> | 3768 | <constraint firstAttribute="trailing" secondItem="BwW-J2-1Sz" secondAttribute="trailing" constant="5" id="ncp-fn-LRV"/> |
| 3708 | </constraints> | 3769 | </constraints> |
| 3709 | </view> | 3770 | </view> |
| 3710 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cSu-mM-1Ep"> | 3771 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cSu-mM-1Ep"> |
| 3711 | - <rect key="frame" x="337" y="9.5" width="17" height="17"/> | 3772 | + <rect key="frame" x="337" y="24.5" width="17" height="17"/> |
| 3712 | <constraints> | 3773 | <constraints> |
| 3713 | <constraint firstAttribute="height" constant="17" id="ATK-3R-8Yb"/> | 3774 | <constraint firstAttribute="height" constant="17" id="ATK-3R-8Yb"/> |
| 3714 | <constraint firstAttribute="width" constant="17" id="b27-KV-iS5"/> | 3775 | <constraint firstAttribute="width" constant="17" id="b27-KV-iS5"/> |
| ... | @@ -3770,7 +3831,7 @@ | ... | @@ -3770,7 +3831,7 @@ |
| 3770 | </connections> | 3831 | </connections> |
| 3771 | </tableViewCell> | 3832 | </tableViewCell> |
| 3772 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletSpinnerTableViewCellId" id="ShU-xo-DhW" customClass="WalletSpinnerTableViewCell" customModule="SwiftWarplyFramework"> | 3833 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletSpinnerTableViewCellId" id="ShU-xo-DhW" customClass="WalletSpinnerTableViewCell" customModule="SwiftWarplyFramework"> |
| 3773 | - <rect key="frame" x="0.0" y="1192.5" width="414" height="44"/> | 3834 | + <rect key="frame" x="0.0" y="1264.5" width="414" height="44"/> |
| 3774 | <autoresizingMask key="autoresizingMask"/> | 3835 | <autoresizingMask key="autoresizingMask"/> |
| 3775 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ShU-xo-DhW" id="U4r-xF-gbA"> | 3836 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ShU-xo-DhW" id="U4r-xF-gbA"> |
| 3776 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 3837 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
| ... | @@ -3810,7 +3871,7 @@ | ... | @@ -3810,7 +3871,7 @@ |
| 3810 | </connections> | 3871 | </connections> |
| 3811 | </tableViewCell> | 3872 | </tableViewCell> |
| 3812 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletQuestionnaireBannerTableViewCellId" id="AKr-2x-5Nd" customClass="WalletQuestionnaireBannerTableViewCell" customModule="SwiftWarplyFramework"> | 3873 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletQuestionnaireBannerTableViewCellId" id="AKr-2x-5Nd" customClass="WalletQuestionnaireBannerTableViewCell" customModule="SwiftWarplyFramework"> |
| 3813 | - <rect key="frame" x="0.0" y="1236.5" width="414" height="44"/> | 3874 | + <rect key="frame" x="0.0" y="1308.5" width="414" height="44"/> |
| 3814 | <autoresizingMask key="autoresizingMask"/> | 3875 | <autoresizingMask key="autoresizingMask"/> |
| 3815 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="AKr-2x-5Nd" id="nPE-tM-hVS"> | 3876 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="AKr-2x-5Nd" id="nPE-tM-hVS"> |
| 3816 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 3877 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
| ... | @@ -3820,48 +3881,67 @@ | ... | @@ -3820,48 +3881,67 @@ |
| 3820 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 3881 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> |
| 3821 | <subviews> | 3882 | <subviews> |
| 3822 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E7g-cu-Vdm"> | 3883 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E7g-cu-Vdm"> |
| 3823 | - <rect key="frame" x="20" y="25" width="374" height="16"/> | 3884 | + <rect key="frame" x="20" y="25" width="219.5" height="16"/> |
| 3824 | <subviews> | 3885 | <subviews> |
| 3825 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oc6-bU-uFZ"> | 3886 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oc6-bU-uFZ"> |
| 3826 | - <rect key="frame" x="20" y="15" width="22" height="22"/> | 3887 | + <rect key="frame" x="10" y="9" width="16" height="16"/> |
| 3827 | <constraints> | 3888 | <constraints> |
| 3828 | - <constraint firstAttribute="height" constant="22" id="L87-hG-Qde"/> | 3889 | + <constraint firstAttribute="height" constant="16" id="L87-hG-Qde"/> |
| 3829 | - <constraint firstAttribute="width" constant="22" id="M66-dc-yeT"/> | 3890 | + <constraint firstAttribute="width" constant="16" id="M66-dc-yeT"/> |
| 3830 | </constraints> | 3891 | </constraints> |
| 3831 | </imageView> | 3892 | </imageView> |
| 3832 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Πρόσθεσε τις προτιμήσεις σου" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="amg-yf-Roz"> | 3893 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Πρόσθεσε τις προτιμήσεις σου" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="amg-yf-Roz"> |
| 3833 | - <rect key="frame" x="52" y="16" width="232.5" height="20"/> | 3894 | + <rect key="frame" x="31" y="9.5" width="178.5" height="15"/> |
| 3834 | - <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="16"/> | 3895 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="12"/> |
| 3835 | - <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/> | 3896 | + <color key="textColor" red="0.054901960784313725" green="0.65098039215686276" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> |
| 3836 | <nil key="highlightedColor"/> | 3897 | <nil key="highlightedColor"/> |
| 3837 | </label> | 3898 | </label> |
| 3838 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zkX-BT-YZD"> | 3899 | + </subviews> |
| 3839 | - <rect key="frame" x="337" y="17.5" width="17" height="17"/> | 3900 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 3901 | + <constraints> | ||
| 3902 | + <constraint firstAttribute="bottom" secondItem="oc6-bU-uFZ" secondAttribute="bottom" constant="9" id="8CL-ej-RPl"/> | ||
| 3903 | + <constraint firstItem="amg-yf-Roz" firstAttribute="leading" secondItem="oc6-bU-uFZ" secondAttribute="trailing" constant="5" id="GV4-Ut-oeg"/> | ||
| 3904 | + <constraint firstItem="oc6-bU-uFZ" firstAttribute="leading" secondItem="E7g-cu-Vdm" secondAttribute="leading" constant="10" id="Qrh-op-XQ7"/> | ||
| 3905 | + <constraint firstAttribute="trailing" secondItem="amg-yf-Roz" secondAttribute="trailing" constant="10" id="hNg-p6-wWU"/> | ||
| 3906 | + <constraint firstItem="oc6-bU-uFZ" firstAttribute="top" secondItem="E7g-cu-Vdm" secondAttribute="top" constant="9" id="k50-It-dgE"/> | ||
| 3907 | + <constraint firstItem="amg-yf-Roz" firstAttribute="centerY" secondItem="oc6-bU-uFZ" secondAttribute="centerY" id="usW-Tc-Jrq"/> | ||
| 3908 | + </constraints> | ||
| 3909 | + </view> | ||
| 3910 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qqD-pZ-7xE"> | ||
| 3911 | + <rect key="frame" x="97.5" y="25" width="219.5" height="34"/> | ||
| 3912 | + <subviews> | ||
| 3913 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="lpg-iG-nja"> | ||
| 3914 | + <rect key="frame" x="10" y="9" width="16" height="16"/> | ||
| 3840 | <constraints> | 3915 | <constraints> |
| 3841 | - <constraint firstAttribute="width" constant="17" id="Ci4-Wq-tP6"/> | 3916 | + <constraint firstAttribute="width" constant="16" id="DJe-6d-EcH"/> |
| 3842 | - <constraint firstAttribute="height" constant="17" id="n1G-m9-43s"/> | 3917 | + <constraint firstAttribute="height" constant="16" id="VeL-rx-iZU"/> |
| 3843 | </constraints> | 3918 | </constraints> |
| 3844 | </imageView> | 3919 | </imageView> |
| 3920 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Πρόσθεσε τις προτιμήσεις σου" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Gg-1H-Jac"> | ||
| 3921 | + <rect key="frame" x="31" y="9.5" width="178.5" height="15"/> | ||
| 3922 | + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="12"/> | ||
| 3923 | + <color key="textColor" red="0.054901960780000002" green="0.65098039220000004" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | ||
| 3924 | + <nil key="highlightedColor"/> | ||
| 3925 | + </label> | ||
| 3845 | </subviews> | 3926 | </subviews> |
| 3846 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3927 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 3847 | <constraints> | 3928 | <constraints> |
| 3848 | - <constraint firstAttribute="bottom" secondItem="oc6-bU-uFZ" secondAttribute="bottom" constant="15" id="8CL-ej-RPl"/> | 3929 | + <constraint firstItem="5Gg-1H-Jac" firstAttribute="centerY" secondItem="lpg-iG-nja" secondAttribute="centerY" id="HcW-5f-w1a"/> |
| 3849 | - <constraint firstItem="amg-yf-Roz" firstAttribute="leading" secondItem="oc6-bU-uFZ" secondAttribute="trailing" constant="10" id="GV4-Ut-oeg"/> | 3930 | + <constraint firstItem="lpg-iG-nja" firstAttribute="top" secondItem="qqD-pZ-7xE" secondAttribute="top" constant="9" id="bLc-Tb-Tcx"/> |
| 3850 | - <constraint firstItem="zkX-BT-YZD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="amg-yf-Roz" secondAttribute="trailing" constant="5" id="PCZ-Aq-M5f"/> | 3931 | + <constraint firstAttribute="bottom" secondItem="lpg-iG-nja" secondAttribute="bottom" constant="9" id="nml-Gc-UZh"/> |
| 3851 | - <constraint firstItem="oc6-bU-uFZ" firstAttribute="leading" secondItem="E7g-cu-Vdm" secondAttribute="leading" constant="20" id="Qrh-op-XQ7"/> | 3932 | + <constraint firstItem="lpg-iG-nja" firstAttribute="leading" secondItem="qqD-pZ-7xE" secondAttribute="leading" constant="10" id="pf7-jV-pCN"/> |
| 3852 | - <constraint firstAttribute="trailing" secondItem="zkX-BT-YZD" secondAttribute="trailing" constant="20" id="R42-ol-mfw"/> | 3933 | + <constraint firstAttribute="trailing" secondItem="5Gg-1H-Jac" secondAttribute="trailing" constant="10" id="qaS-o5-wrU"/> |
| 3853 | - <constraint firstItem="oc6-bU-uFZ" firstAttribute="top" secondItem="E7g-cu-Vdm" secondAttribute="top" constant="15" id="k50-It-dgE"/> | 3934 | + <constraint firstItem="5Gg-1H-Jac" firstAttribute="leading" secondItem="lpg-iG-nja" secondAttribute="trailing" constant="5" id="t7a-Hc-EU8"/> |
| 3854 | - <constraint firstItem="zkX-BT-YZD" firstAttribute="centerY" secondItem="oc6-bU-uFZ" secondAttribute="centerY" id="tqT-Gi-oTZ"/> | ||
| 3855 | - <constraint firstItem="amg-yf-Roz" firstAttribute="centerY" secondItem="oc6-bU-uFZ" secondAttribute="centerY" id="usW-Tc-Jrq"/> | ||
| 3856 | </constraints> | 3935 | </constraints> |
| 3857 | </view> | 3936 | </view> |
| 3858 | </subviews> | 3937 | </subviews> |
| 3859 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3938 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 3860 | <constraints> | 3939 | <constraints> |
| 3861 | <constraint firstAttribute="bottom" secondItem="E7g-cu-Vdm" secondAttribute="bottom" constant="3" id="EQZ-DQ-as6"/> | 3940 | <constraint firstAttribute="bottom" secondItem="E7g-cu-Vdm" secondAttribute="bottom" constant="3" id="EQZ-DQ-as6"/> |
| 3941 | + <constraint firstItem="qqD-pZ-7xE" firstAttribute="centerX" secondItem="Z9L-1Z-TVa" secondAttribute="centerX" id="UpQ-w6-DrQ"/> | ||
| 3862 | <constraint firstItem="E7g-cu-Vdm" firstAttribute="top" secondItem="Z9L-1Z-TVa" secondAttribute="top" constant="25" id="qCl-fH-vaA"/> | 3942 | <constraint firstItem="E7g-cu-Vdm" firstAttribute="top" secondItem="Z9L-1Z-TVa" secondAttribute="top" constant="25" id="qCl-fH-vaA"/> |
| 3863 | - <constraint firstItem="E7g-cu-Vdm" firstAttribute="leading" secondItem="Z9L-1Z-TVa" secondAttribute="leading" constant="20" id="uR9-FM-TUb"/> | 3943 | + <constraint firstItem="qqD-pZ-7xE" firstAttribute="top" secondItem="Z9L-1Z-TVa" secondAttribute="top" constant="25" id="wFv-rl-GFD"/> |
| 3864 | - <constraint firstAttribute="trailing" secondItem="E7g-cu-Vdm" secondAttribute="trailing" constant="20" id="vqE-fh-d8w"/> | 3944 | + <constraint firstItem="E7g-cu-Vdm" firstAttribute="leading" secondItem="Z9L-1Z-TVa" secondAttribute="leading" constant="20" id="xaH-Wb-S9D"/> |
| 3865 | </constraints> | 3945 | </constraints> |
| 3866 | </view> | 3946 | </view> |
| 3867 | </subviews> | 3947 | </subviews> |
| ... | @@ -3874,7 +3954,11 @@ | ... | @@ -3874,7 +3954,11 @@ |
| 3874 | </tableViewCellContentView> | 3954 | </tableViewCellContentView> |
| 3875 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 3955 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 3876 | <connections> | 3956 | <connections> |
| 3877 | - <outlet property="bannerArrowImage" destination="zkX-BT-YZD" id="rgd-Fs-qK7"/> | 3957 | + <outlet property="bannerCenteredIconImage" destination="lpg-iG-nja" id="rvG-xf-Obh"/> |
| 3958 | + <outlet property="bannerCenteredIconImageWidth" destination="DJe-6d-EcH" id="UPm-gW-iLs"/> | ||
| 3959 | + <outlet property="bannerCenteredLabel" destination="5Gg-1H-Jac" id="bZu-U3-NoI"/> | ||
| 3960 | + <outlet property="bannerCenteredLabelLeftSpace" destination="t7a-Hc-EU8" id="sEi-c9-PEl"/> | ||
| 3961 | + <outlet property="bannerCenteredView" destination="qqD-pZ-7xE" id="WzC-jB-JIN"/> | ||
| 3878 | <outlet property="bannerIconImage" destination="oc6-bU-uFZ" id="VXs-UF-Rbf"/> | 3962 | <outlet property="bannerIconImage" destination="oc6-bU-uFZ" id="VXs-UF-Rbf"/> |
| 3879 | <outlet property="bannerIconImageWidth" destination="M66-dc-yeT" id="joM-kr-chb"/> | 3963 | <outlet property="bannerIconImageWidth" destination="M66-dc-yeT" id="joM-kr-chb"/> |
| 3880 | <outlet property="bannerLabel" destination="amg-yf-Roz" id="V6f-Nt-7IG"/> | 3964 | <outlet property="bannerLabel" destination="amg-yf-Roz" id="V6f-Nt-7IG"/> |
| ... | @@ -3883,7 +3967,7 @@ | ... | @@ -3883,7 +3967,7 @@ |
| 3883 | </connections> | 3967 | </connections> |
| 3884 | </tableViewCell> | 3968 | </tableViewCell> |
| 3885 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletHistoryBannerTableViewCellId" id="DQm-p5-XtS" customClass="WalletHistoryBannerTableViewCell" customModule="SwiftWarplyFramework"> | 3969 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletHistoryBannerTableViewCellId" id="DQm-p5-XtS" customClass="WalletHistoryBannerTableViewCell" customModule="SwiftWarplyFramework"> |
| 3886 | - <rect key="frame" x="0.0" y="1280.5" width="414" height="60"/> | 3970 | + <rect key="frame" x="0.0" y="1352.5" width="414" height="60"/> |
| 3887 | <autoresizingMask key="autoresizingMask"/> | 3971 | <autoresizingMask key="autoresizingMask"/> |
| 3888 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DQm-p5-XtS" id="bjo-yS-hIR"> | 3972 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DQm-p5-XtS" id="bjo-yS-hIR"> |
| 3889 | <rect key="frame" x="0.0" y="0.0" width="414" height="60"/> | 3973 | <rect key="frame" x="0.0" y="0.0" width="414" height="60"/> |
| ... | @@ -3954,7 +4038,7 @@ | ... | @@ -3954,7 +4038,7 @@ |
| 3954 | </connections> | 4038 | </connections> |
| 3955 | </tableViewCell> | 4039 | </tableViewCell> |
| 3956 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletEmptyViewTableViewCellId" id="lSc-gs-vcx" customClass="WalletEmptyViewTableViewCell" customModule="SwiftWarplyFramework"> | 4040 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WalletEmptyViewTableViewCellId" id="lSc-gs-vcx" customClass="WalletEmptyViewTableViewCell" customModule="SwiftWarplyFramework"> |
| 3957 | - <rect key="frame" x="0.0" y="1340.5" width="414" height="44"/> | 4041 | + <rect key="frame" x="0.0" y="1412.5" width="414" height="44"/> |
| 3958 | <autoresizingMask key="autoresizingMask"/> | 4042 | <autoresizingMask key="autoresizingMask"/> |
| 3959 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lSc-gs-vcx" id="AOI-dP-A0r"> | 4043 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lSc-gs-vcx" id="AOI-dP-A0r"> |
| 3960 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | 4044 | <rect key="frame" x="0.0" y="0.0" width="414" height="44"/> | ... | ... |
| ... | @@ -8,6 +8,9 @@ | ... | @@ -8,6 +8,9 @@ |
| 8 | import UIKit | 8 | import UIKit |
| 9 | 9 | ||
| 10 | @objc public class WalletActiveCouponsTableViewCell: UITableViewCell { | 10 | @objc public class WalletActiveCouponsTableViewCell: UITableViewCell { |
| 11 | + @IBOutlet weak var sectionTitleLabel: UILabel! | ||
| 12 | + @IBOutlet weak var historyButtonImage: UIImageView! | ||
| 13 | + | ||
| 11 | @IBOutlet weak var dfyViewParent: UIView! | 14 | @IBOutlet weak var dfyViewParent: UIView! |
| 12 | @IBOutlet weak var dfyView: UIView! | 15 | @IBOutlet weak var dfyView: UIView! |
| 13 | @IBOutlet weak var dfyImage: UIImageView! | 16 | @IBOutlet weak var dfyImage: UIImageView! |
| ... | @@ -32,6 +35,12 @@ import UIKit | ... | @@ -32,6 +35,12 @@ import UIKit |
| 32 | super.awakeFromNib() | 35 | super.awakeFromNib() |
| 33 | // Initialization code | 36 | // Initialization code |
| 34 | 37 | ||
| 38 | + // Section Header | ||
| 39 | + sectionTitleLabel.text = "Κουπόνια" | ||
| 40 | + historyButtonImage.image = UIImage(named: "wallet_history_blue", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
| 41 | + historyButtonImage.image = historyButtonImage.image?.withRenderingMode(.alwaysTemplate) | ||
| 42 | + historyButtonImage.tintColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) | ||
| 43 | + | ||
| 35 | // DFY Banner | 44 | // DFY Banner |
| 36 | // dfyViewParent.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00) | 45 | // dfyViewParent.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1.00) |
| 37 | dfyViewParent.backgroundColor = .white | 46 | dfyViewParent.backgroundColor = .white | ... | ... |
| ... | @@ -13,24 +13,39 @@ import UIKit | ... | @@ -13,24 +13,39 @@ import UIKit |
| 13 | @IBOutlet weak var bannerIconImageWidth: NSLayoutConstraint! | 13 | @IBOutlet weak var bannerIconImageWidth: NSLayoutConstraint! |
| 14 | @IBOutlet weak var bannerLabel: UILabel! | 14 | @IBOutlet weak var bannerLabel: UILabel! |
| 15 | @IBOutlet weak var bannerLabelLeftSpace: NSLayoutConstraint! | 15 | @IBOutlet weak var bannerLabelLeftSpace: NSLayoutConstraint! |
| 16 | - @IBOutlet weak var bannerArrowImage: UIImageView! | 16 | +// @IBOutlet weak var bannerArrowImage: UIImageView! |
| 17 | + | ||
| 18 | + @IBOutlet weak var bannerCenteredView: UIView! | ||
| 19 | + @IBOutlet weak var bannerCenteredIconImage: UIImageView! | ||
| 20 | + @IBOutlet weak var bannerCenteredIconImageWidth: NSLayoutConstraint! | ||
| 21 | + @IBOutlet weak var bannerCenteredLabel: UILabel! | ||
| 22 | + @IBOutlet weak var bannerCenteredLabelLeftSpace: NSLayoutConstraint! | ||
| 17 | 23 | ||
| 18 | public override func awakeFromNib() { | 24 | public override func awakeFromNib() { |
| 19 | super.awakeFromNib() | 25 | super.awakeFromNib() |
| 20 | // Initialization code | 26 | // Initialization code |
| 21 | 27 | ||
| 22 | - bannerView.layer.cornerRadius = 16.0 | 28 | + bannerView.layer.cornerRadius = 12.0 |
| 23 | bannerView.layer.borderWidth = 1 | 29 | bannerView.layer.borderWidth = 1 |
| 24 | - bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | 30 | + bannerView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor |
| 31 | +// bannerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor | ||
| 32 | + | ||
| 33 | + bannerCenteredView.layer.cornerRadius = 12.0 | ||
| 34 | + bannerCenteredView.layer.borderWidth = 1 | ||
| 35 | + bannerCenteredView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor | ||
| 25 | 36 | ||
| 26 | // Add shadow | 37 | // Add shadow |
| 27 | - bannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor | 38 | +// bannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.2).cgColor |
| 28 | - bannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) | 39 | +// bannerView.layer.shadowOffset = CGSize(width: 0.0, height: 1.0) |
| 29 | - bannerView.layer.shadowOpacity = 1.0 | 40 | +// bannerView.layer.shadowOpacity = 1.0 |
| 30 | - bannerView.layer.shadowRadius = 1.0 | 41 | +// bannerView.layer.shadowRadius = 1.0 |
| 42 | + | ||
| 43 | + bannerIconImage.image = UIImage(named: "wallet_plus", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
| 44 | + bannerCenteredIconImage.image = UIImage(named: "wallet_plus", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
| 45 | +// bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | ||
| 31 | 46 | ||
| 32 | - bannerIconImage.image = UIImage(named: "wallet_plus_blue", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 47 | + bannerLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) |
| 33 | - bannerArrowImage.image = UIImage(named: "arrow_right_black", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 48 | + bannerCenteredLabel.font = UIFont(name: "PeridotPE-Bold", size: 12) |
| 34 | } | 49 | } |
| 35 | 50 | ||
| 36 | public override func setSelected(_ selected: Bool, animated: Bool) { | 51 | public override func setSelected(_ selected: Bool, animated: Bool) { |
| ... | @@ -39,7 +54,7 @@ import UIKit | ... | @@ -39,7 +54,7 @@ import UIKit |
| 39 | // Configure the view for the selected state | 54 | // Configure the view for the selected state |
| 40 | } | 55 | } |
| 41 | 56 | ||
| 42 | - func configureCell() { | 57 | + func configureCell(isCentered: Bool) { |
| 43 | let userTag = swiftApi().getUserTag() | 58 | let userTag = swiftApi().getUserTag() |
| 44 | // print("User tag: " + userTag) | 59 | // print("User tag: " + userTag) |
| 45 | if (userTag != "" && userTag != "undefined") { | 60 | if (userTag != "" && userTag != "undefined") { |
| ... | @@ -48,13 +63,39 @@ import UIKit | ... | @@ -48,13 +63,39 @@ import UIKit |
| 48 | bannerIconImage.isHidden = true | 63 | bannerIconImage.isHidden = true |
| 49 | bannerIconImageWidth.constant = CGFloat(0.0) | 64 | bannerIconImageWidth.constant = CGFloat(0.0) |
| 50 | bannerLabelLeftSpace.constant = CGFloat(0.0) | 65 | bannerLabelLeftSpace.constant = CGFloat(0.0) |
| 66 | + bannerView.frame.size.width = bannerView.intrinsicContentSize.width | ||
| 67 | + | ||
| 68 | + bannerCenteredLabel.text = userTag | ||
| 69 | + bannerCenteredLabel.frame.size.width = bannerCenteredLabel.intrinsicContentSize.width | ||
| 70 | + bannerCenteredIconImage.isHidden = true | ||
| 71 | + bannerCenteredIconImageWidth.constant = CGFloat(0.0) | ||
| 72 | + bannerCenteredLabelLeftSpace.constant = CGFloat(0.0) | ||
| 73 | + bannerCenteredView.frame.size.width = bannerLabel.intrinsicContentSize.width | ||
| 74 | + | ||
| 51 | 75 | ||
| 52 | } else { | 76 | } else { |
| 53 | bannerLabel.text = "Πρόσθεσε τις προτιμήσεις σου" | 77 | bannerLabel.text = "Πρόσθεσε τις προτιμήσεις σου" |
| 54 | bannerLabel.frame.size.width = bannerLabel.intrinsicContentSize.width | 78 | bannerLabel.frame.size.width = bannerLabel.intrinsicContentSize.width |
| 55 | bannerIconImage.isHidden = false | 79 | bannerIconImage.isHidden = false |
| 56 | - bannerIconImageWidth.constant = CGFloat(22.0) | 80 | + bannerIconImageWidth.constant = CGFloat(16.0) |
| 57 | - bannerLabelLeftSpace.constant = CGFloat(10.0) | 81 | + bannerLabelLeftSpace.constant = CGFloat(5.0) |
| 82 | + bannerView.frame.size.width = bannerView.intrinsicContentSize.width | ||
| 83 | + | ||
| 84 | + bannerCenteredLabel.text = "Πρόσθεσε τις προτιμήσεις σου" | ||
| 85 | + bannerCenteredLabel.frame.size.width = bannerCenteredLabel.intrinsicContentSize.width | ||
| 86 | + bannerCenteredIconImage.isHidden = false | ||
| 87 | + bannerCenteredIconImageWidth.constant = CGFloat(16.0) | ||
| 88 | + bannerCenteredLabelLeftSpace.constant = CGFloat(5.0) | ||
| 89 | + bannerCenteredView.frame.size.width = bannerCenteredView.intrinsicContentSize.width | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + if (isCentered) { | ||
| 93 | + bannerView.isHidden = true | ||
| 94 | + bannerCenteredView.isHidden = false | ||
| 95 | + | ||
| 96 | + } else { | ||
| 97 | + bannerView.isHidden = false | ||
| 98 | + bannerCenteredView.isHidden = true | ||
| 58 | } | 99 | } |
| 59 | } | 100 | } |
| 60 | 101 | ... | ... |
| ... | @@ -767,7 +767,13 @@ import SwiftEventBus | ... | @@ -767,7 +767,13 @@ import SwiftEventBus |
| 767 | // TODO: UNCOMMENT if emptyView is needed again | 767 | // TODO: UNCOMMENT if emptyView is needed again |
| 768 | // self.emptyView.isHidden = false | 768 | // self.emptyView.isHidden = false |
| 769 | // self.emptyViewHeight.constant = self.emptyView.intrinsicContentSize.height | 769 | // self.emptyViewHeight.constant = self.emptyView.intrinsicContentSize.height |
| 770 | - self.showEmptyView = true | 770 | + let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount |
| 771 | + if (sumRedeemed == 0.0) { | ||
| 772 | + self.showEmptyView = true | ||
| 773 | + } else { | ||
| 774 | + self.showEmptyView = false | ||
| 775 | + } | ||
| 776 | +// self.showEmptyView = true | ||
| 771 | 777 | ||
| 772 | } else { | 778 | } else { |
| 773 | self.emptyView.isHidden = true | 779 | self.emptyView.isHidden = true |
| ... | @@ -1040,7 +1046,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1040,7 +1046,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1040 | 1046 | ||
| 1041 | public func numberOfSections(in tableView: UITableView) -> Int { | 1047 | public func numberOfSections(in tableView: UITableView) -> Int { |
| 1042 | // return 4 | 1048 | // return 4 |
| 1043 | - return 6 | 1049 | + return 5 |
| 1044 | } | 1050 | } |
| 1045 | 1051 | ||
| 1046 | public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | 1052 | public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { |
| ... | @@ -1066,33 +1072,36 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1066,33 +1072,36 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1066 | // } | 1072 | // } |
| 1067 | 1073 | ||
| 1068 | if (section == 0) { | 1074 | if (section == 0) { |
| 1069 | - if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { | 1075 | + let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount |
| 1076 | + if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0 || sumRedeemed > 0.0) { | ||
| 1070 | return 1 | 1077 | return 1 |
| 1071 | } else { | 1078 | } else { |
| 1072 | return 0 | 1079 | return 0 |
| 1073 | } | 1080 | } |
| 1074 | } else if (section == 1) { | 1081 | } else if (section == 1) { |
| 1075 | - return 1 | 1082 | + if (self.showEmptyView == true) { |
| 1076 | - } else if (section == 2) { | ||
| 1077 | - let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount | ||
| 1078 | - if (sumRedeemed > 0.0) { | ||
| 1079 | return 1 | 1083 | return 1 |
| 1080 | } else { | 1084 | } else { |
| 1081 | return 0 | 1085 | return 0 |
| 1082 | } | 1086 | } |
| 1083 | - } else if (section == 3) { | 1087 | + } else if (section == 2) { |
| 1088 | + return 1 | ||
| 1089 | + } | ||
| 1090 | +// else if (section == 2) { | ||
| 1091 | +// let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount | ||
| 1092 | +// if (sumRedeemed > 0.0) { | ||
| 1093 | +// return 1 | ||
| 1094 | +// } else { | ||
| 1095 | +// return 0 | ||
| 1096 | +// } | ||
| 1097 | +// } | ||
| 1098 | + else if (section == 3) { | ||
| 1084 | if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") { | 1099 | if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") { |
| 1085 | return 1 | 1100 | return 1 |
| 1086 | } else { | 1101 | } else { |
| 1087 | return 0 | 1102 | return 0 |
| 1088 | } | 1103 | } |
| 1089 | } else if (section == 4) { | 1104 | } else if (section == 4) { |
| 1090 | - if (self.showEmptyView == true) { | ||
| 1091 | - return 1 | ||
| 1092 | - } else { | ||
| 1093 | - return 0 | ||
| 1094 | - } | ||
| 1095 | - } else if (section == 5) { | ||
| 1096 | if (self.showSpinner == true) { | 1105 | if (self.showSpinner == true) { |
| 1097 | return 1 | 1106 | return 1 |
| 1098 | } else { | 1107 | } else { |
| ... | @@ -1135,33 +1144,36 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1135,33 +1144,36 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1135 | // } | 1144 | // } |
| 1136 | 1145 | ||
| 1137 | if (indexPath.section == 0) { | 1146 | if (indexPath.section == 0) { |
| 1138 | - if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { | 1147 | + let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount |
| 1148 | + if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0 || sumRedeemed > 0.0) { | ||
| 1139 | return UITableView.automaticDimension | 1149 | return UITableView.automaticDimension |
| 1140 | } else { | 1150 | } else { |
| 1141 | return 0.0 | 1151 | return 0.0 |
| 1142 | } | 1152 | } |
| 1143 | } else if (indexPath.section == 1) { | 1153 | } else if (indexPath.section == 1) { |
| 1144 | - return UITableView.automaticDimension | 1154 | + if (self.showEmptyView == true) { |
| 1145 | - } else if (indexPath.section == 2) { | ||
| 1146 | - let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount | ||
| 1147 | - if (sumRedeemed > 0.0) { | ||
| 1148 | return UITableView.automaticDimension | 1155 | return UITableView.automaticDimension |
| 1149 | } else { | 1156 | } else { |
| 1150 | return 0.0 | 1157 | return 0.0 |
| 1151 | } | 1158 | } |
| 1152 | - } else if (indexPath.section == 3) { | 1159 | + } else if (indexPath.section == 2) { |
| 1160 | + return UITableView.automaticDimension | ||
| 1161 | + } | ||
| 1162 | +// else if (indexPath.section == 2) { | ||
| 1163 | +// let sumRedeemed = totalCouponValue + totalCouponDiscount + unifiedCouponsDiscount | ||
| 1164 | +// if (sumRedeemed > 0.0) { | ||
| 1165 | +// return UITableView.automaticDimension | ||
| 1166 | +// } else { | ||
| 1167 | +// return 0.0 | ||
| 1168 | +// } | ||
| 1169 | +// } | ||
| 1170 | + else if (indexPath.section == 3) { | ||
| 1153 | if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") { | 1171 | if (swiftApi().getShowVouchersBanner() == "true" || swiftApi().getShowVouchersBanner() == "false") { |
| 1154 | return UITableView.automaticDimension | 1172 | return UITableView.automaticDimension |
| 1155 | } else { | 1173 | } else { |
| 1156 | return 0.0 | 1174 | return 0.0 |
| 1157 | } | 1175 | } |
| 1158 | } else if (indexPath.section == 4) { | 1176 | } else if (indexPath.section == 4) { |
| 1159 | - if (self.showEmptyView == true) { | ||
| 1160 | - return UITableView.automaticDimension | ||
| 1161 | - } else { | ||
| 1162 | - return 0.0 | ||
| 1163 | - } | ||
| 1164 | - } else if (indexPath.section == 5) { | ||
| 1165 | if (self.showSpinner == true) { | 1177 | if (self.showSpinner == true) { |
| 1166 | return UITableView.automaticDimension | 1178 | return UITableView.automaticDimension |
| 1167 | } else { | 1179 | } else { |
| ... | @@ -1237,21 +1249,21 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1237,21 +1249,21 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1237 | // } | 1249 | // } |
| 1238 | 1250 | ||
| 1239 | if (section == 0) { | 1251 | if (section == 0) { |
| 1240 | - if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { | 1252 | +// if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { |
| 1241 | - let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 70)) | 1253 | +// let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 70)) |
| 1242 | - view.backgroundColor = .clear | 1254 | +// view.backgroundColor = .clear |
| 1243 | - | 1255 | +// |
| 1244 | - let titleLabel = UILabel(frame: CGRect(x: 20, y: 20, width: view.frame.width - 40, height: 25)) | 1256 | +// let titleLabel = UILabel(frame: CGRect(x: 20, y: 20, width: view.frame.width - 40, height: 25)) |
| 1245 | -// titleLabel.font = UIFont(name: "PeridotPE-SBold", size: 21) | 1257 | +//// titleLabel.font = UIFont(name: "PeridotPE-SBold", size: 21) |
| 1246 | - titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 19) | 1258 | +// titleLabel.font = UIFont(name: "BTCosmo-Bold", size: 19) |
| 1247 | - titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) | 1259 | +// titleLabel.textColor = UIColor(red: 0.13, green: 0.13, blue: 0.13, alpha: 1.00) |
| 1248 | - titleLabel.text = "Κουπόνια" | 1260 | +// titleLabel.text = "Κουπόνια" |
| 1249 | - | 1261 | +// |
| 1250 | - view.addSubview(titleLabel) | 1262 | +// view.addSubview(titleLabel) |
| 1251 | - return view | 1263 | +// return view |
| 1252 | - } else { | 1264 | +// } else { |
| 1253 | return nil | 1265 | return nil |
| 1254 | - } | 1266 | +// } |
| 1255 | } else if (section == 1) { | 1267 | } else if (section == 1) { |
| 1256 | return nil | 1268 | return nil |
| 1257 | } else if (section == 2) { | 1269 | } else if (section == 2) { |
| ... | @@ -1276,8 +1288,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1276,8 +1288,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1276 | // } | 1288 | // } |
| 1277 | } else if (section == 4) { | 1289 | } else if (section == 4) { |
| 1278 | return nil | 1290 | return nil |
| 1279 | - } else if (section == 5) { | ||
| 1280 | - return nil | ||
| 1281 | } else { | 1291 | } else { |
| 1282 | return nil | 1292 | return nil |
| 1283 | } | 1293 | } |
| ... | @@ -1313,11 +1323,11 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1313,11 +1323,11 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1313 | // } | 1323 | // } |
| 1314 | 1324 | ||
| 1315 | if (section == 0) { | 1325 | if (section == 0) { |
| 1316 | - if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { | 1326 | +// if (self.dfyCoupons.count > 0 || self.unifiedCoupons.count > 0 || self.coupons.count > 0) { |
| 1317 | - return 70.0 | 1327 | +// return 70.0 |
| 1318 | - } else { | 1328 | +// } else { |
| 1319 | return 0.0 | 1329 | return 0.0 |
| 1320 | - } | 1330 | +// } |
| 1321 | } else if (section == 1) { | 1331 | } else if (section == 1) { |
| 1322 | return 0.0 | 1332 | return 0.0 |
| 1323 | } else if (section == 2) { | 1333 | } else if (section == 2) { |
| ... | @@ -1330,8 +1340,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1330,8 +1340,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1330 | // } | 1340 | // } |
| 1331 | } else if (section == 4) { | 1341 | } else if (section == 4) { |
| 1332 | return 0.0 | 1342 | return 0.0 |
| 1333 | - } else if (section == 5) { | ||
| 1334 | - return 0.0 | ||
| 1335 | } else { | 1343 | } else { |
| 1336 | return 0.0 | 1344 | return 0.0 |
| 1337 | } | 1345 | } |
| ... | @@ -1378,19 +1386,21 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1378,19 +1386,21 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1378 | return cell | 1386 | return cell |
| 1379 | 1387 | ||
| 1380 | } else if (indexPath.section == 1) { | 1388 | } else if (indexPath.section == 1) { |
| 1381 | - let cell = tableView.dequeueReusableCell(withIdentifier: "WalletQuestionnaireBannerTableViewCellId", for: indexPath) as! WalletQuestionnaireBannerTableViewCell | 1389 | + let cell = tableView.dequeueReusableCell(withIdentifier: "WalletEmptyViewTableViewCellId", for: indexPath) as! WalletEmptyViewTableViewCell |
| 1382 | - cell.configureCell() | ||
| 1383 | return cell | 1390 | return cell |
| 1384 | } else if (indexPath.section == 2) { | 1391 | } else if (indexPath.section == 2) { |
| 1385 | - let cell = tableView.dequeueReusableCell(withIdentifier: "WalletHistoryBannerTableViewCellId", for: indexPath) as! WalletHistoryBannerTableViewCell | 1392 | + let cell = tableView.dequeueReusableCell(withIdentifier: "WalletQuestionnaireBannerTableViewCellId", for: indexPath) as! WalletQuestionnaireBannerTableViewCell |
| 1393 | + cell.configureCell(isCentered: self.showEmptyView) | ||
| 1386 | return cell | 1394 | return cell |
| 1387 | - } else if (indexPath.section == 3) { | 1395 | + } |
| 1396 | +// else if (indexPath.section == 2) { | ||
| 1397 | +// let cell = tableView.dequeueReusableCell(withIdentifier: "WalletHistoryBannerTableViewCellId", for: indexPath) as! WalletHistoryBannerTableViewCell | ||
| 1398 | +// return cell | ||
| 1399 | +// } | ||
| 1400 | + else if (indexPath.section == 3) { | ||
| 1388 | let cell = tableView.dequeueReusableCell(withIdentifier: "WalletVouchersBannerTableViewCellId", for: indexPath) as! WalletVouchersBannerTableViewCell | 1401 | let cell = tableView.dequeueReusableCell(withIdentifier: "WalletVouchersBannerTableViewCellId", for: indexPath) as! WalletVouchersBannerTableViewCell |
| 1389 | cell.configureCell(showSeparator: self.showActiveCouponsBanners, active: swiftApi().getShowVouchersBanner() == "true") | 1402 | cell.configureCell(showSeparator: self.showActiveCouponsBanners, active: swiftApi().getShowVouchersBanner() == "true") |
| 1390 | return cell | 1403 | return cell |
| 1391 | - } else if (indexPath.section == 4) { | ||
| 1392 | - let cell = tableView.dequeueReusableCell(withIdentifier: "WalletEmptyViewTableViewCellId", for: indexPath) as! WalletEmptyViewTableViewCell | ||
| 1393 | - return cell | ||
| 1394 | } else { | 1404 | } else { |
| 1395 | let cell = tableView.dequeueReusableCell(withIdentifier: "WalletSpinnerTableViewCellId", for: indexPath) as! WalletSpinnerTableViewCell | 1405 | let cell = tableView.dequeueReusableCell(withIdentifier: "WalletSpinnerTableViewCellId", for: indexPath) as! WalletSpinnerTableViewCell |
| 1396 | return cell | 1406 | return cell |
| ... | @@ -1441,23 +1451,27 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1441,23 +1451,27 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1441 | // Do nothing - Each button is handled differently | 1451 | // Do nothing - Each button is handled differently |
| 1442 | 1452 | ||
| 1443 | } else if (indexPath.section == 1) { | 1453 | } else if (indexPath.section == 1) { |
| 1454 | + // Do nothing | ||
| 1455 | + } else if (indexPath.section == 2) { | ||
| 1444 | swiftApi().logTrackersEvent("click", ("LoyaltyWalletScreen:" + "Questionnaire")) | 1456 | swiftApi().logTrackersEvent("click", ("LoyaltyWalletScreen:" + "Questionnaire")) |
| 1445 | 1457 | ||
| 1446 | swiftApi().openQuestionnaire(self); | 1458 | swiftApi().openQuestionnaire(self); |
| 1447 | 1459 | ||
| 1448 | - } else if (indexPath.section == 2) { | 1460 | + } |
| 1449 | - let firebaseEvent = swiftApi.LoyaltySDKFirebaseEventModel() | 1461 | +// else if (indexPath.section == 2) { |
| 1450 | - firebaseEvent._eventName = "did_tap_history_badge" | 1462 | +// let firebaseEvent = swiftApi.LoyaltySDKFirebaseEventModel() |
| 1451 | - firebaseEvent.setParameter = ("screen", "Loyalty Wallet") | 1463 | +// firebaseEvent._eventName = "did_tap_history_badge" |
| 1452 | - SwiftEventBus.post("firebase", sender: firebaseEvent) | 1464 | +// firebaseEvent.setParameter = ("screen", "Loyalty Wallet") |
| 1453 | - | 1465 | +// SwiftEventBus.post("firebase", sender: firebaseEvent) |
| 1454 | - swiftApi().logTrackersEvent("click", ("LoyaltyWalletScreen:" + "LoyaltyHistoryBadge")) | 1466 | +// |
| 1455 | - | 1467 | +// swiftApi().logTrackersEvent("click", ("LoyaltyWalletScreen:" + "LoyaltyHistoryBadge")) |
| 1456 | - let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) | 1468 | +// |
| 1457 | - let vc = storyboard.instantiateViewController(withIdentifier: "LoyaltyHistoryViewController") as! SwiftWarplyFramework.LoyaltyHistoryViewController | 1469 | +// let storyboard = UIStoryboard(name: "Main", bundle: Bundle(for: MyEmptyClass.self)) |
| 1458 | - self.navigationController?.pushViewController(vc, animated: true) | 1470 | +// let vc = storyboard.instantiateViewController(withIdentifier: "LoyaltyHistoryViewController") as! SwiftWarplyFramework.LoyaltyHistoryViewController |
| 1459 | - | 1471 | +// self.navigationController?.pushViewController(vc, animated: true) |
| 1460 | - } else if (indexPath.section == 3) { | 1472 | +// |
| 1473 | +// } | ||
| 1474 | + else if (indexPath.section == 3) { | ||
| 1461 | let firebaseEvent = swiftApi.LoyaltySDKFirebaseEventModel() | 1475 | let firebaseEvent = swiftApi.LoyaltySDKFirebaseEventModel() |
| 1462 | firebaseEvent._eventName = "did_tap_vouchers_badge" | 1476 | firebaseEvent._eventName = "did_tap_vouchers_badge" |
| 1463 | firebaseEvent.setParameter = ("screen", "Loyalty Wallet") | 1477 | firebaseEvent.setParameter = ("screen", "Loyalty Wallet") |
| ... | @@ -1469,8 +1483,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ | ... | @@ -1469,8 +1483,6 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{ |
| 1469 | 1483 | ||
| 1470 | } else if (indexPath.section == 4) { | 1484 | } else if (indexPath.section == 4) { |
| 1471 | // Do nothing | 1485 | // Do nothing |
| 1472 | - } else if (indexPath.section == 5) { | ||
| 1473 | - // Do nothing | ||
| 1474 | } else { | 1486 | } else { |
| 1475 | // Do nothing | 1487 | // Do nothing |
| 1476 | } | 1488 | } | ... | ... |
-
Please register or login to post a comment