From 503c35be7d57a2ff1463736b78f6503c81f1e88a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 11 Jun 2020 14:46:34 +0200 Subject: [PATCH] Revert "Merge branch 'kickstarter-campaign'" This reverts commit f9c5ab7b020d94382a0ddf4e3ddae89330f97df2, reversing changes made to 50a3de7ac299e7282762cda7e5252b9ebf17554b. --- .../kickstarter.imageset/Contents.json | 22 -------------- .../kickstarter.imageset/kickstarter@2x.png | Bin 1931 -> 0 bytes .../kickstarter.imageset/kickstarter@3x.png | Bin 2849 -> 0 bytes .../Global/AppConstants+Flags.swift | 4 --- Passepartout-iOS/Global/SwiftGen+Assets.swift | 1 - .../Global/SwiftGen+Strings.swift | 10 ------- Passepartout-iOS/Global/en.lproj/App.strings | 5 ---- .../Organizer/OrganizerViewController.swift | 28 ------------------ .../Scenes/ServiceViewController.swift | 24 --------------- 9 files changed, 94 deletions(-) delete mode 100644 Passepartout-iOS/Assets.xcassets/kickstarter.imageset/Contents.json delete mode 100644 Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@2x.png delete mode 100644 Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@3x.png diff --git a/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/Contents.json b/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/Contents.json deleted file mode 100644 index 28f2fc73..00000000 --- a/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@2x.png b/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@2x.png deleted file mode 100644 index fabf6c4b82043d0bad25cb37c7aee732cf944876..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1931 zcmY*adpOkD8$Ux@Gic4ANueihqkT-#hthf~bn9Ff^929IhVZ*cmpfW>gjjaI1m;gr>6M$F)020pvumYtLrvQi` z0x;tT03{m$bXeYfS1NRHmg7YaVlsg-gcX4T3TC1mibDZvYgO>2@~m!3zC3y%|ip`eUm(GaebKWOGSTjk|sD2<}km z{eS>MYtL>BRW?QvD?PZDGUS7uB9OxAVGGn-i^B+@hy7vDJ4<8&r>TPrfv!W%7yr zx2v4B{y1y=)uA6I;FQD|hJIyF@o#Ef3sWi%snPl9>N9Td*OIaV8&dvqK#rfXPnWXl z$2HVY2GM(3-t|UmOM0g7rAk6$x*Zo(-ct6Km$54ZT5gupli_$HxC=3R1pZsNjAI_OKHdDBTSDs46kuD<~3g6yV8yZYw3O69^4rDWR+$6 zFuyO?%$ZF{dDDjKZIPwd!(M`>N?U+_|#xp099BKNhF8Vv=2w$P*^}Cw+Wd{>* zQ+KH9NqJlKX0l?k+SAQqF!|m5x)%v33;NXa^XFQN#*U8N;Cc)RBT7dMb<{Ib>aw>* z4$`^T8uhhMi1R<#1^&*-2&_$#lQJT^mlD%;`3*TKHPS{>??uVIb8Ynn+`rTQB3;+Q z*3kX)+b)^yS(sR^bd)qjwveJ`5~N{_Umtb!@a>Wedt5A3$KyD+hnU+eiv{-#lRNDg zitTOu16djY?~ly53uiqpGIc7IW|I5TI}djC{k{j?ZN$kTy>6ANzt`T6mnWUZ2)noI zTI=Hf-XHNGU|n^NY|9Qn{g^2Y>%zzQ1f{ExIL;PYBDr3*R5Z#nMG|$@SW{iJ;8UyM z`>D*mQ`8~o7#;}8`tenfMQf4oTa|ehDbPZ|I)eA&zggYyR@Z9L75G?EL?=h4c;qi? z{~T?~F7iHXUhft(+L_?aC)Q`NR9c5ewuRtss3nF9Wjo$ac+jLpnW~+G5ufYUkCs-ohA-Z| z9vtMNkH~Be`u>4w=>=nl9R;fBHYeC*sMKEf=|^X|Iz-^AdcjAXDUU>Y&DZ)j;^iYm zXPT5oIo64sbK(YL9=xS0O{BjQ750^vaK*{2NW4`;_4O%bAMH1uqrVu-)nseF6;yMDXJfE?9&rw+D5p0Ymchfr<6yJQ?rfd zI4xOz{WXJg&i)^UyUGyg#mjjY3w;MK&-rC9);AyKT34d!>%+U^T{QobHY7RVvvRPv z?SX$ITsf_fFu%n3h=zG`V!yv>-Rqi~k!CALeL9x3CH*C>FyN1&iRHnEl4ccbPR%96 zY74sWvi8K)`0kQjOD9?Jg)@@Y_^~$sl?J3W^3^rzfve_!8uh)*_9viJM&+lRt;wW diff --git a/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@3x.png b/Passepartout-iOS/Assets.xcassets/kickstarter.imageset/kickstarter@3x.png deleted file mode 100644 index 2f5fed0af68c5e7fbc0b14ceeaa1313153f1dc58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2849 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 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() diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift index 28c8e524..cbc55759 100644 --- a/Passepartout-iOS/Scenes/ServiceViewController.swift +++ b/Passepartout-iOS/Scenes/ServiceViewController.swift @@ -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 {