From 9a360c3acffe9d0766a79e789210439322503d2a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 1 Jan 2021 17:41:47 +0100 Subject: [PATCH] Merge GitHub URLs --- .../App/iOS/Scenes/About/AboutViewController.swift | 2 +- Passepartout/App/macOS/Global/Credits.html | 4 ++-- Passepartout/Core/Sources/AppConstants.swift | 14 +++++--------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Passepartout/App/iOS/Scenes/About/AboutViewController.swift b/Passepartout/App/iOS/Scenes/About/AboutViewController.swift index f5bd420f..49c9301d 100644 --- a/Passepartout/App/iOS/Scenes/About/AboutViewController.swift +++ b/Passepartout/App/iOS/Scenes/About/AboutViewController.swift @@ -209,7 +209,7 @@ extension AboutViewController { showCredits() case .readme: - visitURL(AppConstants.URLs.iOS.readme) + visitURL(AppConstants.URLs.readme) case .changelog: visitURL(AppConstants.URLs.iOS.changelog) diff --git a/Passepartout/App/macOS/Global/Credits.html b/Passepartout/App/macOS/Global/Credits.html index 233c1b05..f494b57d 100644 --- a/Passepartout/App/macOS/Global/Credits.html +++ b/Passepartout/App/macOS/Global/Credits.html @@ -14,8 +14,8 @@ body { - README · - CHANGELOG · + README · + CHANGELOG · FAQ
Disclaimer · diff --git a/Passepartout/Core/Sources/AppConstants.swift b/Passepartout/Core/Sources/AppConstants.swift index c3332dfb..9d51b4cc 100644 --- a/Passepartout/Core/Sources/AppConstants.swift +++ b/Passepartout/Core/Sources/AppConstants.swift @@ -177,16 +177,14 @@ public class AppConstants { } public class URLs { + public static let readme = Repos.apple.appendingPathComponent("blob/master/README.md") + public class iOS { - public static let readme = Repos.ios.appendingPathComponent("blob/master/README.md") - - public static let changelog = Repos.ios.appendingPathComponent("blob/master/CHANGELOG.md") + public static let changelog = Repos.apple.appendingPathComponent("blob/master/Passepartout/App/iOS/CHANGELOG.md") } public class macOS { - public static let readme = Repos.macos.appendingPathComponent("blob/master/README.md") - - public static let changelog = Repos.macos.appendingPathComponent("blob/master/CHANGELOG.md") + public static let changelog = Repos.apple.appendingPathComponent("blob/master/Passepartout/App/macOS/CHANGELOG.md") } public static let filetypes = ["public.content", "public.data"] @@ -265,9 +263,7 @@ public class AppConstants { return githubRawRoot.appendingPathComponent(repo) } - public static let ios = github(repo: "passepartout-ios") - - public static let macos = github(repo: "passepartout-macos") + public static let apple = github(repo: "passepartout-apple") public static let api = githubRaw(repo: "api") }