Showing
13 changed files
with
53 additions
and
53 deletions
No preview for this file type
| ... | @@ -185,7 +185,7 @@ import AVFoundation | ... | @@ -185,7 +185,7 @@ import AVFoundation |
| 185 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 185 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) |
| 186 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 186 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 187 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 187 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 188 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 188 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 189 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft | 189 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft |
| 190 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 190 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 191 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 191 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -269,7 +269,7 @@ import AVFoundation | ... | @@ -269,7 +269,7 @@ import AVFoundation |
| 269 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 269 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 270 | termsButton.setTitle("Όροι χρήσης", for: .normal) | 270 | termsButton.setTitle("Όροι χρήσης", for: .normal) |
| 271 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 271 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 272 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 272 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 273 | termsButton.semanticContentAttribute = .forceRightToLeft | 273 | termsButton.semanticContentAttribute = .forceRightToLeft |
| 274 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 274 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 275 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 275 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -322,12 +322,12 @@ import AVFoundation | ... | @@ -322,12 +322,12 @@ import AVFoundation |
| 322 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) | 322 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) |
| 323 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height | 323 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height |
| 324 | 324 | ||
| 325 | - termsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 325 | + termsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 326 | } else { | 326 | } else { |
| 327 | termsTextView.isHidden = true | 327 | termsTextView.isHidden = true |
| 328 | termsTextViewHeight.constant = CGFloat(0) | 328 | termsTextViewHeight.constant = CGFloat(0) |
| 329 | 329 | ||
| 330 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 330 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 331 | } | 331 | } |
| 332 | } | 332 | } |
| 333 | 333 | ||
| ... | @@ -352,7 +352,7 @@ import AVFoundation | ... | @@ -352,7 +352,7 @@ import AVFoundation |
| 352 | border2TopSpace.constant = CGFloat(15) // 15 | 352 | border2TopSpace.constant = CGFloat(15) // 15 |
| 353 | 353 | ||
| 354 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) | 354 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) |
| 355 | - showBarcodeButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 355 | + showBarcodeButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 356 | 356 | ||
| 357 | } else { | 357 | } else { |
| 358 | barcodeImage.isHidden = true | 358 | barcodeImage.isHidden = true |
| ... | @@ -369,7 +369,7 @@ import AVFoundation | ... | @@ -369,7 +369,7 @@ import AVFoundation |
| 369 | border2TopSpace.constant = CGFloat(0) // 15 | 369 | border2TopSpace.constant = CGFloat(0) // 15 |
| 370 | 370 | ||
| 371 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 371 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 372 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 372 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 373 | } | 373 | } |
| 374 | } | 374 | } |
| 375 | 375 | ... | ... |
| ... | @@ -116,7 +116,7 @@ import SwiftEventBus | ... | @@ -116,7 +116,7 @@ import SwiftEventBus |
| 116 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 116 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 117 | termsButton.setTitle("Όροι χρήσης", for: .normal) | 117 | termsButton.setTitle("Όροι χρήσης", for: .normal) |
| 118 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 118 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 119 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 119 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 120 | termsButton.semanticContentAttribute = .forceRightToLeft | 120 | termsButton.semanticContentAttribute = .forceRightToLeft |
| 121 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 121 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 122 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 122 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -179,12 +179,12 @@ import SwiftEventBus | ... | @@ -179,12 +179,12 @@ import SwiftEventBus |
| 179 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) | 179 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) |
| 180 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height | 180 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height |
| 181 | 181 | ||
| 182 | - termsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 182 | + termsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 183 | } else { | 183 | } else { |
| 184 | termsTextView.isHidden = true | 184 | termsTextView.isHidden = true |
| 185 | termsTextViewHeight.constant = CGFloat(0) | 185 | termsTextViewHeight.constant = CGFloat(0) |
| 186 | 186 | ||
| 187 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 187 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 188 | } | 188 | } |
| 189 | } | 189 | } |
| 190 | 190 | ... | ... |
| ... | @@ -41,7 +41,7 @@ import UIKit | ... | @@ -41,7 +41,7 @@ import UIKit |
| 41 | inboxView.layer.shadowRadius = 15.0 | 41 | inboxView.layer.shadowRadius = 15.0 |
| 42 | inboxView.clipsToBounds = true | 42 | inboxView.clipsToBounds = true |
| 43 | 43 | ||
| 44 | - newBadgeImage.image = UIImage(named: "new_icon", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 44 | + newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 45 | 45 | ||
| 46 | newBadgeImage.isHidden = true | 46 | newBadgeImage.isHidden = true |
| 47 | } | 47 | } | ... | ... |
| ... | @@ -40,7 +40,7 @@ import UIKit | ... | @@ -40,7 +40,7 @@ import UIKit |
| 40 | inboxView.layer.cornerRadius = 5.0 | 40 | inboxView.layer.cornerRadius = 5.0 |
| 41 | inboxView.clipsToBounds = true | 41 | inboxView.clipsToBounds = true |
| 42 | 42 | ||
| 43 | - newBadgeImage.image = UIImage(named: "new_icon", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 43 | + newBadgeImage.image = UIImage(named: "new_icon_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 44 | curvedBgImage.image = UIImage(named: "curved_bg_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 44 | curvedBgImage.image = UIImage(named: "curved_bg_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 45 | 45 | ||
| 46 | newBadgeImage.isHidden = true | 46 | newBadgeImage.isHidden = true | ... | ... |
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> |
| 3 | <device id="retina6_1" orientation="portrait" appearance="light"/> | 3 | <device id="retina6_1" orientation="portrait" appearance="light"/> |
| 4 | <dependencies> | 4 | <dependencies> |
| 5 | <deployment identifier="iOS"/> | 5 | <deployment identifier="iOS"/> |
| 6 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> | 6 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/> |
| 7 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> | 7 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 8 | <capability name="System colors in document resources" minToolsVersion="11.0"/> | 8 | <capability name="System colors in document resources" minToolsVersion="11.0"/> |
| 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"/> |
| ... | @@ -33,13 +33,13 @@ | ... | @@ -33,13 +33,13 @@ |
| 33 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 33 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 34 | <subviews> | 34 | <subviews> |
| 35 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rKl-bF-Zpf" userLabel="Main View"> | 35 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rKl-bF-Zpf" userLabel="Main View"> |
| 36 | - <rect key="frame" x="0.0" y="44" width="414" height="852"/> | 36 | + <rect key="frame" x="0.0" y="48" width="414" height="848"/> |
| 37 | <subviews> | 37 | <subviews> |
| 38 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupons_scrollview_white" translatesAutoresizingMaskIntoConstraints="NO" id="tVJ-fk-ani"> | 38 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coupons_scrollview_white" translatesAutoresizingMaskIntoConstraints="NO" id="tVJ-fk-ani"> |
| 39 | <rect key="frame" x="0.0" y="0.0" width="414" height="852"/> | 39 | <rect key="frame" x="0.0" y="0.0" width="414" height="852"/> |
| 40 | </imageView> | 40 | </imageView> |
| 41 | <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="F1c-ck-cQa"> | 41 | <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="F1c-ck-cQa"> |
| 42 | - <rect key="frame" x="0.0" y="0.0" width="414" height="852"/> | 42 | + <rect key="frame" x="0.0" y="0.0" width="414" height="848"/> |
| 43 | </mapView> | 43 | </mapView> |
| 44 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z8H-fT-Lo9"> | 44 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z8H-fT-Lo9"> |
| 45 | <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> | 45 | <rect key="frame" x="0.0" y="420" width="414" height="11.5"/> |
| ... | @@ -85,7 +85,7 @@ | ... | @@ -85,7 +85,7 @@ |
| 85 | <constraint firstAttribute="height" constant="40" id="oeu-zs-b1J"/> | 85 | <constraint firstAttribute="height" constant="40" id="oeu-zs-b1J"/> |
| 86 | </constraints> | 86 | </constraints> |
| 87 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | 87 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
| 88 | - <state key="normal" title="B" image="ic_close_2"> | 88 | + <state key="normal" title="B" image="ic_close_3"> |
| 89 | <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 89 | <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 90 | </state> | 90 | </state> |
| 91 | <connections> | 91 | <connections> |
| ... | @@ -93,66 +93,66 @@ | ... | @@ -93,66 +93,66 @@ |
| 93 | </connections> | 93 | </connections> |
| 94 | </button> | 94 | </button> |
| 95 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F55-qj-PDc" userLabel="LineTop"> | 95 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F55-qj-PDc" userLabel="LineTop"> |
| 96 | - <rect key="frame" x="10" y="52" width="394" height="1"/> | 96 | + <rect key="frame" x="10" y="40" width="394" height="1"/> |
| 97 | <constraints> | 97 | <constraints> |
| 98 | <constraint firstAttribute="height" constant="1" id="18a-J3-UZm"/> | 98 | <constraint firstAttribute="height" constant="1" id="18a-J3-UZm"/> |
| 99 | </constraints> | 99 | </constraints> |
| 100 | </view> | 100 | </view> |
| 101 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eDV-A1-pOO" userLabel="NameLogo"> | 101 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eDV-A1-pOO" userLabel="NameLogo"> |
| 102 | - <rect key="frame" x="30" y="78" width="30" height="30"/> | 102 | + <rect key="frame" x="30" y="66" width="30" height="30"/> |
| 103 | <constraints> | 103 | <constraints> |
| 104 | <constraint firstAttribute="width" constant="30" id="IjG-Iw-fIq"/> | 104 | <constraint firstAttribute="width" constant="30" id="IjG-Iw-fIq"/> |
| 105 | <constraint firstAttribute="height" constant="30" id="LnS-gV-hIi"/> | 105 | <constraint firstAttribute="height" constant="30" id="LnS-gV-hIi"/> |
| 106 | </constraints> | 106 | </constraints> |
| 107 | </imageView> | 107 | </imageView> |
| 108 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Intersport Χαλανδρίου" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MsK-eg-pkk" userLabel="NameLabel"> | 108 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Intersport Χαλανδρίου" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MsK-eg-pkk" userLabel="NameLabel"> |
| 109 | - <rect key="frame" x="70" y="72.5" width="314" height="21.5"/> | 109 | + <rect key="frame" x="70" y="60.5" width="314" height="21.5"/> |
| 110 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> | 110 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> |
| 111 | <nil key="textColor"/> | 111 | <nil key="textColor"/> |
| 112 | <nil key="highlightedColor"/> | 112 | <nil key="highlightedColor"/> |
| 113 | </label> | 113 | </label> |
| 114 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SHs-vI-jD7" userLabel="LineMiddle"> | 114 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SHs-vI-jD7" userLabel="LineMiddle"> |
| 115 | - <rect key="frame" x="10" y="133" width="394" height="1"/> | 115 | + <rect key="frame" x="10" y="121" width="394" height="1"/> |
| 116 | <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 116 | <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 117 | <constraints> | 117 | <constraints> |
| 118 | <constraint firstAttribute="height" constant="1" id="hMo-qH-T2k"/> | 118 | <constraint firstAttribute="height" constant="1" id="hMo-qH-T2k"/> |
| 119 | </constraints> | 119 | </constraints> |
| 120 | </view> | 120 | </view> |
| 121 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_phone" translatesAutoresizingMaskIntoConstraints="NO" id="KhY-nt-uwH" userLabel="phoneIcon"> | 121 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_phone" translatesAutoresizingMaskIntoConstraints="NO" id="KhY-nt-uwH" userLabel="phoneIcon"> |
| 122 | - <rect key="frame" x="30" y="164" width="20" height="20"/> | 122 | + <rect key="frame" x="30" y="152" width="20" height="20"/> |
| 123 | <constraints> | 123 | <constraints> |
| 124 | <constraint firstAttribute="height" constant="20" id="1rt-pN-Dld"/> | 124 | <constraint firstAttribute="height" constant="20" id="1rt-pN-Dld"/> |
| 125 | <constraint firstAttribute="width" constant="20" id="3Rd-ir-r7Q"/> | 125 | <constraint firstAttribute="width" constant="20" id="3Rd-ir-r7Q"/> |
| 126 | </constraints> | 126 | </constraints> |
| 127 | </imageView> | 127 | </imageView> |
| 128 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="210-6230543" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="knh-D9-CuM" userLabel="phoneLabel"> | 128 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="210-6230543" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="knh-D9-CuM" userLabel="phoneLabel"> |
| 129 | - <rect key="frame" x="60" y="154" width="324" height="40"/> | 129 | + <rect key="frame" x="60" y="142" width="324" height="40"/> |
| 130 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> | 130 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> |
| 131 | <nil key="textColor"/> | 131 | <nil key="textColor"/> |
| 132 | <nil key="highlightedColor"/> | 132 | <nil key="highlightedColor"/> |
| 133 | </label> | 133 | </label> |
| 134 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sAf-f8-8jc" userLabel="LineBottom"> | 134 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sAf-f8-8jc" userLabel="LineBottom"> |
| 135 | - <rect key="frame" x="10" y="214" width="394" height="1"/> | 135 | + <rect key="frame" x="10" y="202" width="394" height="1"/> |
| 136 | <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 136 | <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 137 | <constraints> | 137 | <constraints> |
| 138 | <constraint firstAttribute="height" constant="1" id="vSP-6I-Lz6"/> | 138 | <constraint firstAttribute="height" constant="1" id="vSP-6I-Lz6"/> |
| 139 | </constraints> | 139 | </constraints> |
| 140 | </view> | 140 | </view> |
| 141 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_address" translatesAutoresizingMaskIntoConstraints="NO" id="Bic-c4-J9E" userLabel="AddressIcon"> | 141 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_address" translatesAutoresizingMaskIntoConstraints="NO" id="Bic-c4-J9E" userLabel="AddressIcon"> |
| 142 | - <rect key="frame" x="30" y="240.5" width="20" height="20"/> | 142 | + <rect key="frame" x="30" y="234.5" width="20" height="20"/> |
| 143 | <constraints> | 143 | <constraints> |
| 144 | <constraint firstAttribute="height" constant="20" id="A8o-MY-I6f"/> | 144 | <constraint firstAttribute="height" constant="20" id="A8o-MY-I6f"/> |
| 145 | <constraint firstAttribute="width" constant="20" id="Xma-bp-6IZ"/> | 145 | <constraint firstAttribute="width" constant="20" id="Xma-bp-6IZ"/> |
| 146 | </constraints> | 146 | </constraints> |
| 147 | </imageView> | 147 | </imageView> |
| 148 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="ΕΘΝΙΚΗΣ ΑΝΤΙΣΤΑΣΕΩΣ 4 41" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="syP-Hv-OGD" userLabel="AddressLabel"> | 148 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="ΕΘΝΙΚΗΣ ΑΝΤΙΣΤΑΣΕΩΣ 4 41" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="syP-Hv-OGD" userLabel="AddressLabel"> |
| 149 | - <rect key="frame" x="60" y="235" width="247" height="31"/> | 149 | + <rect key="frame" x="60" y="223" width="239" height="43"/> |
| 150 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> | 150 | <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> |
| 151 | <nil key="textColor"/> | 151 | <nil key="textColor"/> |
| 152 | <nil key="highlightedColor"/> | 152 | <nil key="highlightedColor"/> |
| 153 | </label> | 153 | </label> |
| 154 | <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bw3-J9-wHr" userLabel="Directions" customClass="CSMButton" customModule="SwiftWarplyFramework" customModuleProvider="target"> | 154 | <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bw3-J9-wHr" userLabel="Directions" customClass="CSMButton" customModule="SwiftWarplyFramework" customModuleProvider="target"> |
| 155 | - <rect key="frame" x="317" y="235" width="67" height="31"/> | 155 | + <rect key="frame" x="309" y="223" width="75" height="43"/> |
| 156 | <state key="normal" title="Button"/> | 156 | <state key="normal" title="Button"/> |
| 157 | <buttonConfiguration key="configuration" style="plain" title="Button"/> | 157 | <buttonConfiguration key="configuration" style="plain" title="Button"/> |
| 158 | <connections> | 158 | <connections> |
| ... | @@ -160,7 +160,7 @@ | ... | @@ -160,7 +160,7 @@ |
| 160 | </connections> | 160 | </connections> |
| 161 | </button> | 161 | </button> |
| 162 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Δευτέρα - Τετάρτη" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u9U-A7-lbO" userLabel="HoursLabel"> | 162 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Δευτέρα - Τετάρτη" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u9U-A7-lbO" userLabel="HoursLabel"> |
| 163 | - <rect key="frame" x="70" y="92.5" width="314" height="21.5"/> | 163 | + <rect key="frame" x="70" y="80.5" width="314" height="21.5"/> |
| 164 | <fontDescription key="fontDescription" type="system" pointSize="18"/> | 164 | <fontDescription key="fontDescription" type="system" pointSize="18"/> |
| 165 | <color key="textColor" systemColor="systemGray2Color"/> | 165 | <color key="textColor" systemColor="systemGray2Color"/> |
| 166 | <nil key="highlightedColor"/> | 166 | <nil key="highlightedColor"/> |
| ... | @@ -227,7 +227,7 @@ | ... | @@ -227,7 +227,7 @@ |
| 227 | <resources> | 227 | <resources> |
| 228 | <image name="coupons_scrollview_white" width="214" height="462"/> | 228 | <image name="coupons_scrollview_white" width="214" height="462"/> |
| 229 | <image name="ic_address" width="12.5" height="17"/> | 229 | <image name="ic_address" width="12.5" height="17"/> |
| 230 | - <image name="ic_close_2" width="17" height="17.5"/> | 230 | + <image name="ic_close_3" width="17" height="17.5"/> |
| 231 | <image name="ic_phone" width="15.5" height="15.5"/> | 231 | <image name="ic_phone" width="15.5" height="15.5"/> |
| 232 | <systemColor name="systemBackgroundColor"> | 232 | <systemColor name="systemBackgroundColor"> |
| 233 | <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 233 | <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ... | ... |
| ... | @@ -76,7 +76,7 @@ protocol NumbersPopupDelegate { | ... | @@ -76,7 +76,7 @@ protocol NumbersPopupDelegate { |
| 76 | 76 | ||
| 77 | self.preferredContentSize = CGSize(width: widthPopup, height: heightPopup) | 77 | self.preferredContentSize = CGSize(width: widthPopup, height: heightPopup) |
| 78 | 78 | ||
| 79 | - closeButton.setImage(UIImage(named: "ic_close_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 79 | + closeButton.setImage(UIImage(named: "ic_close_3.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 80 | closeButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 80 | closeButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 81 | 81 | ||
| 82 | // self.tableView.reloadData() | 82 | // self.tableView.reloadData() | ... | ... |
| ... | @@ -88,7 +88,7 @@ import SwiftEventBus | ... | @@ -88,7 +88,7 @@ import SwiftEventBus |
| 88 | descriptionLabel.text = "Επίλεξε το κινητό από το οποίο θα γίνει η αποστολή και συμπλήρωσε το COSMOTE κινητό που θα λάβει το δώρο." | 88 | descriptionLabel.text = "Επίλεξε το κινητό από το οποίο θα γίνει η αποστολή και συμπλήρωσε το COSMOTE κινητό που θα λάβει το δώρο." |
| 89 | 89 | ||
| 90 | senderLabel.text = "Αποστολέας" | 90 | senderLabel.text = "Αποστολέας" |
| 91 | - senderArrowImage.image = UIImage(named: "ic_down_dark", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 91 | + senderArrowImage.image = UIImage(named: "ic_down_dark_2", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| 92 | 92 | ||
| 93 | senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside) | 93 | senderButton.addTarget(self, action: #selector(self.numbersPopupTapped(_:)), for: .touchUpInside) |
| 94 | 94 | ... | ... |
| ... | @@ -49,7 +49,7 @@ import SwiftEventBus | ... | @@ -49,7 +49,7 @@ import SwiftEventBus |
| 49 | 49 | ||
| 50 | numbersList = ccms?._eligibleAssets ?? [] | 50 | numbersList = ccms?._eligibleAssets ?? [] |
| 51 | 51 | ||
| 52 | - setBackButton("ic_close_2") | 52 | + setBackButton("ic_close_3") |
| 53 | setNavigationTitle(ccms?._titleOffer ?? "") | 53 | setNavigationTitle(ccms?._titleOffer ?? "") |
| 54 | 54 | ||
| 55 | backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) | 55 | backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: MyEmptyClass.resourceBundle(), compatibleWith: nil) |
| ... | @@ -112,7 +112,7 @@ import SwiftEventBus | ... | @@ -112,7 +112,7 @@ import SwiftEventBus |
| 112 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 112 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 113 | moreButton.setTitle("Δες Περισσότερα", for: .normal) | 113 | moreButton.setTitle("Δες Περισσότερα", for: .normal) |
| 114 | moreButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 114 | moreButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 115 | - moreButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 115 | + moreButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 116 | moreButton.semanticContentAttribute = .forceRightToLeft | 116 | moreButton.semanticContentAttribute = .forceRightToLeft |
| 117 | moreButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 117 | moreButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 118 | moreButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 118 | moreButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -144,12 +144,12 @@ import SwiftEventBus | ... | @@ -144,12 +144,12 @@ import SwiftEventBus |
| 144 | let targetSize = CGSize(width: moreTextView.frame.width, height: CGFloat(MAXFLOAT)) | 144 | let targetSize = CGSize(width: moreTextView.frame.width, height: CGFloat(MAXFLOAT)) |
| 145 | moreTextViewHeight.constant = moreTextView.sizeThatFits(targetSize).height | 145 | moreTextViewHeight.constant = moreTextView.sizeThatFits(targetSize).height |
| 146 | 146 | ||
| 147 | - moreButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 147 | + moreButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 148 | } else { | 148 | } else { |
| 149 | moreTextView.isHidden = true | 149 | moreTextView.isHidden = true |
| 150 | moreTextViewHeight.constant = CGFloat(0) | 150 | moreTextViewHeight.constant = CGFloat(0) |
| 151 | 151 | ||
| 152 | - moreButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 152 | + moreButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 153 | } | 153 | } |
| 154 | } | 154 | } |
| 155 | 155 | ... | ... |
| ... | @@ -83,7 +83,7 @@ import AVFoundation | ... | @@ -83,7 +83,7 @@ import AVFoundation |
| 83 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 83 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 84 | termsButton.setTitle("Όροι χρήσης", for: .normal) | 84 | termsButton.setTitle("Όροι χρήσης", for: .normal) |
| 85 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 85 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 86 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 86 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 87 | termsButton.semanticContentAttribute = .forceRightToLeft | 87 | termsButton.semanticContentAttribute = .forceRightToLeft |
| 88 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 88 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 89 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 89 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -127,12 +127,12 @@ import AVFoundation | ... | @@ -127,12 +127,12 @@ import AVFoundation |
| 127 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) | 127 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) |
| 128 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height | 128 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height |
| 129 | 129 | ||
| 130 | - termsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 130 | + termsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 131 | } else { | 131 | } else { |
| 132 | termsTextView.isHidden = true | 132 | termsTextView.isHidden = true |
| 133 | termsTextViewHeight.constant = CGFloat(0) | 133 | termsTextViewHeight.constant = CGFloat(0) |
| 134 | 134 | ||
| 135 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 135 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 136 | } | 136 | } |
| 137 | } | 137 | } |
| 138 | 138 | ... | ... |
| ... | @@ -93,7 +93,7 @@ import AVFoundation | ... | @@ -93,7 +93,7 @@ import AVFoundation |
| 93 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 93 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) |
| 94 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 94 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 95 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 95 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 96 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 96 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 97 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft | 97 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft |
| 98 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 98 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 99 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 99 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -104,7 +104,7 @@ import AVFoundation | ... | @@ -104,7 +104,7 @@ import AVFoundation |
| 104 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 104 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 105 | showCouponsButton.setTitle("Εμφάνιση κουπονιών", for: .normal) | 105 | showCouponsButton.setTitle("Εμφάνιση κουπονιών", for: .normal) |
| 106 | showCouponsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 106 | showCouponsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 107 | - showCouponsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 107 | + showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 108 | showCouponsButton.semanticContentAttribute = .forceRightToLeft | 108 | showCouponsButton.semanticContentAttribute = .forceRightToLeft |
| 109 | showCouponsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 109 | showCouponsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 110 | showCouponsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 110 | showCouponsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -240,7 +240,7 @@ import AVFoundation | ... | @@ -240,7 +240,7 @@ import AVFoundation |
| 240 | border2TopSpace.constant = CGFloat(15) // 15 | 240 | border2TopSpace.constant = CGFloat(15) // 15 |
| 241 | 241 | ||
| 242 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) | 242 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) |
| 243 | - showBarcodeButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 243 | + showBarcodeButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 244 | 244 | ||
| 245 | } else { | 245 | } else { |
| 246 | barcodeImage.isHidden = true | 246 | barcodeImage.isHidden = true |
| ... | @@ -257,15 +257,15 @@ import AVFoundation | ... | @@ -257,15 +257,15 @@ import AVFoundation |
| 257 | border2TopSpace.constant = CGFloat(0) // 15 | 257 | border2TopSpace.constant = CGFloat(0) // 15 |
| 258 | 258 | ||
| 259 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 259 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 260 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 260 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 261 | } | 261 | } |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | func toggleCoupons(couponsVisible: Bool) { | 264 | func toggleCoupons(couponsVisible: Bool) { |
| 265 | if (couponsVisible) { | 265 | if (couponsVisible) { |
| 266 | - showCouponsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 266 | + showCouponsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 267 | } else { | 267 | } else { |
| 268 | - showCouponsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 268 | + showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 269 | } | 269 | } |
| 270 | } | 270 | } |
| 271 | 271 | ... | ... |
| ... | @@ -217,7 +217,7 @@ extension UITableView { | ... | @@ -217,7 +217,7 @@ extension UITableView { |
| 217 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) | 217 | showBarcodeButton.titleLabel?.font = UIFont(name: "PFSquareSansPro-Medium", size: 16) |
| 218 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 218 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 219 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 219 | showBarcodeButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 220 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 220 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 221 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft | 221 | showBarcodeButton.semanticContentAttribute = .forceRightToLeft |
| 222 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 222 | showBarcodeButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 223 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 223 | showBarcodeButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -289,7 +289,7 @@ extension UITableView { | ... | @@ -289,7 +289,7 @@ extension UITableView { |
| 289 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 289 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 290 | showCouponsButton.setTitle("Εμφάνιση κουπονιών", for: .normal) | 290 | showCouponsButton.setTitle("Εμφάνιση κουπονιών", for: .normal) |
| 291 | showCouponsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 291 | showCouponsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 292 | - showCouponsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 292 | + showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 293 | showCouponsButton.semanticContentAttribute = .forceRightToLeft | 293 | showCouponsButton.semanticContentAttribute = .forceRightToLeft |
| 294 | showCouponsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 294 | showCouponsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 295 | showCouponsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 295 | showCouponsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -309,7 +309,7 @@ extension UITableView { | ... | @@ -309,7 +309,7 @@ extension UITableView { |
| 309 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) | 309 | // termsButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5) |
| 310 | termsButton.setTitle("Όροι χρήσης", for: .normal) | 310 | termsButton.setTitle("Όροι χρήσης", for: .normal) |
| 311 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) | 311 | termsButton.setTitleColor(UIColor(red: 0.25, green: 0.33, blue: 0.39, alpha: 1.00), for: .normal) |
| 312 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 312 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 313 | termsButton.semanticContentAttribute = .forceRightToLeft | 313 | termsButton.semanticContentAttribute = .forceRightToLeft |
| 314 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) | 314 | termsButton.tintColor = UIColor(red: 0.21, green: 0.32, blue: 0.41, alpha: 1.00) |
| 315 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); | 315 | termsButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0); |
| ... | @@ -362,12 +362,12 @@ extension UITableView { | ... | @@ -362,12 +362,12 @@ extension UITableView { |
| 362 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) | 362 | let targetSize = CGSize(width: termsTextView.frame.width, height: CGFloat(MAXFLOAT)) |
| 363 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height | 363 | termsTextViewHeight.constant = termsTextView.sizeThatFits(targetSize).height |
| 364 | 364 | ||
| 365 | - termsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 365 | + termsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 366 | } else { | 366 | } else { |
| 367 | termsTextView.isHidden = true | 367 | termsTextView.isHidden = true |
| 368 | termsTextViewHeight.constant = CGFloat(0) | 368 | termsTextViewHeight.constant = CGFloat(0) |
| 369 | 369 | ||
| 370 | - termsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 370 | + termsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 371 | } | 371 | } |
| 372 | } | 372 | } |
| 373 | 373 | ||
| ... | @@ -392,7 +392,7 @@ extension UITableView { | ... | @@ -392,7 +392,7 @@ extension UITableView { |
| 392 | border2TopSpace.constant = CGFloat(15) // 15 | 392 | border2TopSpace.constant = CGFloat(15) // 15 |
| 393 | 393 | ||
| 394 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) | 394 | showBarcodeButton.setTitle("Απόκρυψη barcode", for: .normal) |
| 395 | - showBarcodeButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 395 | + showBarcodeButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 396 | 396 | ||
| 397 | } else { | 397 | } else { |
| 398 | barcodeImage.isHidden = true | 398 | barcodeImage.isHidden = true |
| ... | @@ -409,7 +409,7 @@ extension UITableView { | ... | @@ -409,7 +409,7 @@ extension UITableView { |
| 409 | border2TopSpace.constant = CGFloat(0) // 15 | 409 | border2TopSpace.constant = CGFloat(0) // 15 |
| 410 | 410 | ||
| 411 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) | 411 | showBarcodeButton.setTitle("Εμφάνιση barcode", for: .normal) |
| 412 | - showBarcodeButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 412 | + showBarcodeButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 413 | } | 413 | } |
| 414 | } | 414 | } |
| 415 | 415 | ||
| ... | @@ -421,12 +421,12 @@ extension UITableView { | ... | @@ -421,12 +421,12 @@ extension UITableView { |
| 421 | 421 | ||
| 422 | // tableViewHeight.constant = tableView.intrinsicContentSize.height | 422 | // tableViewHeight.constant = tableView.intrinsicContentSize.height |
| 423 | 423 | ||
| 424 | - showCouponsButton.setImage(UIImage(named: "ic_up_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 424 | + showCouponsButton.setImage(UIImage(named: "ic_up_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 425 | } else { | 425 | } else { |
| 426 | tableView.isHidden = true | 426 | tableView.isHidden = true |
| 427 | tableViewHeight.constant = CGFloat(0) | 427 | tableViewHeight.constant = CGFloat(0) |
| 428 | 428 | ||
| 429 | - showCouponsButton.setImage(UIImage(named: "ic_down_dark.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) | 429 | + showCouponsButton.setImage(UIImage(named: "ic_down_dark_2.png", in: MyEmptyClass.resourceBundle(), compatibleWith: nil), for: .normal) |
| 430 | } | 430 | } |
| 431 | // scrollView.contentSize = CGSizeMake(scrollView.frame.size.width, scrollView.intrinsicContentSize.height); | 431 | // scrollView.contentSize = CGSizeMake(scrollView.frame.size.width, scrollView.intrinsicContentSize.height); |
| 432 | // self.view.layoutIfNeeded() | 432 | // self.view.layoutIfNeeded() | ... | ... |
| ... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
| 8 | import UIKit | 8 | import UIKit |
| 9 | 9 | ||
| 10 | extension UIViewController { | 10 | extension UIViewController { |
| 11 | - func setBackButton(_ icon:String = "ic_back_2") { | 11 | + func setBackButton(_ icon:String = "ic_back_3") { |
| 12 | // let uiscreen: CGRect = UIScreen.main.bounds | 12 | // let uiscreen: CGRect = UIScreen.main.bounds |
| 13 | 13 | ||
| 14 | // let backButton = UIButton(type: UIButton.ButtonType.custom) as UIButton | 14 | // let backButton = UIButton(type: UIButton.ButtonType.custom) as UIButton | ... | ... |
-
Please register or login to post a comment