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
2022-07-26 19:30:17 +0300
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
21d133853c49b2b4bf5493f7da7c2bc4e8df4327
21d13385
1 parent
4142dabf
sharing history fixes
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
SwiftWarplyFramework/SwiftWarplyFramework/HistoryViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/LoyaltyAnalysisViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/NumberPopupViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/SharingHistoryViewController.swift
SwiftWarplyFramework/SwiftWarplyFramework/HistoryViewController.swift
View file @
21d1338
...
...
@@ -10,7 +10,7 @@ import UIKit
class
HistoryViewController
:
AnalysisChildViewController
{
var
loading
:
Bool
=
false
var
items
:
Array
<
swiftApi
.
CouponItemModel
>
=
swiftApi
()
.
getCouponList
()
var
items
:
Array
<
swiftApi
.
CouponItemModel
>
=
swiftApi
()
.
get
Old
CouponList
()
// TODO: remove this when configuring model
let
hasMessage
=
true
...
...
@@ -100,13 +100,13 @@ class HistoryViewController: AnalysisChildViewController {
// header
if
(
indexPath
.
section
==
0
)
{
if
(
hasMessage
)
{
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderMessageViewCell"
,
for
:
indexPath
)
as!
AnalysisHeaderMessageViewCell
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderMessageViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisHeaderMessageViewCell
}
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderViewCell"
,
for
:
indexPath
)
as!
AnalysisHeaderViewCell
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisHeaderViewCell
}
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisItemViewCell"
,
for
:
indexPath
)
as!
AnalysisItemViewCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisItemViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisItemViewCell
cell
.
configureCell
(
item
:
items
[
indexPath
.
row
])
return
cell
...
...
SwiftWarplyFramework/SwiftWarplyFramework/LoyaltyAnalysisViewController.swift
View file @
21d1338
...
...
@@ -60,16 +60,16 @@ import UIKit
////////////////////////////////////////////////////////////////////////////////
private
func
viewControllerAt
(
_
index
:
Int
)
->
AnalysisChildViewController
?
{
let
storyboard
=
UIStoryboard
(
name
:
"Main"
,
bundle
:
nil
)
let
storyboard
=
UIStoryboard
(
name
:
"Main"
,
bundle
:
Bundle
(
for
:
MyEmptyClass
.
self
)
)
if
(
index
==
1
)
{
let
analysisVC
=
storyboard
.
instantiateViewController
(
withIdentifier
:
"SharingHistoryViewController"
)
as!
SharingHistoryViewController
let
analysisVC
=
storyboard
.
instantiateViewController
(
withIdentifier
:
"SharingHistoryViewController"
)
as!
S
wiftWarplyFramework
.
S
haringHistoryViewController
analysisVC
.
index
=
index
;
return
analysisVC
;
}
let
analysisVC
=
storyboard
.
instantiateViewController
(
withIdentifier
:
"HistoryViewController"
)
as!
HistoryViewController
let
analysisVC
=
storyboard
.
instantiateViewController
(
withIdentifier
:
"HistoryViewController"
)
as!
SwiftWarplyFramework
.
HistoryViewController
analysisVC
.
index
=
index
;
return
analysisVC
;
...
...
SwiftWarplyFramework/SwiftWarplyFramework/NumberPopupViewController.swift
View file @
21d1338
...
...
@@ -166,7 +166,7 @@ extension NumberPopupViewController: UITableViewDelegate, UITableViewDataSource{
// print("Coupon Description clicked: " + (couponSetData?.short_description ?? ""))
// print("Coupon Expiration clicked: " + (coupons[indexPath.row].expiration ?? ""))
//
// let storyboard = UIStoryboard(name: "Main", bundle:
nil
)
// let storyboard = UIStoryboard(name: "Main", bundle:
Bundle(for: MyEmptyClass.self)
)
// let vc = storyboard.instantiateViewController(withIdentifier: "CouponBarcodeViewController") as! CouponBarcodeViewController
// vc.coupon = coupons[indexPath.row]
// self.navigationController?.pushViewController(vc, animated: true)
...
...
SwiftWarplyFramework/SwiftWarplyFramework/SharingHistoryViewController.swift
View file @
21d1338
...
...
@@ -98,13 +98,13 @@ class SharingHistoryViewController: AnalysisChildViewController {
// header
if
(
indexPath
.
section
==
0
)
{
if
(
hasMessage
)
{
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderMessageViewCell"
,
for
:
indexPath
)
as!
AnalysisHeaderMessageViewCell
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderMessageViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisHeaderMessageViewCell
}
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderViewCell"
,
for
:
indexPath
)
as!
AnalysisHeaderViewCell
return
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisHeaderViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisHeaderViewCell
}
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisItemViewCell"
,
for
:
indexPath
)
as!
AnalysisItemViewCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"AnalysisItemViewCell"
,
for
:
indexPath
)
as!
SwiftWarplyFramework
.
AnalysisItemViewCell
cell
.
configureCell
(
item
:
items
[
indexPath
.
row
])
return
cell
...
...
Please
register
or
login
to post a comment