passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remap donations to local RowType 

Allow different cells easily.
This commit is contained in:
Davide De Rosa 2019-04-08 22:12:44 +02:00
parent bb299335ad
commit 84c5493348
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Passepartout-iOS/Scenes/Organizer/DonationViewController.swift
View File

@ -28,6 +28,8 @@ import StoreKit
import Passepartout_Core import Passepartout_Core
class DonationViewController: UITableViewController, TableModelHost { class DonationViewController: UITableViewController, TableModelHost {
private var donationList: [InApp.Donation] = []
private var productsByIdentifier: [String: SKProduct] = [:] private var productsByIdentifier: [String: SKProduct] = [:]
private func setProducts(_ products: [SKProduct]) { private func setProducts(_ products: [SKProduct]) {
@ -40,25 +42,23 @@ class DonationViewController: UITableViewController, TableModelHost {
// MARK: TableModel // MARK: TableModel
var model: TableModel<SectionType, InApp.Donation> = TableModel() var model: TableModel<SectionType, RowType> = TableModel()
func reloadModel() { func reloadModel() {
donationList = []
model.clear() model.clear()
let completeList: [InApp.Donation] = [.tiny, .small, .medium, .big, .huge, .maxi] let completeList: [InApp.Donation] = [.tiny, .small, .medium, .big, .huge, .maxi]
var list: [InApp.Donation] = []
for row in completeList { for row in completeList {
guard let _ = productsByIdentifier[row.rawValue] else { guard let _ = productsByIdentifier[row.rawValue] else {
continue continue
} }
list.append(row) donationList.append(row)
} }
model.add(.oneTime) model.add(.oneTime)
// model.add(.recurring)
model.setHeader(L10n.Donation.Sections.OneTime.header, for: .oneTime) model.setHeader(L10n.Donation.Sections.OneTime.header, for: .oneTime)
model.setFooter(L10n.Donation.Sections.OneTime.footer, for: .oneTime) model.setFooter(L10n.Donation.Sections.OneTime.footer, for: .oneTime)
// model.setHeader(L10n.Donation.Sections.Recurring.header, for: .recurring) model.set(.donation, count: donationList.count, in: .oneTime)
model.set(list, in: .oneTime)
} }
// MARK: UIViewController // MARK: UIViewController
@ -104,25 +104,31 @@ class DonationViewController: UITableViewController, TableModelHost {
} }
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let productId = productIdentifier(at: indexPath) switch model.row(at: indexPath) {
guard let product = productsByIdentifier[productId] else { case .donation:
fatalError("Row with no associated product") let productId = productIdentifier(at: indexPath)
guard let product = productsByIdentifier[productId] else {
fatalError("Row with no associated product")
}
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = product.localizedTitle
cell.rightText = product.localizedPrice
return cell
} }
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = product.localizedTitle
cell.rightText = product.localizedPrice
return cell
} }
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true) switch model.row(at: indexPath) {
case .donation:
let productId = productIdentifier(at: indexPath) tableView.deselectRow(at: indexPath, animated: true)
guard let product = productsByIdentifier[productId] else {
fatalError("Row with no associated product") let productId = productIdentifier(at: indexPath)
} guard let product = productsByIdentifier[productId] else {
InAppHelper.shared.purchase(product: product) { fatalError("Row with no associated product")
self.handlePurchase(result: $0, error: $1) }
InAppHelper.shared.purchase(product: product) {
self.handlePurchase(result: $0, error: $1)
}
} }
} }
@ -145,12 +151,19 @@ class DonationViewController: UITableViewController, TableModelHost {
extension DonationViewController { extension DonationViewController {
enum SectionType { enum SectionType {
case inProgress
case oneTime case oneTime
}
case recurring
enum RowType {
case donation
} }
private func productIdentifier(at indexPath: IndexPath) -> String { private func productIdentifier(at indexPath: IndexPath) -> String {
return model.row(at: indexPath).rawValue guard model.row(at: indexPath) == .donation else {
fatalError("Not a donation row")
}
return donationList[indexPath.row].rawValue
} }
} }