Revert "Merge branch 'kickstarter-campaign'"
This reverts commitf9c5ab7b02
, reversing changes made to50a3de7ac2
.
This commit is contained in:
parent
b5776aeebf
commit
503c35be7d
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "kickstarter@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "kickstarter@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.8 KiB |
|
@ -52,10 +52,6 @@ extension AppConstants {
|
|||
VPN.isMockVPN = isMockVPN
|
||||
}
|
||||
}
|
||||
|
||||
static let isShowingKickstarter = true
|
||||
|
||||
static let kickstarterURL = URL(string: "https://www.kickstarter.com/projects/keeshux/passepartout-your-only-multi-provider-vpn-client/")!
|
||||
}
|
||||
|
||||
struct InApp {
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
// swiftlint:disable identifier_name line_length nesting type_body_length type_name
|
||||
internal enum Asset {
|
||||
internal enum Assets {
|
||||
internal static let kickstarter = ImageAsset(name: "kickstarter")
|
||||
internal static let logo = ImageAsset(name: "logo")
|
||||
}
|
||||
internal enum Flags {
|
||||
|
|
|
@ -66,16 +66,6 @@ internal enum L10n {
|
|||
/// Add new provider
|
||||
internal static let caption = L10n.tr("App", "organizer.cells.add_provider.caption")
|
||||
}
|
||||
internal enum SupportKickstarter {
|
||||
/// What's coming next?
|
||||
internal static let caption = L10n.tr("App", "organizer.cells.support_kickstarter.caption")
|
||||
}
|
||||
}
|
||||
internal enum Sections {
|
||||
internal enum Kickstarter {
|
||||
/// More on further development of Passepartout.
|
||||
internal static let footer = L10n.tr("App", "organizer.sections.kickstarter.footer")
|
||||
}
|
||||
}
|
||||
}
|
||||
internal enum Provider {
|
||||
|
|
|
@ -69,8 +69,3 @@
|
|||
"purchase.cells.full_version.extra_description" = "- All providers (including future ones)\n%@";
|
||||
"purchase.cells.restore.title" = "Restore purchases";
|
||||
"purchase.cells.restore.description" = "If you bought this app or feature in the past, you can restore your purchases and this screen won't show again.";
|
||||
|
||||
///
|
||||
|
||||
"organizer.sections.kickstarter.footer" = "More on further development of Passepartout.";
|
||||
"organizer.cells.support_kickstarter.caption" = "What's coming next?";
|
||||
|
|
|
@ -47,14 +47,6 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
|
|||
|
||||
func reloadModel() {
|
||||
model.clear()
|
||||
|
||||
if AppConstants.Flags.isShowingKickstarter {
|
||||
model.add(.kickstarter)
|
||||
model.setHeader("Kickstarter", forSection: .kickstarter)
|
||||
model.setFooter(L10n.App.Organizer.Sections.Kickstarter.footer, forSection: .kickstarter)
|
||||
model.set([.supportKickstarter], forSection: .kickstarter)
|
||||
}
|
||||
|
||||
model.add(.vpn)
|
||||
model.add(.providers)
|
||||
model.add(.hosts)
|
||||
|
@ -115,9 +107,6 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
|
|||
super.viewDidLoad()
|
||||
|
||||
title = GroupConstants.App.title
|
||||
if AppConstants.Flags.isShowingKickstarter {
|
||||
navigationItem.leftBarButtonItem = UIBarButtonItem(image: Asset.Assets.kickstarter.image, style: .plain, target: self, action: #selector(openKickstarterCampaign))
|
||||
}
|
||||
navigationItem.rightBarButtonItem = editButtonItem
|
||||
Cells.destructive.register(with: tableView)
|
||||
reloadModel()
|
||||
|
@ -345,10 +334,6 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
|
|||
UIApplication.shared.open(url, options: [:], completionHandler: nil)
|
||||
}
|
||||
|
||||
@objc private func openKickstarterCampaign() {
|
||||
UIApplication.shared.open(AppConstants.Flags.kickstarterURL, options: [:], completionHandler: nil)
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
private func testInterfaces() {
|
||||
|
@ -405,8 +390,6 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
|
|||
|
||||
extension OrganizerViewController {
|
||||
enum SectionType: Int {
|
||||
case kickstarter
|
||||
|
||||
case vpn
|
||||
|
||||
case providers
|
||||
|
@ -427,8 +410,6 @@ extension OrganizerViewController {
|
|||
}
|
||||
|
||||
enum RowType: Int {
|
||||
case supportKickstarter
|
||||
|
||||
case connectionStatus
|
||||
|
||||
case profile
|
||||
|
@ -486,12 +467,6 @@ extension OrganizerViewController {
|
|||
|
||||
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
switch model.row(at: indexPath) {
|
||||
case .supportKickstarter:
|
||||
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
|
||||
cell.applyAction(.current)
|
||||
cell.leftText = L10n.App.Organizer.Cells.SupportKickstarter.caption
|
||||
return cell
|
||||
|
||||
case .connectionStatus:
|
||||
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
|
||||
cell.applyVPN(.current, with: VPN.shared.isEnabled ? VPN.shared.status : nil, error: nil)
|
||||
|
@ -584,9 +559,6 @@ extension OrganizerViewController {
|
|||
|
||||
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
|
||||
switch model.row(at: indexPath) {
|
||||
case .supportKickstarter:
|
||||
openKickstarterCampaign()
|
||||
|
||||
case .connectionStatus:
|
||||
enterActiveProfile()
|
||||
|
||||
|
|
|
@ -663,10 +663,6 @@ class ServiceViewController: UIViewController, StrongTableHost {
|
|||
}
|
||||
}
|
||||
|
||||
private func openKickstarterCampaign() {
|
||||
UIApplication.shared.open(AppConstants.Flags.kickstarterURL, options: [:], completionHandler: nil)
|
||||
}
|
||||
|
||||
// MARK: Notifications
|
||||
|
||||
@objc private func vpnDidUpdate() {
|
||||
|
@ -721,8 +717,6 @@ class ServiceViewController: UIViewController, StrongTableHost {
|
|||
|
||||
extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, ToggleTableViewCellDelegate {
|
||||
enum SectionType {
|
||||
case kickstarter
|
||||
|
||||
case vpn
|
||||
|
||||
case authentication
|
||||
|
@ -747,8 +741,6 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
|
|||
}
|
||||
|
||||
enum RowType: Int {
|
||||
case supportKickstarter
|
||||
|
||||
case useProfile
|
||||
|
||||
case vpnService
|
||||
|
@ -866,12 +858,6 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
|
|||
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
let row = model.row(at: indexPath)
|
||||
switch row {
|
||||
case .supportKickstarter:
|
||||
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
|
||||
cell.applyAction(.current)
|
||||
cell.leftText = L10n.App.Organizer.Cells.SupportKickstarter.caption
|
||||
return cell
|
||||
|
||||
case .useProfile:
|
||||
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
|
||||
cell.applyAction(.current)
|
||||
|
@ -1101,9 +1087,6 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
|
|||
// true if enters subscreen
|
||||
private func handle(row: RowType, cell: UITableViewCell) -> Bool {
|
||||
switch row {
|
||||
case .supportKickstarter:
|
||||
openKickstarterCampaign()
|
||||
|
||||
case .useProfile:
|
||||
activateProfile()
|
||||
|
||||
|
@ -1213,13 +1196,6 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
|
|||
let isActiveProfile = service.isActiveProfile(profile)
|
||||
let isProvider = (profile as? ProviderConnectionProfile) != nil
|
||||
|
||||
if AppConstants.Flags.isShowingKickstarter {
|
||||
model.add(.kickstarter)
|
||||
model.setHeader("Kickstarter", forSection: .kickstarter)
|
||||
model.setFooter(L10n.App.Organizer.Sections.Kickstarter.footer, forSection: .kickstarter)
|
||||
model.set([.supportKickstarter], forSection: .kickstarter)
|
||||
}
|
||||
|
||||
// sections
|
||||
model.add(.vpn)
|
||||
if isProvider {
|
||||
|
|
Loading…
Reference in New Issue