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 @@
<key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
......
......@@ -7,7 +7,7 @@
<key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
......
......@@ -22,7 +22,7 @@ class AnalysisHeaderMessageViewCell: UITableViewCell {
super.awakeFromNib()
// image
itemImage.image = UIImage(named: "ic_gift_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
itemImage.image = UIImage(named: "ic_gift_circle_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
// title
titleLabel.textColor = UIColor(rgb: 0x435563)
......
......@@ -19,7 +19,7 @@ class AnalysisHeaderViewCell: UITableViewCell {
super.awakeFromNib()
// image
itemImage.image = UIImage(named: "ic_gift_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
itemImage.image = UIImage(named: "ic_gift_circle_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
// title
titleLabel.textColor = UIColor(rgb: 0x435563)
......
......@@ -828,7 +828,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LLM-FB-EYF">
<rect key="frame" x="-35" y="2.5" width="70" height="70"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_coupons" translatesAutoresizingMaskIntoConstraints="NO" id="Vfg-nm-Igo">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wallet_coupons_2" translatesAutoresizingMaskIntoConstraints="NO" id="Vfg-nm-Igo">
<rect key="frame" x="0.0" y="0.0" width="70" height="70"/>
</imageView>
<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 @@
<constraint firstAttribute="height" constant="30" id="j96-P9-Bf4"/>
</constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="ic_close"/>
<state key="normal" image="ic_close_2"/>
<connections>
<action selector="closeButtonAction:" destination="86r-jf-E5J" eventType="touchUpInside" id="sBr-NV-x53"/>
</connections>
......@@ -2756,10 +2756,10 @@
<image name="curved_bg_white" width="159.5" height="118.5"/>
<image name="dfy_logo_white" width="1611" height="395"/>
<image name="ic_background_circle" width="214" height="134"/>
<image name="ic_close" width="17" height="17.5"/>
<image name="ic_close_2" width="17" height="17.5"/>
<image name="ic_down_dark" width="22" height="11.5"/>
<image name="new_icon" width="37" height="17"/>
<image name="wallet_coupons" width="63" height="73"/>
<image name="wallet_coupons_2" width="64.5" height="70"/>
<image name="wallet_dfy_earn" width="63" height="73"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
......@@ -72,7 +72,7 @@
<constraint firstAttribute="height" constant="40" id="oeu-zs-b1J"/>
</constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="B" image="ic_close">
<state key="normal" title="B" image="ic_close_2">
<color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
......@@ -214,7 +214,7 @@
<resources>
<image name="coupons_scrollview_white" width="214" height="462"/>
<image name="ic_address" width="12.5" height="17"/>
<image name="ic_close" width="17" height="17.5"/>
<image name="ic_close_2" width="17" height="17.5"/>
<image name="ic_phone" width="15.5" height="15.5"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
{
"images" : [
{
"filename" : "ic_back_2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_back_2-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_back_2-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "ic_close_2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_close_2-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_close_2-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "ic_gift_circle_2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_gift_circle_2-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_gift_circle_2-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "top_border_line.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "top_border_line-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "top_border_line-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "wallet_coupons_2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "wallet_coupons_2-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "wallet_coupons_2-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -29,8 +29,8 @@ NSString *VERIFY_URL = @"/partners/cosmote/verify";
#else
[Warply launchWithAppUUID:uuid launchOptions:launchOptions];
#endif
[[Warply sharedService].pushManager registerForRemoteNotifications];
[[Warply sharedService].pushManager resetBadge];
// [[Warply sharedService].pushManager registerForRemoteNotifications];
// [[Warply sharedService].pushManager resetBadge];
MERCHANT_ID = merchantId;
LANG = lang;
//removal of caching
......
......@@ -76,7 +76,7 @@ protocol NumbersPopupDelegate {
self.preferredContentSize = CGSize(width: widthPopup, height: heightPopup)
closeButton.setImage(UIImage(named: "ic_close.png", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil), for: .normal)
closeButton.setImage(UIImage(named: "ic_close_2.png", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil), for: .normal)
closeButton.imageView?.layer.transform = CATransform3DMakeScale(1.5, 1.5, 1.5)
// self.tableView.reloadData()
......
......@@ -47,7 +47,7 @@ import UIKit
numbersList = ccms?._eligibleAssets ?? []
setBackButton("ic_close")
setBackButton("ic_close_2")
setNavigationTitle(ccms?._titleOffer ?? "")
backgroundImage.image = UIImage(named: "coupons_scrollview_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
......
......@@ -12,7 +12,7 @@ extension UIViewController {
let uiscreen: CGRect = UIScreen.main.bounds
let backButton = UIButton(type: UIButton.ButtonType.custom) as UIButton
if (icon == "ic_close") {
if (icon == "ic_close_2") {
backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.035)
} else {
backButton.frame = CGRect(x: 0, y: 0, width: uiscreen.height * 0.035, height: uiscreen.height * 0.03)
......@@ -26,7 +26,7 @@ extension UIViewController {
backButton.translatesAutoresizingMaskIntoConstraints = false
// Add width, height constraints
if (icon == "ic_close") {
if (icon == "ic_close_2") {
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)
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)
NSLayoutConstraint.activate([heightContraints,widthContraints])
......
......@@ -66,7 +66,7 @@ import SwiftEventBus
headerImage.image = UIImage(named: "ic_background_circle", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
dfyEarnImage.image = UIImage(named: "wallet_dfy_earn", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
couponEarnImage.image = UIImage(named: "wallet_coupons", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
couponEarnImage.image = UIImage(named: "wallet_coupons_2", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
dfyLogoImage.image = UIImage(named: "dfy_logo_white", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
activeCodeImage.image = UIImage(named: "active_code_logo", in: Bundle(for: MyEmptyClass.self), compatibleWith: nil)
......