open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
eb36db0f 1 parent 655f4043

WalletViewController refactor part 1

Inline Side-by-side
Showing 3 changed files with 85 additions and 33 deletions
...@@ -1654,20 +1654,20 @@ ...@@ -1654,20 +1654,20 @@
1654 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/> 1654 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/>
1655 </imageView> 1655 </imageView>
1656 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf"> 1656 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf">
1657 - <rect key="frame" x="174.5" y="30" width="65" height="65"/> 1657 + <rect key="frame" x="20" y="30" width="74" height="74"/>
1658 <constraints> 1658 <constraints>
1659 - <constraint firstAttribute="height" constant="65" id="5OC-RX-Njv"/> 1659 + <constraint firstAttribute="height" constant="74" id="5OC-RX-Njv"/>
1660 - <constraint firstAttribute="width" constant="65" id="9aB-0n-nR8"/> 1660 + <constraint firstAttribute="width" constant="74" id="9aB-0n-nR8"/>
1661 </constraints> 1661 </constraints>
1662 </imageView> 1662 </imageView>
1663 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Γιώργος Γεωργίου" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XZ-NB-F8P"> 1663 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Γιώργος Γεωργίου" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XZ-NB-F8P">
1664 - <rect key="frame" x="20" y="105" width="374" height="20"/> 1664 + <rect key="frame" x="104" y="30" width="290" height="26"/>
1665 - <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/> 1665 + <fontDescription key="fontDescription" name="PeridotPE-SBold" family="Peridot PE" pointSize="21"/>
1666 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 1666 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1667 <nil key="highlightedColor"/> 1667 <nil key="highlightedColor"/>
1668 </label> 1668 </label>
1669 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV"> 1669 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV">
1670 - <rect key="frame" x="174" y="135" width="66" height="508"/> 1670 + <rect key="frame" x="104" y="61" width="70" height="582"/>
1671 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1671 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1672 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/> 1672 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/>
1673 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/> 1673 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
...@@ -1679,23 +1679,60 @@ ...@@ -1679,23 +1679,60 @@
1679 <action selector="qustionnaireButtonAction:" destination="pKQ-52-a1r" eventType="touchUpInside" id="Iro-Jh-eD9"/> 1679 <action selector="qustionnaireButtonAction:" destination="pKQ-52-a1r" eventType="touchUpInside" id="Iro-Jh-eD9"/>
1680 </connections> 1680 </connections>
1681 </button> 1681 </button>
1682 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xIu-T5-fEm">
1683 + <rect key="frame" x="179" y="331" width="52" height="42"/>
1684 + <subviews>
1685 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jfs-OZ-feO">
1686 + <rect key="frame" x="18" y="13" width="16" height="16"/>
1687 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1688 + <constraints>
1689 + <constraint firstAttribute="width" constant="16" id="5Ol-19-08d"/>
1690 + <constraint firstAttribute="height" constant="16" id="qwH-Wx-BXI"/>
1691 + </constraints>
1692 + </imageView>
1693 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sdf-bh-dJk">
1694 + <rect key="frame" x="0.0" y="0.0" width="52" height="42"/>
1695 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1696 + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/>
1697 + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
1698 + <state key="normal" title="Button">
1699 + <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1700 + </state>
1701 + <connections>
1702 + <action selector="historyButtonAction:" destination="pKQ-52-a1r" eventType="touchUpInside" id="DLO-Ss-Vnf"/>
1703 + </connections>
1704 + </button>
1705 + </subviews>
1706 + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1707 + <constraints>
1708 + <constraint firstItem="jfs-OZ-feO" firstAttribute="centerX" secondItem="xIu-T5-fEm" secondAttribute="centerX" id="9Bx-g6-BHg"/>
1709 + <constraint firstAttribute="bottom" secondItem="Sdf-bh-dJk" secondAttribute="bottom" id="Ezd-6R-Slh"/>
1710 + <constraint firstAttribute="width" constant="52" id="LJB-xG-ssY"/>
1711 + <constraint firstItem="jfs-OZ-feO" firstAttribute="centerY" secondItem="xIu-T5-fEm" secondAttribute="centerY" id="ReB-xL-ob6"/>
1712 + <constraint firstAttribute="trailing" secondItem="Sdf-bh-dJk" secondAttribute="trailing" id="bZx-Ka-nk8"/>
1713 + <constraint firstItem="Sdf-bh-dJk" firstAttribute="top" secondItem="xIu-T5-fEm" secondAttribute="top" id="caA-pP-uf1"/>
1714 + <constraint firstAttribute="height" constant="42" id="m34-ar-7d8"/>
1715 + <constraint firstItem="Sdf-bh-dJk" firstAttribute="leading" secondItem="xIu-T5-fEm" secondAttribute="leading" id="rAl-H1-JQf"/>
1716 + </constraints>
1717 + </view>
1682 </subviews> 1718 </subviews>
1683 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1719 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1684 <constraints> 1720 <constraints>
1685 <constraint firstAttribute="trailing" secondItem="1XZ-NB-F8P" secondAttribute="trailing" constant="20" id="2Qd-Br-8jF"/> 1721 <constraint firstAttribute="trailing" secondItem="1XZ-NB-F8P" secondAttribute="trailing" constant="20" id="2Qd-Br-8jF"/>
1686 <constraint firstAttribute="bottom" secondItem="wP5-YG-vSP" secondAttribute="bottom" id="8QU-gc-Cf4"/> 1722 <constraint firstAttribute="bottom" secondItem="wP5-YG-vSP" secondAttribute="bottom" id="8QU-gc-Cf4"/>
1687 - <constraint firstItem="UNL-Oh-sPV" firstAttribute="centerX" secondItem="Et1-y7-npI" secondAttribute="centerX" id="9qp-mK-ett"/> 1723 + <constraint firstItem="wJv-NF-rMf" firstAttribute="leading" secondItem="Et1-y7-npI" secondAttribute="leading" constant="20" id="9fZ-EX-uY3"/>
1688 <constraint firstItem="wJv-NF-rMf" firstAttribute="top" secondItem="Et1-y7-npI" secondAttribute="top" constant="30" id="ADQ-Rt-XHp"/> 1724 <constraint firstItem="wJv-NF-rMf" firstAttribute="top" secondItem="Et1-y7-npI" secondAttribute="top" constant="30" id="ADQ-Rt-XHp"/>
1689 - <constraint firstItem="1XZ-NB-F8P" firstAttribute="leading" secondItem="Et1-y7-npI" secondAttribute="leading" constant="20" id="QAp-GR-8St"/> 1725 + <constraint firstItem="1XZ-NB-F8P" firstAttribute="leading" secondItem="wJv-NF-rMf" secondAttribute="trailing" constant="10" id="QAp-GR-8St"/>
1726 + <constraint firstItem="xIu-T5-fEm" firstAttribute="leading" secondItem="UNL-Oh-sPV" secondAttribute="trailing" constant="5" id="WTQ-rM-tNz"/>
1690 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="UNL-Oh-sPV" secondAttribute="trailing" constant="20" id="Xng-LS-Uzp"/> 1727 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="UNL-Oh-sPV" secondAttribute="trailing" constant="20" id="Xng-LS-Uzp"/>
1728 + <constraint firstItem="xIu-T5-fEm" firstAttribute="centerY" secondItem="UNL-Oh-sPV" secondAttribute="centerY" id="Y2f-Vq-7fj"/>
1691 <constraint firstItem="wP5-YG-vSP" firstAttribute="leading" secondItem="Et1-y7-npI" secondAttribute="leading" id="g2f-8d-5H4"/> 1729 <constraint firstItem="wP5-YG-vSP" firstAttribute="leading" secondItem="Et1-y7-npI" secondAttribute="leading" id="g2f-8d-5H4"/>
1692 <constraint firstAttribute="bottom" secondItem="UNL-Oh-sPV" secondAttribute="bottom" constant="20" id="m3Y-Ph-UoF"/> 1730 <constraint firstAttribute="bottom" secondItem="UNL-Oh-sPV" secondAttribute="bottom" constant="20" id="m3Y-Ph-UoF"/>
1693 <constraint firstAttribute="trailing" secondItem="wP5-YG-vSP" secondAttribute="trailing" id="oop-ae-Ia8"/> 1731 <constraint firstAttribute="trailing" secondItem="wP5-YG-vSP" secondAttribute="trailing" id="oop-ae-Ia8"/>
1694 - <constraint firstItem="UNL-Oh-sPV" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Et1-y7-npI" secondAttribute="leading" constant="20" id="poc-QE-7eU"/> 1732 + <constraint firstItem="UNL-Oh-sPV" firstAttribute="leading" secondItem="1XZ-NB-F8P" secondAttribute="leading" id="poc-QE-7eU"/>
1695 - <constraint firstItem="UNL-Oh-sPV" firstAttribute="top" secondItem="1XZ-NB-F8P" secondAttribute="bottom" constant="10" id="s2n-QU-Jtw"/> 1733 + <constraint firstItem="UNL-Oh-sPV" firstAttribute="top" secondItem="1XZ-NB-F8P" secondAttribute="bottom" constant="5" id="s2n-QU-Jtw"/>
1696 - <constraint firstItem="wJv-NF-rMf" firstAttribute="centerX" secondItem="Et1-y7-npI" secondAttribute="centerX" id="sQz-VS-1wS"/>
1697 <constraint firstItem="wP5-YG-vSP" firstAttribute="top" secondItem="Et1-y7-npI" secondAttribute="top" id="suQ-zX-PC0"/> 1734 <constraint firstItem="wP5-YG-vSP" firstAttribute="top" secondItem="Et1-y7-npI" secondAttribute="top" id="suQ-zX-PC0"/>
1698 - <constraint firstItem="1XZ-NB-F8P" firstAttribute="top" secondItem="wJv-NF-rMf" secondAttribute="bottom" constant="10" id="zc1-69-P8k"/> 1735 + <constraint firstItem="1XZ-NB-F8P" firstAttribute="top" secondItem="wJv-NF-rMf" secondAttribute="top" id="zc1-69-P8k"/>
1699 </constraints> 1736 </constraints>
1700 </view> 1737 </view>
1701 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ucx-dF-Jr2"> 1738 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ucx-dF-Jr2">
...@@ -1962,7 +1999,7 @@ ...@@ -1962,7 +1999,7 @@
1962 </constraints> 1999 </constraints>
1963 </imageView> 2000 </imageView>
1964 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SIP-ou-T3X"> 2001 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SIP-ou-T3X">
1965 - <rect key="frame" x="0.0" y="125" width="374" height="17.5"/> 2002 + <rect key="frame" x="0.0" y="125" width="374" height="18.5"/>
1966 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/> 2003 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
1967 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2004 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1968 <nil key="highlightedColor"/> 2005 <nil key="highlightedColor"/>
...@@ -2040,22 +2077,22 @@ ...@@ -2040,22 +2077,22 @@
2040 </constraints> 2077 </constraints>
2041 </view> 2078 </view>
2042 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0"> 2079 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BAb-kn-pw0">
2043 - <rect key="frame" x="119" y="-13.5" width="255" height="20.5"/> 2080 + <rect key="frame" x="119" y="-13" width="255" height="20"/>
2044 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/> 2081 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="17"/>
2045 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2082 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2046 <nil key="highlightedColor"/> 2083 <nil key="highlightedColor"/>
2047 </label> 2084 </label>
2048 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3"> 2085 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-Li-bx3">
2049 - <rect key="frame" x="119" y="12" width="255" height="41"/> 2086 + <rect key="frame" x="119" y="12" width="255" height="40.5"/>
2050 <subviews> 2087 <subviews>
2051 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt"> 2088 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wBw-w0-bGt">
2052 - <rect key="frame" x="0.0" y="0.0" width="127.5" height="41"/> 2089 + <rect key="frame" x="0.0" y="0.0" width="127.5" height="40.5"/>
2053 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/> 2090 <fontDescription key="fontDescription" name="BTCosmo-Bold" family="BTCosmo" pointSize="35"/>
2054 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2091 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2055 <nil key="highlightedColor"/> 2092 <nil key="highlightedColor"/>
2056 </label> 2093 </label>
2057 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk"> 2094 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yd2-ue-tBk">
2058 - <rect key="frame" x="132.5" y="13.5" width="122.5" height="14"/> 2095 + <rect key="frame" x="132.5" y="13" width="122.5" height="15"/>
2059 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2096 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2060 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2097 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2061 <nil key="highlightedColor"/> 2098 <nil key="highlightedColor"/>
...@@ -2067,7 +2104,7 @@ ...@@ -2067,7 +2104,7 @@
2067 </constraints> 2104 </constraints>
2068 </stackView> 2105 </stackView>
2069 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td"> 2106 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EEj-3C-9Td">
2070 - <rect key="frame" x="119" y="58" width="255" height="14"/> 2107 + <rect key="frame" x="119" y="57.5" width="255" height="15"/>
2071 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2108 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2072 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2109 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2073 <nil key="highlightedColor"/> 2110 <nil key="highlightedColor"/>
...@@ -2131,16 +2168,16 @@ ...@@ -2131,16 +2168,16 @@
2131 <rect key="frame" x="10" y="0.0" width="394" height="100"/> 2168 <rect key="frame" x="10" y="0.0" width="394" height="100"/>
2132 <subviews> 2169 <subviews>
2133 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Pso-iJ-S9p"> 2170 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Pso-iJ-S9p">
2134 - <rect key="frame" x="20" y="31" width="254" height="38"/> 2171 + <rect key="frame" x="20" y="30" width="254" height="40"/>
2135 <subviews> 2172 <subviews>
2136 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T8m-z1-J6k"> 2173 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ενεργός κωδικός:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T8m-z1-J6k">
2137 - <rect key="frame" x="0.0" y="0.0" width="254" height="20"/> 2174 + <rect key="frame" x="0.0" y="0.0" width="254" height="21"/>
2138 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="17"/> 2175 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="17"/>
2139 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2176 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2140 <nil key="highlightedColor"/> 2177 <nil key="highlightedColor"/>
2141 </label> 2178 </label>
2142 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfx-z1-VHT"> 2179 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfx-z1-VHT">
2143 - <rect key="frame" x="0.0" y="22" width="254" height="0.0"/> 2180 + <rect key="frame" x="0.0" y="23" width="254" height="0.0"/>
2144 <subviews> 2181 <subviews>
2145 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TPp-HH-CgA"> 2182 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TPp-HH-CgA">
2146 <rect key="frame" x="0.0" y="0.0" width="254" height="0.0"/> 2183 <rect key="frame" x="0.0" y="0.0" width="254" height="0.0"/>
...@@ -2170,7 +2207,7 @@ ...@@ -2170,7 +2207,7 @@
2170 <nil key="highlightedColor"/> 2207 <nil key="highlightedColor"/>
2171 </label> 2208 </label>
2172 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zz2-r5-rnf"> 2209 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Λήγει σε 4 ημέρες" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zz2-r5-rnf">
2173 - <rect key="frame" x="0.0" y="24" width="254" height="14"/> 2210 + <rect key="frame" x="0.0" y="25" width="254" height="15"/>
2174 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2211 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2175 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2212 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2176 <nil key="highlightedColor"/> 2213 <nil key="highlightedColor"/>
...@@ -2279,13 +2316,13 @@ ...@@ -2279,13 +2316,13 @@
2279 <nil key="highlightedColor"/> 2316 <nil key="highlightedColor"/>
2280 </label> 2317 </label>
2281 <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"> 2318 <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">
2282 - <rect key="frame" x="292.5" y="25.5" width="81.5" height="14"/> 2319 + <rect key="frame" x="292.5" y="25" width="81.5" height="15"/>
2283 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2320 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2284 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2321 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2285 <nil key="highlightedColor"/> 2322 <nil key="highlightedColor"/>
2286 </label> 2323 </label>
2287 <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"> 2324 <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">
2288 - <rect key="frame" x="119" y="35.5" width="255" height="14"/> 2325 + <rect key="frame" x="119" y="34.5" width="255" height="15"/>
2289 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/> 2326 <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="12"/>
2290 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 2327 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
2291 <nil key="highlightedColor"/> 2328 <nil key="highlightedColor"/>
...@@ -2368,7 +2405,7 @@ ...@@ -2368,7 +2405,7 @@
2368 <rect key="frame" x="0.0" y="0.0" width="90" height="90"/> 2405 <rect key="frame" x="0.0" y="0.0" width="90" height="90"/>
2369 </imageView> 2406 </imageView>
2370 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHT-NP-UcH"> 2407 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AHT-NP-UcH">
2371 - <rect key="frame" x="5" y="51.5" width="80" height="16.5"/> 2408 + <rect key="frame" x="5" y="54" width="80" height="14"/>
2372 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="14"/> 2409 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="14"/>
2373 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2410 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2374 <nil key="highlightedColor"/> 2411 <nil key="highlightedColor"/>
...@@ -2394,7 +2431,7 @@ ...@@ -2394,7 +2431,7 @@
2394 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/> 2431 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
2395 </imageView> 2432 </imageView>
2396 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ku-5y-o0b"> 2433 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ku-5y-o0b">
2397 - <rect key="frame" x="5" y="44" width="65" height="13"/> 2434 + <rect key="frame" x="5" y="46" width="65" height="11"/>
2398 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2435 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2399 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2436 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2400 <nil key="highlightedColor"/> 2437 <nil key="highlightedColor"/>
...@@ -2435,7 +2472,7 @@ ...@@ -2435,7 +2472,7 @@
2435 <rect key="frame" x="0.0" y="0.0" width="75" height="73"/> 2472 <rect key="frame" x="0.0" y="0.0" width="75" height="73"/>
2436 </imageView> 2473 </imageView>
2437 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8JV-5a-Jar"> 2474 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8JV-5a-Jar">
2438 - <rect key="frame" x="5" y="42" width="65" height="13"/> 2475 + <rect key="frame" x="5" y="44" width="65" height="11"/>
2439 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2476 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2440 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2477 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2441 <nil key="highlightedColor"/> 2478 <nil key="highlightedColor"/>
...@@ -2476,7 +2513,7 @@ ...@@ -2476,7 +2513,7 @@
2476 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/> 2513 <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
2477 </imageView> 2514 </imageView>
2478 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxE-g9-jaK"> 2515 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxE-g9-jaK">
2479 - <rect key="frame" x="5" y="44" width="65" height="13"/> 2516 + <rect key="frame" x="5" y="46" width="65" height="11"/>
2480 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/> 2517 <fontDescription key="fontDescription" name="PFSquareSansPro-ExtraBlack" family="PF Square Sans Pro" pointSize="11"/>
2481 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/> 2518 <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
2482 <nil key="highlightedColor"/> 2519 <nil key="highlightedColor"/>
...@@ -2985,6 +3022,8 @@ ...@@ -2985,6 +3022,8 @@
2985 <outlet property="emptyView" destination="8YP-uG-vbV" id="SLO-UB-1ef"/> 3022 <outlet property="emptyView" destination="8YP-uG-vbV" id="SLO-UB-1ef"/>
2986 <outlet property="emptyViewHeight" destination="1ZE-EX-qXg" id="t7P-pD-h75"/> 3023 <outlet property="emptyViewHeight" destination="1ZE-EX-qXg" id="t7P-pD-h75"/>
2987 <outlet property="headerImage" destination="wP5-YG-vSP" id="MFN-m3-6ou"/> 3024 <outlet property="headerImage" destination="wP5-YG-vSP" id="MFN-m3-6ou"/>
3025 + <outlet property="historyButtonImage" destination="jfs-OZ-feO" id="xnA-Lt-F3w"/>
3026 + <outlet property="historyButtonView" destination="xIu-T5-fEm" id="fvk-mv-ReB"/>
2988 <outlet property="myPresentsLabel" destination="FiI-Ni-wy4" id="ZNw-OM-zsA"/> 3027 <outlet property="myPresentsLabel" destination="FiI-Ni-wy4" id="ZNw-OM-zsA"/>
2989 <outlet property="profileImage" destination="wJv-NF-rMf" id="Ues-Ru-2p2"/> 3028 <outlet property="profileImage" destination="wJv-NF-rMf" id="Ues-Ru-2p2"/>
2990 <outlet property="profileNameLabel" destination="1XZ-NB-F8P" id="C5F-WA-kOW"/> 3029 <outlet property="profileNameLabel" destination="1XZ-NB-F8P" id="C5F-WA-kOW"/>
......
...@@ -14,6 +14,8 @@ import SwiftEventBus ...@@ -14,6 +14,8 @@ import SwiftEventBus
14 @IBOutlet weak var profileImage: UIImageView! 14 @IBOutlet weak var profileImage: UIImageView!
15 @IBOutlet weak var profileNameLabel: UILabel! 15 @IBOutlet weak var profileNameLabel: UILabel!
16 @IBOutlet weak var questionnaireButton: UIButton! 16 @IBOutlet weak var questionnaireButton: UIButton!
17 + @IBOutlet weak var historyButtonView: UIView!
18 + @IBOutlet weak var historyButtonImage: UIImageView!
17 @IBOutlet weak var dfyEarnBannerView: UIView! 19 @IBOutlet weak var dfyEarnBannerView: UIView!
18 @IBOutlet weak var dfyEarnBannerHeight: NSLayoutConstraint! 20 @IBOutlet weak var dfyEarnBannerHeight: NSLayoutConstraint!
19 @IBOutlet weak var dfyEarnBannerTopSpace: NSLayoutConstraint! 21 @IBOutlet weak var dfyEarnBannerTopSpace: NSLayoutConstraint!
...@@ -164,6 +166,7 @@ import SwiftEventBus ...@@ -164,6 +166,7 @@ import SwiftEventBus
164 } 166 }
165 167
166 headerImage.image = UIImage(named: "ic_background_straight", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 168 headerImage.image = UIImage(named: "ic_background_straight", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
169 + historyButtonImage.image = UIImage(named: "ic_time_forward_blue", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
167 dfyEarnImage.image = UIImage(named: "wallet_dfy_3", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 170 dfyEarnImage.image = UIImage(named: "wallet_dfy_3", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
168 couponEarnImage.image = UIImage(named: "wallet_coupons_4", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 171 couponEarnImage.image = UIImage(named: "wallet_coupons_4", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
169 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 172 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
...@@ -216,10 +219,15 @@ import SwiftEventBus ...@@ -216,10 +219,15 @@ import SwiftEventBus
216 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 219 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
217 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 220 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
218 221
219 - questionnaireButton.layer.cornerRadius = 15.0 222 + questionnaireButton.layer.cornerRadius = 16.0
220 - questionnaireButton.layer.borderWidth = 2 223 + questionnaireButton.layer.borderWidth = 1
221 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 224 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
222 225
226 + historyButtonView.backgroundColor = .clear
227 + historyButtonView.layer.cornerRadius = 16.0
228 + historyButtonView.layer.borderWidth = 1
229 + historyButtonView.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
230 +
223 dfyEarnBannerInnerView.layer.cornerRadius = 16.5 231 dfyEarnBannerInnerView.layer.cornerRadius = 16.5
224 // dfyEarnBannerInnerView.layer.borderWidth = 1 232 // dfyEarnBannerInnerView.layer.borderWidth = 1
225 // dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor 233 // dfyEarnBannerInnerView.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
...@@ -538,8 +546,8 @@ import SwiftEventBus ...@@ -538,8 +546,8 @@ import SwiftEventBus
538 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42) 546 questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
539 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20) 547 questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
540 548
541 - questionnaireButton.layer.cornerRadius = 15.0 549 + questionnaireButton.layer.cornerRadius = 16.0
542 - questionnaireButton.layer.borderWidth = 2 550 + questionnaireButton.layer.borderWidth = 1
543 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor 551 questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
544 } 552 }
545 553
...@@ -743,6 +751,11 @@ import SwiftEventBus ...@@ -743,6 +751,11 @@ import SwiftEventBus
743 swiftApi().openQuestionnaire(self); 751 swiftApi().openQuestionnaire(self);
744 } 752 }
745 753
754 + @IBAction func historyButtonAction(_ sender: Any) {
755 + // TODO: Open new HistoryVC
756 + print("=== historyButton Pressed ===")
757 + }
758 +
746 @IBAction func dfyEarnButtonAction(_ sender: Any) { 759 @IBAction func dfyEarnButtonAction(_ sender: Any) {
747 print("DFY coupon banner pressed!") 760 print("DFY coupon banner pressed!")
748 // analysis_pressed event 761 // analysis_pressed event
......