Mercurial > public > simoleon

changeset 25:933d9ab04374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes Cloudkit sync
author Dennis Concepción Martín <dennisconcepcionmartin@gmail.com>
date Tue, 20 Jul 2021 12:23:32 +0100
parents bda6a55d027a
children 337816652bfe
files Simoleon.xcodeproj/project.pbxproj Simoleon.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate Simoleon/Conversion.swift Simoleon/Helpers/Sidebar.swift Simoleon/Info.plist Simoleon/Persistence.swift Simoleon/Settings.swift
diffstat 7 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Simoleon.xcodeproj/project.pbxproj	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon.xcodeproj/project.pbxproj	Tue Jul 20 12:23:32 2021 +0100
@@ -14,6 +14,7 @@
 		9585BB1426A6B7F400E3193E /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585BB1326A6B7F400E3193E /* Request.swift */; };
 		9585BB1726A6BEA600E3193E /* UserSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585BB1526A6BEA600E3193E /* UserSettings+CoreDataClass.swift */; };
 		9585BB1826A6BEA600E3193E /* UserSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585BB1626A6BEA600E3193E /* UserSettings+CoreDataProperties.swift */; };
+		9585BB1A26A6E8FD00E3193E /* SimpleSuccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585BB1926A6E8FD00E3193E /* SimpleSuccess.swift */; };
 		95AEBC9526A03ECB00613729 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95AEBC9426A03ECB00613729 /* ContentView.swift */; };
 		95AEBC9B26A04A4200613729 /* CurrencyMetadataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95AEBC9A26A04A4200613729 /* CurrencyMetadataModel.swift */; };
 		95AEBC9D26A04D4600613729 /* CurrencyRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95AEBC9C26A04D4600613729 /* CurrencyRow.swift */; };
@@ -68,6 +69,7 @@
 		9585BB1326A6B7F400E3193E /* Request.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
 		9585BB1526A6BEA600E3193E /* UserSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataClass.swift"; sourceTree = "<group>"; };
 		9585BB1626A6BEA600E3193E /* UserSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataProperties.swift"; sourceTree = "<group>"; };
+		9585BB1926A6E8FD00E3193E /* SimpleSuccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleSuccess.swift; sourceTree = "<group>"; };
 		95AEBC9426A03ECB00613729 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		95AEBC9A26A04A4200613729 /* CurrencyMetadataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyMetadataModel.swift; sourceTree = "<group>"; };
 		95AEBC9C26A04D4600613729 /* CurrencyRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyRow.swift; sourceTree = "<group>"; };
@@ -147,6 +149,7 @@
 				95559339269B0AB8000FD726 /* ParseJson.swift */,
 				9585BB1126A6B71B00E3193E /* ReadConfig.swift */,
 				9585BB1326A6B7F400E3193E /* Request.swift */,
+				9585BB1926A6E8FD00E3193E /* SimpleSuccess.swift */,
 			);
 			path = Functions;
 			sourceTree = "<group>";
@@ -397,6 +400,7 @@
 				9585BB1226A6B71B00E3193E /* ReadConfig.swift in Sources */,
 				95AEBC9526A03ECB00613729 /* ContentView.swift in Sources */,
 				95AEBC9B26A04A4200613729 /* CurrencyMetadataModel.swift in Sources */,
+				9585BB1A26A6E8FD00E3193E /* SimpleSuccess.swift in Sources */,
 				9555933A269B0AB8000FD726 /* ParseJson.swift in Sources */,
 				95C5179D26A5EFBE00BC2B24 /* Favourite+CoreDataProperties.swift in Sources */,
 				95C5179F26A5F34200BC2B24 /* Favourites.swift in Sources */,
@@ -575,7 +579,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Simoleon/Simoleon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Simoleon/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
@@ -600,7 +604,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Simoleon/Simoleon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Simoleon/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
Binary file Simoleon.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed
--- a/Simoleon/Conversion.swift	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon/Conversion.swift	Tue Jul 20 12:23:32 2021 +0100
@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-import Alamofire
 
 struct Conversion: View {
     var fetchUserSettings: Bool
--- a/Simoleon/Helpers/Sidebar.swift	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon/Helpers/Sidebar.swift	Tue Jul 20 12:23:32 2021 +0100
@@ -23,6 +23,7 @@
             }
         }
         .listStyle(SidebarListStyle())
+        .navigationTitle("Categories")
     }
 }
 
--- a/Simoleon/Info.plist	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon/Info.plist	Tue Jul 20 12:23:32 2021 +0100
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>API_KEY</key>
+	<string>$(API_KEY)</string>
+	<key>API_URL</key>
+	<string>$(API_URL)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -29,6 +33,10 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchScreen</key>
 	<dict/>
 	<key>UILaunchStoryboardName</key>
@@ -41,10 +49,6 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-	<key>API_KEY</key>
-	<string>$(API_KEY)</string>
-	<key>API_URL</key>
-	<string>$(API_URL)</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
--- a/Simoleon/Persistence.swift	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon/Persistence.swift	Tue Jul 20 12:23:32 2021 +0100
@@ -37,6 +37,8 @@
 
     init(inMemory: Bool = false) {
         container = NSPersistentCloudKitContainer(name: "Simoleon")
+        container.viewContext.automaticallyMergesChangesFromParent = true
+        container.viewContext.mergePolicy = NSMergeByPropertyStoreTrumpMergePolicy
         if inMemory {
             container.persistentStoreDescriptions.first!.url = URL(fileURLWithPath: "/dev/null")
         }
--- a/Simoleon/Settings.swift	Tue Jul 20 10:24:21 2021 +0100
+++ b/Simoleon/Settings.swift	Tue Jul 20 12:23:32 2021 +0100
@@ -34,13 +34,13 @@
                     }
                 }
                 
-                Link(destination: URL(string: "https://dennistech.io")!) {
+                Link(destination: URL(string: "https://twitter.com/dennisconcep")!) {
                     HStack {
                         Image("TwitterLogo")
                             .resizable()
                             .frame(width: 30, height: 30)
                         
-                        Text("Follow on Twitter")
+                        Text("Developer's Twitter")
                     }
                 }
                 
@@ -58,7 +58,6 @@
             Section(header: Text("About")) {
                 Link("Website", destination: URL(string: "https://dennistech.io")!)
                 Link("Privacy Policy", destination: URL(string: "https://dennistech.io")!)
-                Link("Developer's Twitter", destination: URL(string: "https://twitter.com/dennisconcep")!)
             }
         }
         .onChange(of: selectedCurrencyPair, perform: { selectedCurrencyPair in