annotate Simoleon/Helpers/CurrencySelector.swift @ 154:8afba86ab8dd

Refactor code
author Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
date Wed, 25 Aug 2021 10:43:12 +0100
parents 2584fd74235a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
1 //
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
2 // CurrencySelector.swift
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
3 // Simoleon
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
4 //
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
5 // Created by Dennis Concepción Martín on 18/07/2021.
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
6 //
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
7
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
8 import SwiftUI
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
9 import Purchases
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
10
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
11 struct CurrencySelector: View {
21
c3dda63f50ed Added Core Data and UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 19
diff changeset
12 @Binding var currencyPair: String
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
13 @Binding var showingCurrencySelector: Bool
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
14
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
15 @State private var entitlementIsActive = false
21
c3dda63f50ed Added Core Data and UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 19
diff changeset
16 @State private var searchCurrency = ""
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
17 @State private var showingSubscriptionPaywall = false
50
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
18 @State private var alertTitle = ""
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
19 @State private var alertMessage = ""
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
20 @State private var showingAlert = false
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
21
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
22 /*
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
23 If searched currency string is empty:
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
24 * Show all currencies
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
25 else:
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
26 * Show filtered list of currencies containing searched currency string
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
27 */
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
28 var searchResults: [String] {
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
29 let currencyPairsSupported: [String] = try! read(json: "CurrencyPairs.json")
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
30 if searchCurrency.isEmpty {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
31 return currencyPairsSupported.sorted()
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
32 } else {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
33 return currencyPairsSupported.filter { $0.contains(searchCurrency.uppercased()) }
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
34 }
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
35 }
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
36
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
37 var body: some View {
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
38 NavigationView {
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
39 VStack {
61
84ce5e5f0381 Improved search bar in currency selector
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 59
diff changeset
40 SearchBar(placeholder: "Search...", text: $searchCurrency)
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
41 .padding()
128
87f02d4f9c26 Add custom build configuration
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 109
diff changeset
42 .accessibilityIdentifier("CurrencySearchBar")
61
84ce5e5f0381 Improved search bar in currency selector
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 59
diff changeset
43
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
44 List {
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
45 if entitlementIsActive {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
46 ForEach(searchResults, id: \.self) { currencyPairsSupported in
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
47 Button(action: {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
48 self.currencyPair = currencyPairsSupported
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
49 showingCurrencySelector = false
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
50 }) {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
51 CurrencyRow(currencyPairName: currencyPairsSupported)
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
52 }
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
53 }
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
54 } else {
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
55 ForEach(searchResults, id: \.self) { currencyPairsSupported in
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
56 Button(action: { select(currencyPairsSupported) }) {
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
57 CurrencyRow(currencyPairName: currencyPairsSupported, isLocked: false)
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
58 }
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
59 }
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
60 }
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
61 }
106
599fe95307f6 Fixes minor bugs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 93
diff changeset
62 .id(UUID())
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
63 }
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
64 .navigationTitle("Currencies")
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
65 .navigationBarTitleDisplayMode(.inline)
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
66 .toolbar {
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
67 ToolbarItem(placement: .cancellationAction) {
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
68 Button(action: { showingCurrencySelector = false }) {
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
69 Text("Cancel")
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
70 }
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
71 }
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
72 }
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
73 }
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
74 .onAppear(perform: checkEntitlement)
50
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
75 .alert(isPresented: $showingAlert) {
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
76 Alert(title: Text(alertTitle), message: Text(alertMessage), dismissButton: .default(Text("Ok")))
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
77 }
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
78 .sheet(isPresented: $showingSubscriptionPaywall, onDismiss: checkEntitlement) {
75
b6f8661300f2 Added isLocked to CurrencyPairs
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 73
diff changeset
79 SubscriptionPaywall(showingSubscriptionPaywall: $showingSubscriptionPaywall)
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
80 }
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
81 }
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
82
42
d25b02d439d4 Minor updates subscription and legal requirements
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 31
diff changeset
83 /*
47
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
84 If user is subscribed:
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
85 * Select currency and dismiss currency selector
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
86 else:
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
87 * Show subscription paywall
42
d25b02d439d4 Minor updates subscription and legal requirements
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 31
diff changeset
88 */
152
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
89 private func select(_ currencyPair: String) {
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
90 // if currencyPair.isLocked {
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
91 // showingSubscriptionPaywall = true
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
92 // } else {
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
93 // self.currencyPair = currencyPair.name
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
94 // showingCurrencySelector = false
2584fd74235a Add new currencies
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 150
diff changeset
95 // }
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
96 }
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
97
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
98 // Check if user subscription is active
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
99 private func checkEntitlement() {
128
87f02d4f9c26 Add custom build configuration
Dennis Concepcion Martin <dennisconcepcionmartin@gmail.com>
parents: 109
diff changeset
100 #if SCREENSHOTS
93
529feb1fc8d5 Added UI Tests for capture screenshots
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 77
diff changeset
101 entitlementIsActive = true
529feb1fc8d5 Added UI Tests for capture screenshots
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 77
diff changeset
102 #else
47
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
103 Purchases.shared.purchaserInfo { (purchaserInfo, error) in
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
104 if purchaserInfo?.entitlements["all"]?.isActive == true {
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
105 entitlementIsActive = true
42
d25b02d439d4 Minor updates subscription and legal requirements
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 31
diff changeset
106 }
50
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
107
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
108 if let error = error as NSError? {
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
109 alertTitle = error.localizedDescription
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
110 alertMessage = error.localizedFailureReason ?? ""
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
111 showingAlert = true
7a6a7c677851 Handle errors with alerts
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 47
diff changeset
112 }
47
75c1a05176f6 Refactor code
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 46
diff changeset
113 }
93
529feb1fc8d5 Added UI Tests for capture screenshots
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 77
diff changeset
114 #endif
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 21
diff changeset
115 }
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
116 }
77
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
117 extension View {
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
118 func listStyle() -> some View {
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
119 self.modifier(ListModifier())
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
120 }
1069c33d3a42 Added new method to show unlocked content
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 75
diff changeset
121 }
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
122
21
c3dda63f50ed Added Core Data and UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 19
diff changeset
123
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
124 struct CurrencySelector_Previews: PreviewProvider {
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
125 static var previews: some View {
59
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
126 CurrencySelector(
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
127 currencyPair: .constant("USD/GBP"),
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
128 showingCurrencySelector: .constant(false)
1303c1e50843 Fixes slow list updates
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 50
diff changeset
129 )
19
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
130 }
94fd7ac93060 Redesign
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
131 }