From 400242690bbb17828d9c0e5a3652841977dbbef7 Mon Sep 17 00:00:00 2001 From: kingbri Date: Wed, 31 Aug 2022 12:06:13 -0400 Subject: [PATCH] Ferrite: Format and cleanup Signed-off-by: kingbri --- Ferrite/DataManagement/PersistenceController.swift | 12 ++++-------- Ferrite/Extensions/String.swift | 10 +++++----- Ferrite/Views/AboutView.swift | 1 - .../CommonViews/IndeterminateProgressView.swift | 4 ++-- Ferrite/Views/SettingsView.swift | 3 ++- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Ferrite/DataManagement/PersistenceController.swift b/Ferrite/DataManagement/PersistenceController.swift index ad5ae0d..de19701 100644 --- a/Ferrite/DataManagement/PersistenceController.swift +++ b/Ferrite/DataManagement/PersistenceController.swift @@ -32,24 +32,20 @@ struct PersistenceController { description.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey) description.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey) - container.viewContext.automaticallyMergesChangesFromParent = true - container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy - try? container.viewContext.setQueryGenerationFrom(.current) - container.loadPersistentStores { _, error in if let error = error { fatalError("CoreData init error: \(error)") } } + container.viewContext.automaticallyMergesChangesFromParent = true + container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy + try? container.viewContext.setQueryGenerationFrom(.current) + backgroundContext = container.newBackgroundContext() backgroundContext.automaticallyMergesChangesFromParent = true backgroundContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy try? backgroundContext.setQueryGenerationFrom(.current) - - container.viewContext.automaticallyMergesChangesFromParent = true - container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy - try? container.viewContext.setQueryGenerationFrom(.current) } func save(_ context: NSManagedObjectContext? = nil) { diff --git a/Ferrite/Extensions/String.swift b/Ferrite/Extensions/String.swift index b53d3ce..20a1917 100644 --- a/Ferrite/Extensions/String.swift +++ b/Ferrite/Extensions/String.swift @@ -34,9 +34,9 @@ extension String { return result } - static func ==(lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedSame } - static func <(lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedAscending } - static func <=(lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) != .orderedDescending } - static func >(lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedDescending } - static func >=(lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) != .orderedAscending } + static func == (lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedSame } + static func < (lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedAscending } + static func <= (lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) != .orderedDescending } + static func > (lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) == .orderedDescending } + static func >= (lhs: String, rhs: String) -> Bool { lhs.compare(toVersion: rhs) != .orderedAscending } } diff --git a/Ferrite/Views/AboutView.swift b/Ferrite/Views/AboutView.swift index d06cdf6..b2285aa 100644 --- a/Ferrite/Views/AboutView.swift +++ b/Ferrite/Views/AboutView.swift @@ -22,7 +22,6 @@ struct AboutView: View { ListRowTextView(leftText: "Version", rightText: UIApplication.shared.appVersion) ListRowTextView(leftText: "Build number", rightText: UIApplication.shared.appBuild) ListRowTextView(leftText: "Build type", rightText: UIApplication.shared.buildType) - ListRowLinkView(text: "Donate!", link: "https://ko-fi.com/kingbri") ListRowLinkView(text: "Discord server", link: "https://discord.gg/sYQxnuD7Fj") ListRowLinkView(text: "GitHub repository", link: "https://github.com/bdashore3/Ferrite") } diff --git a/Ferrite/Views/CommonViews/IndeterminateProgressView.swift b/Ferrite/Views/CommonViews/IndeterminateProgressView.swift index a2f6270..c9f6e33 100644 --- a/Ferrite/Views/CommonViews/IndeterminateProgressView.swift +++ b/Ferrite/Views/CommonViews/IndeterminateProgressView.swift @@ -21,11 +21,11 @@ struct IndeterminateProgressView: View { .foregroundColor(Color.accentColor) .frame(width: reader.size.width * 0.26, height: 6) .clipShape(Capsule()) - + .offset(x: -reader.size.width * 0.6, y: 0) .offset(x: reader.size.width * 1.2 * self.offset, y: 0) .animation(.default.repeatForever().speed(0.5), value: self.offset) - .onAppear{ + .onAppear { withAnimation { self.offset = 1 } diff --git a/Ferrite/Views/SettingsView.swift b/Ferrite/Views/SettingsView.swift index 2dcd3fd..72bfa53 100644 --- a/Ferrite/Views/SettingsView.swift +++ b/Ferrite/Views/SettingsView.swift @@ -101,7 +101,8 @@ struct SettingsView: View { NavigationLink("Version history", destination: SettingsAppVersionView()) } - Section { + Section(header: Text("Information")) { + ListRowLinkView(text: "Donate", link: "https://ko-fi.com/kingbri") ListRowLinkView(text: "Report issues", link: "https://github.com/bdashore3/Ferrite/issues") NavigationLink("About", destination: AboutView()) }