open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
9c7ee8e6 1 parent e2dbb29d

ui fixes v1

Inline Side-by-side
Showing 32 changed files with 132 additions and 17 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>0</integer> 10 + <integer>1</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>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -22,7 +22,7 @@ class AnalysisHeaderMessageViewCell: UITableViewCell { ...@@ -22,7 +22,7 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
22 super.awakeFromNib() 22 super.awakeFromNib()
23 23
24 // image 24 // image
25 - itemImage.image = UIImage(named: "ic_gift_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 25 + itemImage.image = UIImage(named: "ic_gift_circle_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
26 26
27 // title 27 // title
28 titleLabel.textColor = UIColor(rgb: 0x435563) 28 titleLabel.textColor = UIColor(rgb: 0x435563)
......
...@@ -19,7 +19,7 @@ class AnalysisHeaderViewCell: UITableViewCell { ...@@ -19,7 +19,7 @@ class AnalysisHeaderViewCell: UITableViewCell {
19 super.awakeFromNib() 19 super.awakeFromNib()
20 20
21 // image 21 // image
22 - itemImage.image = UIImage(named: "ic_gift_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 22 + itemImage.image = UIImage(named: "ic_gift_circle_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
23 23
24 // title 24 // title
25 titleLabel.textColor = UIColor(rgb: 0x435563) 25 titleLabel.textColor = UIColor(rgb: 0x435563)
......
...@@ -828,7 +828,7 @@ ...@@ -828,7 +828,7 @@
828 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LLM-FB-EYF"> 828 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LLM-FB-EYF">
829 <rect key="frame" x="-35" y="2.5" width="70" height="70"/> 829 <rect key="frame" x="-35" y="2.5" width="70" height="70"/>
830 <subviews> 830 <subviews>
831 - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_coupons" translatesAutoresizingMaskIntoConstraints="NO" id="Vfg-nm-Igo"> 831 + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_coupons_2" translatesAutoresizingMaskIntoConstraints="NO" id="Vfg-nm-Igo">
832 <rect key="frame" x="0.0" y="0.0" width="70" height="70"/> 832 <rect key="frame" x="0.0" y="0.0" width="70" height="70"/>
833 </imageView> 833 </imageView>
834 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbA-fm-1uO"> 834 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20,00€" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbA-fm-1uO">
...@@ -1860,7 +1860,7 @@ ...@@ -1860,7 +1860,7 @@
1860 <constraint firstAttribute="height" constant="30" id="j96-P9-Bf4"/> 1860 <constraint firstAttribute="height" constant="30" id="j96-P9-Bf4"/>
1861 </constraints> 1861 </constraints>
1862 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 1862 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
1863 - <state key="normal" image="ic_close"/> 1863 + <state key="normal" image="ic_close_2"/>
1864 <connections> 1864 <connections>
1865 <action selector="closeButtonAction:" destination="86r-jf-E5J" eventType="touchUpInside" id="sBr-NV-x53"/> 1865 <action selector="closeButtonAction:" destination="86r-jf-E5J" eventType="touchUpInside" id="sBr-NV-x53"/>
1866 </connections> 1866 </connections>
...@@ -2756,10 +2756,10 @@ ...@@ -2756,10 +2756,10 @@
2756 <image name="curved_bg_white" width="159.5" height="118.5"/> 2756 <image name="curved_bg_white" width="159.5" height="118.5"/>
2757 <image name="dfy_logo_white" width="1611" height="395"/> 2757 <image name="dfy_logo_white" width="1611" height="395"/>
2758 <image name="ic_background_circle" width="214" height="134"/> 2758 <image name="ic_background_circle" width="214" height="134"/>
2759 - <image name="ic_close" width="17" height="17.5"/> 2759 + <image name="ic_close_2" width="17" height="17.5"/>
2760 <image name="ic_down_dark" width="22" height="11.5"/> 2760 <image name="ic_down_dark" width="22" height="11.5"/>
2761 <image name="new_icon" width="37" height="17"/> 2761 <image name="new_icon" width="37" height="17"/>
2762 - <image name="wallet_coupons" width="63" height="73"/> 2762 + <image name="wallet_coupons_2" width="64.5" height="70"/>
2763 <image name="wallet_dfy_earn" width="63" height="73"/> 2763 <image name="wallet_dfy_earn" width="63" height="73"/>
2764 <systemColor name="systemBackgroundColor"> 2764 <systemColor name="systemBackgroundColor">
2765 <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 2765 <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 <constraint firstAttribute="height" constant="40" id="oeu-zs-b1J"/> 72 <constraint firstAttribute="height" constant="40" id="oeu-zs-b1J"/>
73 </constraints> 73 </constraints>
74 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> 74 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
75 - <state key="normal" title="B" image="ic_close"> 75 + <state key="normal" title="B" image="ic_close_2">
76 <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 76 <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
77 </state> 77 </state>
78 <connections> 78 <connections>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
214 <resources> 214 <resources>
215 <image name="coupons_scrollview_white" width="214" height="462"/> 215 <image name="coupons_scrollview_white" width="214" height="462"/>
216 <image name="ic_address" width="12.5" height="17"/> 216 <image name="ic_address" width="12.5" height="17"/>
217 - <image name="ic_close" width="17" height="17.5"/> 217 + <image name="ic_close_2" width="17" height="17.5"/>
218 <image name="ic_phone" width="15.5" height="15.5"/> 218 <image name="ic_phone" width="15.5" height="15.5"/>
219 <systemColor name="systemBackgroundColor"> 219 <systemColor name="systemBackgroundColor">
220 <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 220 <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
1 +{
2 + "images" : [
3 + {
4 + "filename" : "ic_back_2.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "ic_back_2-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "ic_back_2-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "ic_close_2.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "ic_close_2-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "ic_close_2-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "ic_gift_circle_2.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "ic_gift_circle_2-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "ic_gift_circle_2-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "top_border_line.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "top_border_line-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "top_border_line-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "wallet_coupons_2.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "wallet_coupons_2-1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "wallet_coupons_2-2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
...@@ -29,8 +29,8 @@ NSString *VERIFY_URL = @"/partners/cosmote/verify"; ...@@ -29,8 +29,8 @@ NSString *VERIFY_URL = @"/partners/cosmote/verify";
29 #else 29 #else
30 [Warply launchWithAppUUID:uuid launchOptions:launchOptions]; 30 [Warply launchWithAppUUID:uuid launchOptions:launchOptions];
31 #endif 31 #endif
32 - [[Warply sharedService].pushManager registerForRemoteNotifications]; 32 + // [[Warply sharedService].pushManager registerForRemoteNotifications];
33 - [[Warply sharedService].pushManager resetBadge]; 33 + // [[Warply sharedService].pushManager resetBadge];
34 MERCHANT_ID = merchantId; 34 MERCHANT_ID = merchantId;
35 LANG = lang; 35 LANG = lang;
36 //removal of caching 36 //removal of caching
......
...@@ -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.png", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil), for: .normal) 79 + closeButton.setImage(UIImage(named: "ic_close_2.png", in: Bundle(for: MyEmptyClass.self), 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()
......
...@@ -47,7 +47,7 @@ import UIKit ...@@ -47,7 +47,7 @@ import UIKit
47 47
48 numbersList = ccms?._eligibleAssets ?? [] 48 numbersList = ccms?._eligibleAssets ?? []
49 49
50 - setBackButton("ic_close") 50 + setBackButton("ic_close_2")
51 setNavigationTitle(ccms?._titleOffer ?? "") 51 setNavigationTitle(ccms?._titleOffer ?? "")
52 52
53 backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 53 backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
......
...@@ -12,7 +12,7 @@ extension UIViewController { ...@@ -12,7 +12,7 @@ extension UIViewController {
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
15 - if (icon == "ic_close") { 15 + if (icon == "ic_close_2") {
16 backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.035) 16 backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.035)
17 } else { 17 } else {
18 backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.03) 18 backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.03)
...@@ -26,7 +26,7 @@ extension UIViewController { ...@@ -26,7 +26,7 @@ extension UIViewController {
26 26
27 backButton.translatesAutoresizingMaskIntoConstraints = false 27 backButton.translatesAutoresizingMaskIntoConstraints = false
28 // Add width, height constraints 28 // Add width, height constraints
29 - if (icon == "ic_close") { 29 + if (icon == "ic_close_2") {
30 let widthContraints = NSLayoutConstraint(item: backButton, attribute: NSLayoutConstraint.Attribute.width, relatedBy: NSLayoutConstraint.Relation.equal, toItem: nil, attribute: NSLayoutConstraint.Attribute.notAnAttribute, multiplier: 1, constant: uiscreen.height * 0.035) 30 let widthContraints = NSLayoutConstraint(item: backButton, attribute: NSLayoutConstraint.Attribute.width, relatedBy: NSLayoutConstraint.Relation.equal, toItem: nil, attribute: NSLayoutConstraint.Attribute.notAnAttribute, multiplier: 1, constant: uiscreen.height * 0.035)
31 let heightContraints = NSLayoutConstraint(item: backButton, attribute: NSLayoutConstraint.Attribute.height, relatedBy: NSLayoutConstraint.Relation.equal, toItem: nil, attribute: NSLayoutConstraint.Attribute.notAnAttribute, multiplier: 1, constant: uiscreen.height * 0.035) 31 let heightContraints = NSLayoutConstraint(item: backButton, attribute: NSLayoutConstraint.Attribute.height, relatedBy: NSLayoutConstraint.Relation.equal, toItem: nil, attribute: NSLayoutConstraint.Attribute.notAnAttribute, multiplier: 1, constant: uiscreen.height * 0.035)
32 NSLayoutConstraint.activate([heightContraints,widthContraints]) 32 NSLayoutConstraint.activate([heightContraints,widthContraints])
......
...@@ -66,7 +66,7 @@ import SwiftEventBus ...@@ -66,7 +66,7 @@ import SwiftEventBus
66 66
67 headerImage.image = UIImage(named: "ic_background_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 67 headerImage.image = UIImage(named: "ic_background_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
68 dfyEarnImage.image = UIImage(named: "wallet_dfy_earn", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 68 dfyEarnImage.image = UIImage(named: "wallet_dfy_earn", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
69 - couponEarnImage.image = UIImage(named: "wallet_coupons", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 69 + couponEarnImage.image = UIImage(named: "wallet_coupons_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
70 dfyLogoImage.image = UIImage(named: "dfy_logo_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 70 dfyLogoImage.image = UIImage(named: "dfy_logo_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
71 activeCodeImage.image = UIImage(named: "active_code_logo", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil) 71 activeCodeImage.image = UIImage(named: "active_code_logo", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
72 72
......