Use markdown for localized links in ShareVault footer

Author: tobihagemann

Cryptomator/VaultDetail/ShareVault/ShareVaultView.swift

@@ -81,22 +81,13 @@ struct ShareVaultView: View {
 						}
 
 						if let footerText = viewModel.footerText,
-						   let docsButtonTitle = viewModel.docsButtonTitle,
 						   let docsURL = viewModel.docsURL {
 							VStack(spacing: 0) {
-								(Text(footerText)
-									.foregroundColor(.secondary) +
-									Text(" ") +
-									Text(docsButtonTitle)
-									.foregroundColor(.cryptomatorPrimary)
-									.underline() +
-									Text(".")
-									.foregroundColor(.secondary))
+								Text(LocalizedStringKey(String(format: footerText, docsURL.absoluteString)))
 									.font(.footnote)
+									.foregroundColor(.secondary)
+									.accentColor(.cryptomatorPrimary)
 									.multilineTextAlignment(.center)
-									.onTapGesture {
-										UIApplication.shared.open(docsURL)
-									}
 							}
 							.padding(.top, 32)
 							.padding(.horizontal, 32)
@@ -108,13 +99,13 @@ struct ShareVaultView: View {
 					}
 				}
 
-				if let url = viewModel.forTeamsURL {
+				if let url = viewModel.hubURL {
 					Button(
 						action: {
 							UIApplication.shared.open(url)
 						},
 						label: {
-							Text(viewModel.forTeamsButtonTitle)
+							Text(viewModel.hubButtonTitle)
 								.font(.headline)
 								.foregroundColor(.white)
 								.frame(maxWidth: .infinity)

Cryptomator/VaultDetail/ShareVault/ShareVaultViewModel.swift

@@ -22,10 +22,9 @@ protocol ShareVaultViewModelProtocol: AnyObject {
 	var featuresText: String? { get }
 	var hubSteps: [(String, String)]? { get }
 	var footerText: String? { get }
-	var docsButtonTitle: String? { get }
 	var docsURL: URL? { get }
-	var forTeamsButtonTitle: String { get }
-	var forTeamsURL: URL? { get }
+	var hubButtonTitle: String { get }
+	var hubURL: URL? { get }
 }
 
 class ShareVaultViewModel: ShareVaultViewModelProtocol, ObservableObject {
@@ -36,23 +35,21 @@ class ShareVaultViewModel: ShareVaultViewModelProtocol, ObservableObject {
 	let featuresText: String?
 	let hubSteps: [(String, String)]?
 	let footerText: String?
-	let docsButtonTitle: String?
 	let docsURL: URL?
-	let forTeamsButtonTitle: String
-	let forTeamsURL: URL?
+	let hubButtonTitle: String
+	let hubURL: URL?
 
 	init(type: ShareVaultType) {
 		switch type {
 		case .normal:
-			self.headerTitle = LocalizedString.getValue("shareVault.header.title")
+			self.headerTitle = LocalizedString.getValue("shareVault.normal.header.title")
 			self.headerSubtitle = nil
-			self.featuresText = LocalizedString.getValue("shareVault.header.features")
+			self.featuresText = LocalizedString.getValue("shareVault.normal.header.features")
 			self.hubSteps = nil
-			self.footerText = LocalizedString.getValue("shareVault.footer.text")
-			self.docsButtonTitle = LocalizedString.getValue("shareVault.footer.link")
+			self.footerText = LocalizedString.getValue("shareVault.normal.footer.text")
 			self.docsURL = URL(string: "https://docs.cryptomator.org/security/best-practices/#sharing-of-vaults")
-			self.forTeamsButtonTitle = LocalizedString.getValue("shareVault.button.visitHub")
-			self.forTeamsURL = URL(string: "https://cryptomator.org/for-teams/")
+			self.hubButtonTitle = LocalizedString.getValue("shareVault.normal.button.visitHub")
+			self.hubURL = URL(string: "https://cryptomator.org/for-teams/")
 		case let .hub(hubURL):
 			self.headerTitle = LocalizedString.getValue("shareVault.hub.header.title")
 			self.headerSubtitle = LocalizedString.getValue("shareVault.hub.header.subtitle")
@@ -62,10 +59,9 @@ class ShareVaultViewModel: ShareVaultViewModelProtocol, ObservableObject {
 				("2.circle.fill", LocalizedString.getValue("shareVault.hub.step2"))
 			]
 			self.footerText = nil
-			self.docsButtonTitle = nil
 			self.docsURL = nil
-			self.forTeamsButtonTitle = LocalizedString.getValue("shareVault.hub.button.openHub")
-			self.forTeamsURL = hubURL
+			self.hubButtonTitle = LocalizedString.getValue("shareVault.hub.button.openHub")
+			self.hubURL = hubURL
 		}
 	}
 }

SharedResources/en.lproj/Localizable.strings

@@ -223,6 +223,19 @@
 "sharePoint.selectDrive.header.title" = "Select the SharePoint document library you want to work with.";
 "sharePoint.selectDrive.emptyList.footer" = "No Document Libraries Available";
 
+"shareVault.title" = "Share Vault";
+"shareVault.normal.header.title" = "The secure way to work in teams";
+"shareVault.normal.header.features" = "Collaborate securely with your team. Grant and revoke access anytime without sharing passwords.";
+"shareVault.normal.footer.text" = "For more information, check out the best practices suggestions in our [docs](%@).";
+"shareVault.normal.button.visitHub" = "Visit Cryptomator Hub";
+"shareVault.hub.header.title" = "How to share a Hub vault";
+"shareVault.hub.header.subtitle" = "In order to share the vault content with another team member, you have to perform two steps:";
+"shareVault.hub.step1" = "Share access of the encrypted vault folder via cloud storage.";
+"shareVault.hub.step2" = "Grant access to team member in Cryptomator Hub.";
+"shareVault.hub.button.openHub" = "Open Cryptomator Hub";
+"shareVault.error.hubURLExtraction.title" = "Unable to Load Hub Information";
+"shareVault.error.hubURLExtraction.message" = "The vault's Hub configuration could not be loaded. Please check your vault settings or contact your Hub administrator.";
+
 "snapshots.fileprovider.file1" = "/Accounting.numbers";
 "snapshots.fileprovider.file2" = "/Final Presentation.key";
 "snapshots.fileprovider.file3" = "/Product Trailer.mov";
@@ -285,20 +298,6 @@
 "vaultDetail.button.shareVault" = "Share Vault";
 "vaultDetail.shareVault.footer" = "Securely collaborate with your team using Cryptomator Hub.";
 "vaultDetail.changePassword.footer" = "Select a strong password for your vault that only you know and keep it in a safe place.";
-
-"shareVault.title" = "Share Vault";
-"shareVault.header.title" = "The secure way to work in teams";
-"shareVault.header.features" = "Collaborate securely with your team. Grant and revoke access anytime without sharing passwords.";
-"shareVault.footer.text" = "For more information, check out the best practices suggestions in our";
-"shareVault.footer.link" = "docs";
-"shareVault.button.visitHub" = "Visit Cryptomator Hub";
-"shareVault.hub.header.title" = "How to share a Hub vault";
-"shareVault.hub.header.subtitle" = "In order to share the vault content with another team member, you have to perform two steps:";
-"shareVault.hub.step1" = "Share access of the encrypted vault folder via cloud storage.";
-"shareVault.hub.step2" = "Grant access to team member in Cryptomator Hub.";
-"shareVault.hub.button.openHub" = "Open Cryptomator Hub";
-"shareVault.error.hubURLExtraction.title" = "Unable to Load Hub Information";
-"shareVault.error.hubURLExtraction.message" = "The vault's Hub configuration could not be loaded. Please check your vault settings or contact your Hub administrator.";
 "vaultDetail.disabledBiometricalUnlock.footer" = "If you enable %@, your vault password will be stored in the iOS keychain.";
 "vaultDetail.enabledBiometricalUnlock.footer" = "Your vault password will only be required if %@ authentication fails.";
 "vaultDetail.info.footer.accessVault" = "Access the vault via the Files app.";