kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-25 12:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make support url brandable

Browse Source
This commit is contained in:
Balazs Perlaki-Horvath 2024-03-28 23:40:06 +01:00
parent 35911bf366
commit 4a62d0d1ae
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
App/App_macOS.swift
View File

@ -103,13 +103,17 @@ struct RootView: View {
} }
} }
.safeAreaInset(edge: .bottom) { .safeAreaInset(edge: .bottom) {
Link(destination: URL(string: "donations.url".localized)!) { if let url = URL(string: Brand.supportURLString) {
HStack { Link(destination: url) {
Image(systemName: "heart") HStack {
Text("enum.navigation_item.donations".localized) Image(systemName: "heart")
.foregroundColor(.primary) Text("enum.navigation_item.donations".localizedWithFormat(withArgs: Brand.appName))
.foregroundColor(.primary)
Spacer()
}
} }
.padding()} .padding()
}
} }
.frame(minWidth: 150) .frame(minWidth: 150)
.toolbar { .toolbar {

2
Model/Brand.swift
View File

@ -36,6 +36,7 @@ enum Brand {
static let welcomeLogoImageName: String = "welcomeLogo" static let welcomeLogoImageName: String = "welcomeLogo"
static let aboutText: String = Config.value(for: .aboutText) ?? "settings.about.description".localized static let aboutText: String = Config.value(for: .aboutText) ?? "settings.about.description".localized
static let aboutWebsite: String = Config.value(for: .aboutWebsite) ?? "https://www.kiwix.org" static let aboutWebsite: String = Config.value(for: .aboutWebsite) ?? "https://www.kiwix.org"
static let supportURLString: String = Config.value(for: .supportURL) ?? "https://kiwix.org/get-involved/"
static var defaultExternalLinkPolicy: ExternalLinkLoadingPolicy { static var defaultExternalLinkPolicy: ExternalLinkLoadingPolicy {
guard let policyString: String = Config.value(for: .externalLinkDefaultPolicy), guard let policyString: String = Config.value(for: .externalLinkDefaultPolicy),
@ -66,6 +67,7 @@ enum Config: String {
case showSearchSnippetInSettings = "SETTINGS_SHOW_SEARCH_SNIPPET" case showSearchSnippetInSettings = "SETTINGS_SHOW_SEARCH_SNIPPET"
case aboutText = "CUSTOM_ABOUT_TEXT" case aboutText = "CUSTOM_ABOUT_TEXT"
case aboutWebsite = "CUSTOM_ABOUT_WEBSITE" case aboutWebsite = "CUSTOM_ABOUT_WEBSITE"
case supportURL = "SUPPORT_URL"
static func value<T>(for key: Config) -> T? where T: LosslessStringConvertible { static func value<T>(for key: Config) -> T? where T: LosslessStringConvertible {
guard let object = Bundle.main.object(forInfoDictionaryKey: key.rawValue) else { guard let object = Bundle.main.object(forInfoDictionaryKey: key.rawValue) else {

6
Support/en.lproj/Localizable.strings
View File

@ -167,7 +167,7 @@
"settings.miscellaneous.title" = "Misc"; "settings.miscellaneous.title" = "Misc";
"settings.miscellaneous.button.feedback" = "Feedback"; "settings.miscellaneous.button.feedback" = "Feedback";
"settings.miscellaneous.button.rate_app" = "Rate the App"; "settings.miscellaneous.button.rate_app" = "Rate the App";
"settings.miscellaneous.button.donate" = "Support Kiwix"; "settings.miscellaneous.button.donate" = "Support %@";
"settings.miscellaneous.navigation.about" = "About"; "settings.miscellaneous.navigation.about" = "About";
"settings.selected_language.title" = "Languages"; "settings.selected_language.title" = "Languages";
"language_selector.name.title" = "Name"; "language_selector.name.title" = "Name";
@ -264,10 +264,8 @@
"enum.navigation_item.new" = "New"; "enum.navigation_item.new" = "New";
"enum.navigation_item.downloads" = "Downloads"; "enum.navigation_item.downloads" = "Downloads";
"enum.navigation_item.settings" = "Settings"; "enum.navigation_item.settings" = "Settings";
"enum.navigation_item.donations" = "Support Kiwix"; "enum.navigation_item.donations" = "Support %@";
"enum.search_result_snippet_mode.disabled" = "Disabled"; "enum.search_result_snippet_mode.disabled" = "Disabled";
"enum.search_result_snippet_mode.paragraph" = "First Paragraph"; "enum.search_result_snippet_mode.paragraph" = "First Paragraph";
"enum.search_result_snippet_mode.sentence" = "First Sentence"; "enum.search_result_snippet_mode.sentence" = "First Sentence";
"enum.search_result_snippet_mode.matches" = "Matches"; "enum.search_result_snippet_mode.matches" = "Matches";
"donations.url" = "https://kiwix.org/get-involved/";

2
Support/qqq.lproj/Localizable.strings
View File

@ -140,6 +140,7 @@
"settings.miscellaneous.button.feedback" = "Button title in settings"; "settings.miscellaneous.button.feedback" = "Button title in settings";
"settings.miscellaneous.button.rate_app" = "Button title in settings"; "settings.miscellaneous.button.rate_app" = "Button title in settings";
"settings.miscellaneous.navigation.about" = "Button title in settings opening the about page"; "settings.miscellaneous.navigation.about" = "Button title in settings opening the about page";
"settings.miscellaneous.button.donate" = "Button title in settings, opening the external browser to support the app. The App Name being the argument, eg: Support Kiwix"
"settings.selected_language.title" = "Label text for language picker in settings"; "settings.selected_language.title" = "Label text for language picker in settings";
"language_selector.name.title" = "Table header name in listing the languages and ZIM file count in each language in settings"; "language_selector.name.title" = "Table header name in listing the languages and ZIM file count in each language in settings";
"language_selector.count.table.title" = "Table header name in listing the languages and ZIM file count in each language in settings"; "language_selector.count.table.title" = "Table header name in listing the languages and ZIM file count in each language in settings";
@ -224,6 +225,7 @@
"enum.navigation_item.new" = "Side navigation menu item title"; "enum.navigation_item.new" = "Side navigation menu item title";
"enum.navigation_item.downloads" = "Side navigation menu item title"; "enum.navigation_item.downloads" = "Side navigation menu item title";
"enum.navigation_item.settings" = "Side navigation menu item title"; "enum.navigation_item.settings" = "Side navigation menu item title";
"enum.navigation_item.donations" = "Side navigation menu item title, with the App Name being the argument, eg: Support Kiwix"
"enum.search_result_snippet_mode.disabled" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches"; "enum.search_result_snippet_mode.disabled" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches";
"enum.search_result_snippet_mode.paragraph" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches"; "enum.search_result_snippet_mode.paragraph" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches";
"enum.search_result_snippet_mode.sentence" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches"; "enum.search_result_snippet_mode.sentence" = "Picker option title in settings. Search snippet: Disabled | First Paragraph | First Sentence | Matches";

5
Views/Settings/Settings.swift
View File

@ -228,7 +228,10 @@ struct Settings: View {
appStoreID: Brand.appStoreId) appStoreID: Brand.appStoreId)
UIApplication.shared.open(url) UIApplication.shared.open(url)
} }
Link("settings.miscellaneous.button.donate".localized, destination: URL(string: "donations.url".localized)!) if let url = URL(string: Brand.supportURLString) {
Link("settings.miscellaneous.button.donate".localizedWithFormat(withArgs: Brand.appName),
destination: url)
}
NavigationLink("settings.miscellaneous.navigation.about".localized) { About() } NavigationLink("settings.miscellaneous.navigation.about".localized) { About() }
} }
} }