diff --git a/src/xcode/ENA/ENA/Resources/Localization/bg.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/bg.lproj/Localizable.links.strings index 5196e364eb0..dcc244d738f 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/bg.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/bg.lproj/Localizable.links.strings @@ -68,4 +68,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/en/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/en/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.links.strings index 4928b237f3c..61b2cb739d0 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.links.strings @@ -70,4 +70,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/de/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.links.strings index 6f344b57ee8..ba5dc036119 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.links.strings @@ -70,4 +70,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/en/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/en/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Resources/Localization/pl.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/pl.lproj/Localizable.links.strings index 06ef125f466..909dde4de12 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/pl.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/pl.lproj/Localizable.links.strings @@ -68,4 +68,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/en/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/en/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Resources/Localization/ro.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/ro.lproj/Localizable.links.strings index 593c53f2f34..0b4101174f4 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/ro.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/ro.lproj/Localizable.links.strings @@ -68,4 +68,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/en/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/en/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Resources/Localization/tr.lproj/Localizable.links.strings b/src/xcode/ENA/ENA/Resources/Localization/tr.lproj/Localizable.links.strings index 7d07fc69362..e67b1b6bf99 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/tr.lproj/Localizable.links.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/tr.lproj/Localizable.links.strings @@ -68,4 +68,4 @@ "ExposureSubmission_WarnWithoutTAN_FAQLink" = "https://www.coronawarn.app/en/faq/results/#warn_without_tan"; -"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/de/faq/"; // to.do final URL +"Home_EndOfLifeThankYouTile_FAQLink" = "https://www.coronawarn.app/en/faq/#ramp_down"; diff --git a/src/xcode/ENA/ENA/Source/Extensions/NSMutableAttributedString+Link.swift b/src/xcode/ENA/ENA/Source/Extensions/NSMutableAttributedString+Link.swift index 19e4ff4743e..6437da55a37 100644 --- a/src/xcode/ENA/ENA/Source/Extensions/NSMutableAttributedString+Link.swift +++ b/src/xcode/ENA/ENA/Source/Extensions/NSMutableAttributedString+Link.swift @@ -9,9 +9,14 @@ extension NSMutableAttributedString { /// looks for the given text and sets a link attribute public func mark(_ text: String, with link: String) { let foundRange = mutableString.range(of: text) - guard let linkURL = URL(string: link), - foundRange.location != NSNotFound else { - Log.debug("Link \(text) text not found") + + guard let linkURL = URL(string: link) else { + Log.debug("Link URL could not created from string: \(link).") + return + } + + guard foundRange.location != NSNotFound else { + Log.debug("Link \(text) text not found.") return } diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.swift index 6c5c1d28e0f..9b5779a6705 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.swift @@ -60,6 +60,7 @@ final class EndOfLifeThankYouCell: UITableViewCell { descriptionTextView.adjustsFontForContentSizeCategory = true descriptionTextView.backgroundColor = .clear descriptionTextView.delegate = self + descriptionTextView.linkTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.enaColor(for: .textTint)] setupAccessibility() } diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.xib b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.xib index 7beb50edea0..66c9cd08ec5 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.xib +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.xib @@ -25,7 +25,7 @@ - + - + Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. @@ -94,6 +94,9 @@ + + + diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCellViewModel.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCellViewModel.swift index 47530016978..410f6b30a7f 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCellViewModel.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCellViewModel.swift @@ -31,11 +31,7 @@ class EndOfLifeThankYouCellViewModel { attributes: textAttributes ) - // to.do 08.03.2023: wait for final decision whether the FAQ link is tappable or not - // attributedString.mark( - // faqLinkText, - // with: LinkHelper.urlString(suffix: faqLinkAnchor, type: .faq) - // ) + attributedString.mark(faqLinkText, with: AppStrings.Home.EndOfLifeThankYouTile.faqLinkAnchor) return attributedString }