open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
2831f094 1 parent 6b249079

redesign WalletViewController v1

Inline Side-by-side
Showing 5 changed files with 94 additions and 65 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -9,9 +9,18 @@ ...@@ -9,9 +9,18 @@
9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 </dependencies> 10 </dependencies>
11 <customFonts key="customFonts"> 11 <customFonts key="customFonts">
12 + <array key="BTCosmo-Bold.ttf">
13 + <string>BTCosmo-Bold</string>
14 + </array>
15 + <array key="PeridotPE-Bold.ttf">
16 + <string>PeridotPE-Bold</string>
17 + </array>
12 <array key="PeridotPE-Regular.ttf"> 18 <array key="PeridotPE-Regular.ttf">
13 <string>PeridotPE-Regular</string> 19 <string>PeridotPE-Regular</string>
14 </array> 20 </array>
21 + <array key="PeridotPE-SemiBold.ttf">
22 + <string>PeridotPE-SBold</string>
23 + </array>
15 <array key="pf_square_sans_pro_bold.ttf"> 24 <array key="pf_square_sans_pro_bold.ttf">
16 <string>PFSquareSansPro-Bold</string> 25 <string>PFSquareSansPro-Bold</string>
17 </array> 26 </array>
...@@ -1312,7 +1321,7 @@ ...@@ -1312,7 +1321,7 @@
1312 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Et1-y7-npI" userLabel="HeaderView"> 1321 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Et1-y7-npI" userLabel="HeaderView">
1313 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/> 1322 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/>
1314 <subviews> 1323 <subviews>
1315 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_background_circle" translatesAutoresizingMaskIntoConstraints="NO" id="wP5-YG-vSP"> 1324 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_background_straight" translatesAutoresizingMaskIntoConstraints="NO" id="wP5-YG-vSP">
1316 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/> 1325 <rect key="frame" x="0.0" y="0.0" width="414" height="663"/>
1317 </imageView> 1326 </imageView>
1318 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf"> 1327 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wJv-NF-rMf">
...@@ -1323,15 +1332,15 @@ ...@@ -1323,15 +1332,15 @@
1323 </constraints> 1332 </constraints>
1324 </imageView> 1333 </imageView>
1325 <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"> 1334 <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">
1326 - <rect key="frame" x="20" y="105" width="374" height="16"/> 1335 + <rect key="frame" x="20" y="105" width="374" height="21"/>
1327 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 1336 + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="17"/>
1328 - <color key="textColor" red="0.25490196079999999" green="0.33333333329999998" blue="0.3921568627" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 1337 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1329 <nil key="highlightedColor"/> 1338 <nil key="highlightedColor"/>
1330 </label> 1339 </label>
1331 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV"> 1340 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UNL-Oh-sPV">
1332 - <rect key="frame" x="176.5" y="131" width="61" height="512"/> 1341 + <rect key="frame" x="172" y="136" width="70" height="507"/>
1333 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1342 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1334 - <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="14"/> 1343 + <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="15"/>
1335 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/> 1344 <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
1336 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 1345 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
1337 <state key="normal" title="Button"> 1346 <state key="normal" title="Button">
...@@ -1598,9 +1607,9 @@ ...@@ -1598,9 +1607,9 @@
1598 </constraints> 1607 </constraints>
1599 </imageView> 1608 </imageView>
1600 <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"> 1609 <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">
1601 - <rect key="frame" x="0.0" y="125" width="374" height="16"/> 1610 + <rect key="frame" x="0.0" y="125" width="374" height="18.5"/>
1602 - <fontDescription key="fontDescription" name="PFSquareSansPro-Regular" family="PF Square Sans Pro" pointSize="16"/> 1611 + <fontDescription key="fontDescription" name="PeridotPE-Regular" family="Peridot PE" pointSize="15"/>
1603 - <color key="textColor" red="1" green="1" blue="1" alpha="0.60999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/> 1612 + <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
1604 <nil key="highlightedColor"/> 1613 <nil key="highlightedColor"/>
1605 </label> 1614 </label>
1606 </subviews> 1615 </subviews>
...@@ -1615,7 +1624,7 @@ ...@@ -1615,7 +1624,7 @@
1615 </constraints> 1624 </constraints>
1616 </view> 1625 </view>
1617 </subviews> 1626 </subviews>
1618 - <color key="backgroundColor" red="0.21960784310000001" green="0.32156862749999998" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 1627 + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
1619 <constraints> 1628 <constraints>
1620 <constraint firstItem="8YP-uG-vbV" firstAttribute="leading" secondItem="ICd-s2-mfF" secondAttribute="leading" constant="20" id="34j-DQ-Raf"/> 1629 <constraint firstItem="8YP-uG-vbV" firstAttribute="leading" secondItem="ICd-s2-mfF" secondAttribute="leading" constant="20" id="34j-DQ-Raf"/>
1621 <constraint firstItem="gdf-s4-2CF" firstAttribute="top" secondItem="Fef-hi-2VL" secondAttribute="bottom" constant="40" id="4FL-Zz-Okv"/> 1630 <constraint firstItem="gdf-s4-2CF" firstAttribute="top" secondItem="Fef-hi-2VL" secondAttribute="bottom" constant="40" id="4FL-Zz-Okv"/>
...@@ -2207,7 +2216,7 @@ ...@@ -2207,7 +2216,7 @@
2207 </connections> 2216 </connections>
2208 </tableView> 2217 </tableView>
2209 </subviews> 2218 </subviews>
2210 - <color key="backgroundColor" red="0.2196078431372549" green="0.32156862745098036" blue="0.40392156862745099" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/> 2219 + <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
2211 <constraints> 2220 <constraints>
2212 <constraint firstItem="jYz-96-Lp1" firstAttribute="top" secondItem="VHx-uN-GE4" secondAttribute="top" id="5Xw-UM-jF7"/> 2221 <constraint firstItem="jYz-96-Lp1" firstAttribute="top" secondItem="VHx-uN-GE4" secondAttribute="top" id="5Xw-UM-jF7"/>
2213 <constraint firstItem="jYz-96-Lp1" firstAttribute="leading" secondItem="VHx-uN-GE4" secondAttribute="leading" id="bfu-UW-7CF"/> 2222 <constraint firstItem="jYz-96-Lp1" firstAttribute="leading" secondItem="VHx-uN-GE4" secondAttribute="leading" id="bfu-UW-7CF"/>
...@@ -2675,18 +2684,18 @@ ...@@ -2675,18 +2684,18 @@
2675 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> 2684 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
2676 <nil key="highlightedColor"/> 2685 <nil key="highlightedColor"/>
2677 </label> 2686 </label>
2678 - <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G6f-Nu-2R5"> 2687 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6f-Nu-2R5">
2679 - <rect key="frame" x="119" y="77" width="58.5" height="21"/> 2688 + <rect key="frame" x="119" y="24" width="58.5" height="0.0"/>
2680 <subviews> 2689 <subviews>
2681 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LGs-y6-UbY"> 2690 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LGs-y6-UbY">
2682 - <rect key="frame" x="5" y="3" width="15" height="15"/> 2691 + <rect key="frame" x="5" y="3" width="15" height="0.0"/>
2683 <constraints> 2692 <constraints>
2684 <constraint firstAttribute="height" constant="15" id="9tK-aY-Rdn"/> 2693 <constraint firstAttribute="height" constant="15" id="9tK-aY-Rdn"/>
2685 <constraint firstAttribute="width" constant="15" id="m2Y-SE-d4q"/> 2694 <constraint firstAttribute="width" constant="15" id="m2Y-SE-d4q"/>
2686 </constraints> 2695 </constraints>
2687 </imageView> 2696 </imageView>
2688 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dF5-HE-P9n"> 2697 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dF5-HE-P9n">
2689 - <rect key="frame" x="25" y="4.5" width="28.5" height="12"/> 2698 + <rect key="frame" x="25" y="-6" width="28.5" height="12"/>
2690 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/> 2699 <fontDescription key="fontDescription" name="PFSquareSansPro-Medium" family="PF Square Sans Pro" pointSize="12"/>
2691 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/> 2700 <color key="textColor" red="0.3803921569" green="0.4431372549" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
2692 <nil key="highlightedColor"/> 2701 <nil key="highlightedColor"/>
...@@ -2757,10 +2766,10 @@ ...@@ -2757,10 +2766,10 @@
2757 </connections> 2766 </connections>
2758 </tableViewCell> 2767 </tableViewCell>
2759 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework"> 2768 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UnifiedCouponBCFooterTableViewCell" id="LD5-ES-J67" customClass="UnifiedCouponBCFooterTableViewCell" customModule="SwiftWarplyFramework">
2760 - <rect key="frame" x="0.0" y="1010.5" width="414" height="189"/> 2769 + <rect key="frame" x="0.0" y="1010.5" width="414" height="44"/>
2761 <autoresizingMask key="autoresizingMask"/> 2770 <autoresizingMask key="autoresizingMask"/>
2762 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5"> 2771 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LD5-ES-J67" id="DmN-AA-8n5">
2763 - <rect key="frame" x="0.0" y="0.0" width="414" height="189"/> 2772 + <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
2764 <autoresizingMask key="autoresizingMask"/> 2773 <autoresizingMask key="autoresizingMask"/>
2765 <subviews> 2774 <subviews>
2766 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ"> 2775 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L4W-1e-9fQ">
...@@ -3209,10 +3218,10 @@ ...@@ -3209,10 +3218,10 @@
3209 <nil key="highlightedColor"/> 3218 <nil key="highlightedColor"/>
3210 </label> 3219 </label>
3211 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View"> 3220 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zdf-1r-FdJ" userLabel="Coupon View">
3212 - <rect key="frame" x="150.5" y="415" width="113.5" height="55"/> 3221 + <rect key="frame" x="150.5" y="415" width="113" height="55"/>
3213 <subviews> 3222 <subviews>
3214 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BJS-kk-CBZ" customClass="CopyableLabel" customModule="SwiftWarplyFramework" customModuleProvider="target"> 3223 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BJS-kk-CBZ" customClass="CopyableLabel" customModule="SwiftWarplyFramework" customModuleProvider="target">
3215 - <rect key="frame" x="20" y="10.5" width="73.5" height="34.5"/> 3224 + <rect key="frame" x="20" y="10.5" width="73" height="34"/>
3216 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="28"/> 3225 <fontDescription key="fontDescription" name="PeridotPE-Bold" family="Peridot PE" pointSize="28"/>
3217 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/> 3226 <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
3218 <nil key="highlightedColor"/> 3227 <nil key="highlightedColor"/>
...@@ -4654,7 +4663,7 @@ ...@@ -4654,7 +4663,7 @@
4654 <image name="coupons_scrollview_white" width="214" height="462"/> 4663 <image name="coupons_scrollview_white" width="214" height="462"/>
4655 <image name="curved_bg_white" width="159.5" height="118.5"/> 4664 <image name="curved_bg_white" width="159.5" height="118.5"/>
4656 <image name="dfy_logo_white" width="1611" height="395"/> 4665 <image name="dfy_logo_white" width="1611" height="395"/>
4657 - <image name="ic_background_circle" width="214" height="134"/> 4666 + <image name="ic_background_straight" width="214" height="133"/>
4658 <image name="ic_close_2" width="17" height="17.5"/> 4667 <image name="ic_close_2" width="17" height="17.5"/>
4659 <image name="ic_down_dark" width="24" height="24"/> 4668 <image name="ic_down_dark" width="24" height="24"/>
4660 <image name="new_icon" width="37" height="17"/> 4669 <image name="new_icon" width="37" height="17"/>
......
...@@ -102,7 +102,8 @@ import SwiftEventBus ...@@ -102,7 +102,8 @@ import SwiftEventBus
102 // dfyCoupons = swiftApi().getActiveDFYCoupons() 102 // dfyCoupons = swiftApi().getActiveDFYCoupons()
103 // TODO: DELETE <=== 103 // TODO: DELETE <===
104 104
105 - getUnifiedCouponsRequest() 105 + // TODO: Uncomment when UnifiedCoupons will be shown again
106 +// getUnifiedCouponsRequest()
106 107
107 setBackButton() 108 setBackButton()
108 setNavigationTitle("My Rewards") 109 setNavigationTitle("My Rewards")
...@@ -123,11 +124,13 @@ import SwiftEventBus ...@@ -123,11 +124,13 @@ import SwiftEventBus
123 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 124 dfyLogoImage.image = UIImage(named: "dfy_logo_colored", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
124 activeCodeImage.image = UIImage(named: "active_code_logo", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 125 activeCodeImage.image = UIImage(named: "active_code_logo", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
125 126
126 - profileImage.layer.cornerRadius = 32.5 127 + if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") {
128 +
129 + profileImage.layer.cornerRadius = 19
130 + profileImage.layer.maskedCorners = [ .layerMinXMinYCorner, .layerMaxXMaxYCorner] // Top left, bottom right corner radius
127 profileImage.layer.borderWidth = 1 131 profileImage.layer.borderWidth = 1
128 - profileImage.layer.borderColor = UIColor(red: 0.13, green: 0.66, blue: 0.71, alpha: 1.00).cgColor 132 + profileImage.layer.borderColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00).cgColor
129 133
130 - if (profile != nil && !(profile?._image_url is NSNull) && profile?._image_url != nil && profile?._image_url != "") {
131 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache()) 134 profileImage.load(link: profile?._image_url ?? "", placeholder: UIImage(), cache: URLCache())
132 } else { 135 } else {
133 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) 136 profileImage.image = UIImage(named: "default_profile_image_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil)
...@@ -141,28 +144,36 @@ import SwiftEventBus ...@@ -141,28 +144,36 @@ import SwiftEventBus
141 print("User tag: " + userTag) 144 print("User tag: " + userTag)
142 if (userTag != "" && userTag != "undefined") { 145 if (userTag != "" && userTag != "undefined") {
143 questionnaireButton.setTitle(userTag, for: .normal) 146 questionnaireButton.setTitle(userTag, for: .normal)
144 - questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14) 147 +// questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
145 - questionnaireButton.setTitleColor(.white, for: .normal) 148 +// questionnaireButton.setTitleColor(.white, for: .normal)
146 - // questionnaireButton.sizeToFit() 149 +// // questionnaireButton.sizeToFit()
147 - questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26) 150 +// questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
148 - questionnaireButton.applyGradient(colours: [UIColor(red: 0.40, green: 0.77, blue: 0.28, alpha: 1.00), UIColor(red: 0.10, green: 0.66, blue: 0.72, alpha: 1.00)], gradient: GradientOrientation.horizontal, cornerRadius: 7.0) 151 +// questionnaireButton.applyGradient(colours: [UIColor(red: 0.40, green: 0.77, blue: 0.28, alpha: 1.00), UIColor(red: 0.10, green: 0.66, blue: 0.72, alpha: 1.00)], gradient: GradientOrientation.horizontal, cornerRadius: 7.0)
149 - // Shadow Color 152 +// // Shadow Color
150 - questionnaireButton.layer.shadowColor = UIColor(red: 0.33, green: 0.38, blue: 0.43, alpha: 1.00).cgColor 153 +// questionnaireButton.layer.shadowColor = UIColor(red: 0.33, green: 0.38, blue: 0.43, alpha: 1.00).cgColor
151 - questionnaireButton.layer.shadowOffset = CGSize(width: 0.0, height: 2.0) 154 +// questionnaireButton.layer.shadowOffset = CGSize(width: 0.0, height: 2.0)
152 - questionnaireButton.layer.shadowOpacity = 1.0 155 +// questionnaireButton.layer.shadowOpacity = 1.0
153 - questionnaireButton.layer.shadowRadius = 0.0 156 +// questionnaireButton.layer.shadowRadius = 0.0
154 - questionnaireButton.layer.masksToBounds = false 157 +// questionnaireButton.layer.masksToBounds = false
155 - questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 7, left: 10, bottom: 3, right: 10) 158 +// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 7, left: 10, bottom: 3, right: 10)
156 } else { 159 } else {
157 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal) 160 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
158 - questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14) 161 +// questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
159 - questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) 162 +// questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
160 - questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 163 +// questionnaireButton.backgroundColor = .clear
161 - questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26) 164 +// questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
162 - questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10) 165 +// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
163 } 166 }
164 167
165 - questionnaireButton.layer.cornerRadius = 7.0 168 + questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
169 + questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
170 + questionnaireButton.backgroundColor = .clear
171 + questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
172 + questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
173 +
174 + questionnaireButton.layer.cornerRadius = 15.0
175 + questionnaireButton.layer.borderWidth = 2
176 + questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
166 177
167 dfyEarnBannerView.layer.cornerRadius = 5.0 178 dfyEarnBannerView.layer.cornerRadius = 5.0
168 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor 179 dfyEarnBannerView.layer.shadowColor = UIColor(red: 0.00, green: 0.00, blue: 0.00, alpha: 0.16).cgColor
...@@ -407,18 +418,18 @@ import SwiftEventBus ...@@ -407,18 +418,18 @@ import SwiftEventBus
407 if (questionnaireButton.currentTitle != userTag) { 418 if (questionnaireButton.currentTitle != userTag) {
408 if (userTag != "" && userTag != "undefined") { 419 if (userTag != "" && userTag != "undefined") {
409 questionnaireButton.setTitle(userTag, for: .normal) 420 questionnaireButton.setTitle(userTag, for: .normal)
410 - questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14) 421 +// questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
411 - questionnaireButton.setTitleColor(.white, for: .normal) 422 +// questionnaireButton.setTitleColor(.white, for: .normal)
412 - // questionnaireButton.sizeToFit() 423 +// // questionnaireButton.sizeToFit()
413 - questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26) 424 +// questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
414 - questionnaireButton.applyGradient(colours: [UIColor(red: 0.40, green: 0.77, blue: 0.28, alpha: 1.00), UIColor(red: 0.10, green: 0.66, blue: 0.72, alpha: 1.00)], gradient: GradientOrientation.horizontal, cornerRadius: 7.0) 425 +// questionnaireButton.applyGradient(colours: [UIColor(red: 0.40, green: 0.77, blue: 0.28, alpha: 1.00), UIColor(red: 0.10, green: 0.66, blue: 0.72, alpha: 1.00)], gradient: GradientOrientation.horizontal, cornerRadius: 7.0)
415 - // Shadow Color 426 +// // Shadow Color
416 - questionnaireButton.layer.shadowColor = UIColor(red: 0.33, green: 0.38, blue: 0.43, alpha: 1.00).cgColor 427 +// questionnaireButton.layer.shadowColor = UIColor(red: 0.33, green: 0.38, blue: 0.43, alpha: 1.00).cgColor
417 - questionnaireButton.layer.shadowOffset = CGSize(width: 0.0, height: 2.0) 428 +// questionnaireButton.layer.shadowOffset = CGSize(width: 0.0, height: 2.0)
418 - questionnaireButton.layer.shadowOpacity = 1.0 429 +// questionnaireButton.layer.shadowOpacity = 1.0
419 - questionnaireButton.layer.shadowRadius = 0.0 430 +// questionnaireButton.layer.shadowRadius = 0.0
420 - questionnaireButton.layer.masksToBounds = false 431 +// questionnaireButton.layer.masksToBounds = false
421 - questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 7, left: 10, bottom: 3, right: 10) 432 +// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 7, left: 10, bottom: 3, right: 10)
422 } else { 433 } else {
423 for layer in (questionnaireButton.layer.sublayers ?? []) { 434 for layer in (questionnaireButton.layer.sublayers ?? []) {
424 if(layer.name == "linearGradientLayer"){ 435 if(layer.name == "linearGradientLayer"){
...@@ -427,17 +438,26 @@ import SwiftEventBus ...@@ -427,17 +438,26 @@ import SwiftEventBus
427 } 438 }
428 questionnaireButton.layer.shadowOpacity = 0.0; 439 questionnaireButton.layer.shadowOpacity = 0.0;
429 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal) 440 questionnaireButton.setTitle("+Προτιμήσεις", for: .normal)
430 - questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14) 441 +// questionnaireButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 14)
431 - questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal) 442 +// questionnaireButton.setTitleColor(UIColor(red: 0.31, green: 0.62, blue: 0.18, alpha: 1.00), for: .normal)
432 - questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00) 443 +// questionnaireButton.backgroundColor = UIColor(red: 0.90, green: 0.90, blue: 0.90, alpha: 1.00)
433 - questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26) 444 +// questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 26)
434 - questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10) 445 +// questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
435 } 446 }
436 - questionnaireButton.layer.cornerRadius = 7.0 447 + questionnaireButton.titleLabel?.font = UIFont(name: "PeridotPE-Bold", size: 15)
448 + questionnaireButton.setTitleColor(UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00), for: .normal)
449 + questionnaireButton.backgroundColor = .clear
450 + questionnaireButton.frame = CGRect(x: 0.0, y: 0.0, width: questionnaireButton.intrinsicContentSize.width, height: 42)
451 + questionnaireButton.contentEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
452 +
453 + questionnaireButton.layer.cornerRadius = 15.0
454 + questionnaireButton.layer.borderWidth = 2
455 + questionnaireButton.layer.borderColor = UIColor(red: 0.05, green: 0.65, blue: 0.00, alpha: 1.00).cgColor
437 } 456 }
438 457
439 self.coupons = swiftApi().getCouponList() 458 self.coupons = swiftApi().getCouponList()
440 - self.unifiedCoupons = swiftApi().getUnifiedCouponList() 459 + // TODO: Uncomment when UnifiedCoupons will be shown again
460 +// self.unifiedCoupons = swiftApi().getUnifiedCouponList()
441 self.updateMarketBadge() 461 self.updateMarketBadge()
442 self.tableView.reloadData() 462 self.tableView.reloadData()
443 463
......