Mercurial > public > simoleon

annotate Simoleon/Settings.swift @ 29:c52966834f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add localised strings
author Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
date Thu, 22 Jul 2021 22:30:54 +0100
parents 4f862c618b44
children 41a905e591e4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
1 //
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
2 // Settings.swift
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
3 // Simoleon
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
4 //
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
5 // Created by Dennis Concepción Martín on 19/07/2021.
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
6 //
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
7
3596690dda73 Add Config files and implementing Settings
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: 27
diff changeset
9 import Purchases
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
10
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
11 struct Settings: View {
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
12 @EnvironmentObject var subscriptionController: SubscriptionController
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
13 @Environment(\.managedObjectContext) private var viewContext
27
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
14 @FetchRequest(sortDescriptors: []) private var defaultCurrency: FetchedResults<DefaultCurrency>
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
15
27
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
16 @State private var selectedDefaultCurrency = ""
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
17 @State private var showingSubscriptionPaywall = false
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
18
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
19 let currencyPairs: [String] = parseJson("CurrencyPairs.json")
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
20
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
21 var body: some View {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
22 List {
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
23 Section(header: Text("Subscription", comment: "Section header in settings")) {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
24 if subscriptionController.isActive {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
25 NavigationLink(destination: SubscriberInfo()) {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
26 Text("Information", comment: "Button to show subscription information in settings")
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
27 }
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
28 } else {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
29 Text("Subscribe", comment: "Button to suscribe in settings")
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
30 .onTapGesture { showingSubscriptionPaywall = true }
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
31 }
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
32 }
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
33
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
34 Section(header: Text("Preferences", comment: "Section header in settings")) {
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
35 if subscriptionController.isActive {
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
36 Picker(selection: $selectedDefaultCurrency, label: Text("Default currency", comment: "Picker to select default currency"), content: {
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
37 ForEach(currencyPairs.sorted(), id: \.self) { currencyPair in
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
38 Text(currencyPair)
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
39 }
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
40 })
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
41 } else {
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
42 LockedCurrencyPicker()
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
43 .contentShape(Rectangle())
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
44 .onTapGesture { showingSubscriptionPaywall = true }
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
45 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
46 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
47
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
48 Section(header: Text("Stay in touch", comment: "Section header in settings")) {
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
49 Link(destination: URL(string: "https://itunes.apple.com/app/id1576390953?action=write-review")!) {
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
50 HStack {
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
51 Image(systemName: "heart.fill")
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
52 .foregroundColor(Color(.systemRed))
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
53 .imageScale(.large)
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
54
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
55 Text("Rate Simoleon", comment: "Button to rate app in Settings")
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
56 }
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
57 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
58
25
933d9ab04374 Fixes Cloudkit sync
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 24
diff changeset
59 Link(destination: URL(string: "https://twitter.com/dennisconcep")!) {
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
60 HStack {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
61 Image("TwitterLogo")
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
62 .resizable()
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
63 .frame(width: 30, height: 30)
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
64
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
65 Text("Developer's Twitter", comment: "Button to go to Twitter in Settings")
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
66 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
67 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
68
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
69 Link(destination: URL(string: "https://dennistech.io/contact")!) {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
70 HStack {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
71 Image(systemName: "envelope.circle.fill")
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
72 .renderingMode(.original)
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
73 .imageScale(.large)
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
74
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
75 Text("Contact", comment: "Button to contact in Settings")
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
76 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
77 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
78 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
79
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
80 Section(header: Text("About")) {
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
81 Link(destination: URL(string: "https://dennistech.io")!) {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
82 Text("Website", comment: "Button to go to Dennis Tech website")
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
83 }
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
84
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
85 Link(destination: URL(string: "https://dennistech.io")!) {
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
86 Text("Privacy Policy", comment: "Button to go to app privacy policy")
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
87 }
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
88 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
89 }
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
90 .onAppear(perform: onAppear)
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
91 .listStyle(InsetGroupedListStyle())
29
c52966834f83 Add localised strings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 28
diff changeset
92 .navigationTitle(Text("Settings", comment: "Navigation title"))
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
93 .sheet(isPresented: $showingSubscriptionPaywall) {
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
94 Subscription(showingSubscriptionPaywall: $showingSubscriptionPaywall)
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
95 .environmentObject(subscriptionController)
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
96 }
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
97 .if(UIDevice.current.userInterfaceIdiom == .phone) { content in
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
98 NavigationView { content }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
99 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
100 }
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
101
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
102 private func onAppear() {
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
103 // Set initial value of the picker
27
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
104 if selectedDefaultCurrency == "" {
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
105 self.selectedDefaultCurrency = defaultCurrency.first?.pair ?? "USD/GBP"
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
106 } else {
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
107 setCoreData()
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
108 }
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
109 }
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
110
27
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
111 private func setCoreData() {
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
112 if self.defaultCurrency.isEmpty { // If it's empty -> add record
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
113 let defaultCurrency = DefaultCurrency(context: viewContext)
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
114 defaultCurrency.pair = selectedDefaultCurrency
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
115
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
116 do {
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
117 try viewContext.save()
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
118 } catch {
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
119 print(error.localizedDescription)
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
120 }
27
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
121 } else { // If not, update record
d95582268b44 Fix bug CoreData and minor UI changes
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 25
diff changeset
122 self.defaultCurrency.first?.pair = selectedDefaultCurrency
23
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
123 try? viewContext.save()
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
124 }
699b5bb619db UserSettings CoreData implemented
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 22
diff changeset
125 }
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
126 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
127
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
128 struct Settings_Previews: PreviewProvider {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
129 static var previews: some View {
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
130 Settings()
28
4f862c618b44 Implemented RevenueCat
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents: 27
diff changeset
131 .environmentObject(SubscriptionController())
22
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
132 }
3596690dda73 Add Config files and implementing Settings
Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
parents:
diff changeset
133 }