Toggle navigation
Toggle navigation
This project
Loading...
Sign in
open-source
/
warply_sdk_framework
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
Manos Chorianopoulos
2023-04-26 10:04:25 +0300
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
9559395ad90d5ae0c7f5b3ed25bd28afd01dd390
9559395a
1 parent
49027d08
redesign WalletViewController part2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
29 deletions
SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
SwiftWarplyFramework/SwiftWarplyFramework/UnifiedCouponsTableViewCell.swift
SwiftWarplyFramework/SwiftWarplyFramework/WalletViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/Main.storyboard
View file @
9559395
...
...
@@ -1840,7 +1840,7 @@
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
lineBreakMode=
"tailTruncation"
numberOfLines=
"3"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Yd2-ue-tBk"
>
<rect
key=
"frame"
x=
"132.5"
y=
"14.5"
width=
"122.5"
height=
"15"
/>
<fontDescription
key=
"fontDescription"
name=
"PeridotPE-Regular"
family=
"Peridot PE"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
61568627450980395"
green=
"0.61568627450980395"
blue=
"0.61176470588235299
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.
12941176470588234"
green=
"0.12941176470588234"
blue=
"0.12941176470588234
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
...
...
@@ -1852,7 +1852,7 @@
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"EEj-3C-9Td"
>
<rect
key=
"frame"
x=
"119"
y=
"59"
width=
"255"
height=
"15"
/>
<fontDescription
key=
"fontDescription"
name=
"PeridotPE-Regular"
family=
"Peridot PE"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
61568627450980395"
green=
"0.61568627450980395"
blue=
"0.61176470588235299
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.
12941176470588234"
green=
"0.12941176470588234"
blue=
"0.12941176470588234
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
...
...
@@ -2049,34 +2049,34 @@
</constraints>
</view>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"u97-5H-Y40"
>
<rect
key=
"frame"
x=
"104"
y=
"
5"
width=
"10"
height=
"5
4.5"
/>
<rect
key=
"frame"
x=
"104"
y=
"
10"
width=
"10"
height=
"4
4.5"
/>
<color
key=
"backgroundColor"
white=
"0.0"
alpha=
"0.0"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
<constraints>
<constraint
firstAttribute=
"width"
constant=
"10"
id=
"Tcx-FG-KC0"
/>
</constraints>
</view>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
numberOfLines=
"3"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"7Ng-4X-yjm"
>
<rect
key=
"frame"
x=
"119"
y=
"15"
width=
"163.5"
height=
"
17
"
/>
<fontDescription
key=
"fontDescription"
name=
"
PFSquareSansPro-Medium"
family=
"PF Square Sans Pr
o"
pointSize=
"17"
/>
<color
key=
"textColor"
red=
"0.
2274509804"
green=
"0.32156862749999998"
blue=
"0.40000000000000002
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<rect
key=
"frame"
x=
"119"
y=
"15"
width=
"163.5"
height=
"
20
"
/>
<fontDescription
key=
"fontDescription"
name=
"
BTCosmo-Bold"
family=
"BTCosm
o"
pointSize=
"17"
/>
<color
key=
"textColor"
red=
"0.
12941176470588234"
green=
"0.12941176470588234"
blue=
"0.12941176470588234
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
lineBreakMode=
"tailTruncation"
numberOfLines=
"3"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"KJD-Db-B4t"
>
<rect
key=
"frame"
x=
"292.5"
y=
"2
6.5"
width=
"81.5"
height=
"12
"
/>
<fontDescription
key=
"fontDescription"
name=
"P
FSquareSansPro-Medium"
family=
"PF Square Sans Pro
"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
3803921569"
green=
"0.4431372549"
blue=
"0.50588235290000005
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<rect
key=
"frame"
x=
"292.5"
y=
"2
5"
width=
"81.5"
height=
"15
"
/>
<fontDescription
key=
"fontDescription"
name=
"P
eridotPE-Regular"
family=
"Peridot PE
"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
12941176470588234"
green=
"0.12941176470588234"
blue=
"0.12941176470588234
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"C5t-xz-oAO"
>
<rect
key=
"frame"
x=
"119"
y=
"3
7.5"
width=
"255"
height=
"12
"
/>
<fontDescription
key=
"fontDescription"
name=
"P
FSquareSansPro-Medium"
family=
"PF Square Sans Pro
"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
3803921569"
green=
"0.4431372549"
blue=
"0.50588235290000005
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<rect
key=
"frame"
x=
"119"
y=
"3
4.5"
width=
"255"
height=
"15
"
/>
<fontDescription
key=
"fontDescription"
name=
"P
eridotPE-Regular"
family=
"Peridot PE
"
pointSize=
"12"
/>
<color
key=
"textColor"
red=
"0.
12941176470588234"
green=
"0.12941176470588234"
blue=
"0.12941176470588234
"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
<color
key=
"backgroundColor"
white=
"0.0"
alpha=
"0.0"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
<constraints>
<constraint
firstAttribute=
"bottom"
secondItem=
"u97-5H-Y40"
secondAttribute=
"bottom"
constant=
"
5
"
id=
"1Lc-bv-1Al"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"u97-5H-Y40"
secondAttribute=
"bottom"
constant=
"
10
"
id=
"1Lc-bv-1Al"
/>
<constraint
firstItem=
"Gde-3J-Ew9"
firstAttribute=
"leading"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"leading"
id=
"40f-ex-Phx"
/>
<constraint
firstItem=
"7Ng-4X-yjm"
firstAttribute=
"leading"
secondItem=
"u97-5H-Y40"
secondAttribute=
"trailing"
constant=
"5"
id=
"5TF-wG-jX1"
/>
<constraint
firstItem=
"87q-5c-uea"
firstAttribute=
"top"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"top"
constant=
"10"
id=
"6AJ-EI-bPD"
/>
...
...
@@ -2085,7 +2085,7 @@
<constraint
firstItem=
"7Ng-4X-yjm"
firstAttribute=
"top"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"top"
constant=
"15"
id=
"EFT-xp-xck"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"KJD-Db-B4t"
secondAttribute=
"trailing"
constant=
"20"
id=
"FxZ-Fg-Cto"
/>
<constraint
firstItem=
"87q-5c-uea"
firstAttribute=
"width"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"width"
multiplier=
"0.2"
id=
"Jct-QS-76d"
/>
<constraint
firstItem=
"u97-5H-Y40"
firstAttribute=
"top"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"top"
constant=
"
5
"
id=
"MwF-kc-vsh"
/>
<constraint
firstItem=
"u97-5H-Y40"
firstAttribute=
"top"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"top"
constant=
"
10
"
id=
"MwF-kc-vsh"
/>
<constraint
firstItem=
"KJD-Db-B4t"
firstAttribute=
"centerY"
secondItem=
"WW2-mP-ZJD"
secondAttribute=
"centerY"
id=
"NmT-xf-UuO"
/>
<constraint
firstItem=
"C5t-xz-oAO"
firstAttribute=
"leading"
secondItem=
"u97-5H-Y40"
secondAttribute=
"trailing"
constant=
"5"
id=
"Qud-Nb-9mK"
/>
<constraint
firstItem=
"7Ng-4X-yjm"
firstAttribute=
"width"
secondItem=
"KJD-Db-B4t"
secondAttribute=
"width"
multiplier=
"2"
id=
"Tcm-US-ex1"
/>
...
...
@@ -2118,23 +2118,23 @@
</connections>
</tableViewCell>
<tableViewCell
clipsSubviews=
"YES"
contentMode=
"scaleToFill"
preservesSuperviewLayoutMargins=
"YES"
selectionStyle=
"none"
indentationWidth=
"10"
reuseIdentifier=
"WalletBadgesTableViewCellId"
id=
"TeS-tP-Ilh"
customClass=
"WalletBadgesTableViewCell"
customModule=
"SwiftWarplyFramework"
>
<rect
key=
"frame"
x=
"0.0"
y=
"947.5"
width=
"414"
height=
"
44
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"947.5"
width=
"414"
height=
"
260
"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<tableViewCellContentView
key=
"contentView"
opaque=
"NO"
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"center"
preservesSuperviewLayoutMargins=
"YES"
insetsLayoutMarginsFromSafeArea=
"NO"
tableViewCell=
"TeS-tP-Ilh"
id=
"FFV-uA-HHA"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"
44
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"
260
"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<subviews>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"AV7-t1-eK0"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"
44
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"
260
"
/>
<subviews>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"COSMOTE Επιβράβευση"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Z0E-V6-vKD"
>
<rect
key=
"frame"
x=
"20"
y=
"30"
width=
"374"
height=
"
0.0
"
/>
<rect
key=
"frame"
x=
"20"
y=
"30"
width=
"374"
height=
"
21
"
/>
<fontDescription
key=
"fontDescription"
name=
"PFSquareSansPro-Medium"
family=
"PF Square Sans Pro"
pointSize=
"21"
/>
<color
key=
"textColor"
white=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
<nil
key=
"highlightedColor"
/>
</label>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"kge-nO-6ZA"
userLabel=
"BadgesView"
>
<rect
key=
"frame"
x=
"0.0"
y=
"
44"
width=
"414"
height=
"0.0
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"
65"
width=
"414"
height=
"195
"
/>
<subviews>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"wallet_badge_lines"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Cib-tj-hT7"
>
<rect
key=
"frame"
x=
"7"
y=
"50"
width=
"400"
height=
"80"
/>
...
...
@@ -2212,19 +2212,19 @@
</constraints>
</view>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Qge-34-vJ3"
>
<rect
key=
"frame"
x=
"169.5"
y=
"120"
width=
"75"
height=
"7
3
"
/>
<rect
key=
"frame"
x=
"169.5"
y=
"120"
width=
"75"
height=
"7
5
"
/>
<subviews>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFit"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"wallet_dfy_earn"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"gGn-2u-akB"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"75"
height=
"7
3
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"75"
height=
"7
5
"
/>
</imageView>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"0,00€"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
numberOfLines=
"0"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"8JV-5a-Jar"
>
<rect
key=
"frame"
x=
"5"
y=
"4
4
"
width=
"65"
height=
"11"
/>
<rect
key=
"frame"
x=
"5"
y=
"4
6
"
width=
"65"
height=
"11"
/>
<fontDescription
key=
"fontDescription"
name=
"PFSquareSansPro-ExtraBlack"
family=
"PF Square Sans Pro"
pointSize=
"11"
/>
<color
key=
"textColor"
red=
"0.25490196079999999"
green=
"0.33333333329999998"
blue=
"0.3921568627"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"6UC-iU-ey4"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"75"
height=
"7
3
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"75"
height=
"7
5
"
/>
<color
key=
"backgroundColor"
white=
"0.0"
alpha=
"0.0"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
<state
key=
"normal"
title=
"Button"
/>
<buttonConfiguration
key=
"configuration"
style=
"plain"
title=
"Button"
>
...
...
@@ -2345,7 +2345,7 @@
</connections>
</tableViewCell>
<tableViewCell
clipsSubviews=
"YES"
contentMode=
"scaleToFill"
preservesSuperviewLayoutMargins=
"YES"
selectionStyle=
"none"
indentationWidth=
"10"
reuseIdentifier=
"WalletBannersTableViewCellId"
id=
"fgI-zL-RPZ"
customClass=
"WalletBannersTableViewCell"
customModule=
"SwiftWarplyFramework"
>
<rect
key=
"frame"
x=
"0.0"
y=
"
991
.5"
width=
"414"
height=
"399"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"
1207
.5"
width=
"414"
height=
"399"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<tableViewCellContentView
key=
"contentView"
opaque=
"NO"
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"center"
preservesSuperviewLayoutMargins=
"YES"
insetsLayoutMarginsFromSafeArea=
"NO"
tableViewCell=
"fgI-zL-RPZ"
id=
"gNB-PU-R1J"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"399"
/>
...
...
SwiftWarplyFramework/SwiftWarplyFramework/UnifiedCouponsTableViewCell.swift
View file @
9559395
...
...
@@ -21,11 +21,11 @@ import UIKit
super
.
awakeFromNib
()
// Initialization code
couponBgImage
.
image
=
UIImage
(
named
:
"coupon_bg"
,
in
:
MyEmptyClass
.
resourceBundle
(),
compatibleWith
:
nil
)
couponImage
.
image
=
UIImage
(
named
:
"coupon_market"
,
in
:
MyEmptyClass
.
resourceBundle
(),
compatibleWith
:
nil
)
couponBgImage
.
image
=
UIImage
(
named
:
"coupon_bg
_2
"
,
in
:
MyEmptyClass
.
resourceBundle
(),
compatibleWith
:
nil
)
couponImage
.
image
=
UIImage
(
named
:
"coupon_market
_2
"
,
in
:
MyEmptyClass
.
resourceBundle
(),
compatibleWith
:
nil
)
borderView
.
addDashedBorderVertical
(
color
:
UIColor
(
red
:
0.
44
,
green
:
0.44
,
blue
:
0.44
,
alpha
:
1.00
),
width
:
1.0
,
height
:
110.0
)
borderView
.
addDashedBorderVertical
(
color
:
UIColor
(
red
:
0.
62
,
green
:
0.62
,
blue
:
0.61
,
alpha
:
1.00
),
width
:
1.0
,
height
:
110.0
)
}
public
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
...
...
SwiftWarplyFramework/SwiftWarplyFramework/WalletViewController.swift
View file @
9559395
...
...
@@ -792,7 +792,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
// }
}
else
if
(
indexPath
.
section
==
1
)
{
if
(
self
.
unifiedCoupons
.
count
>
0
)
{
return
1
2
0.0
+
8.0
return
1
3
0.0
+
8.0
}
else
{
return
0.0
}
...
...
@@ -826,7 +826,7 @@ extension WalletViewController: UITableViewDelegate, UITableViewDataSource{
let
titleLabel
=
UILabel
(
frame
:
CGRect
(
x
:
20
,
y
:
40
,
width
:
view
.
frame
.
width
-
40
,
height
:
20
))
titleLabel
.
font
=
UIFont
(
name
:
"BTCosmo-Bold"
,
size
:
20
)
titleLabel
.
textColor
=
UIColor
(
red
:
0.13
,
green
:
0.13
,
blue
:
0.13
,
alpha
:
1.00
)
titleLabel
.
text
=
"
COSMOTE
SuperMarket Deals"
titleLabel
.
text
=
"SuperMarket Deals"
view
.
addSubview
(
titleLabel
)
return
view
...
...
Please
register
or
login
to post a comment