Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Story/14916 EOL - Prepare ramp down of CWA: Adopt Thank You! Screen #5089

Merged
merged 8 commits into from
Mar 16, 2023
Merged

Story/14916 EOL - Prepare ramp down of CWA: Adopt Thank You! Screen #5089

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a30f45
14916: Adopt Thank You! Screen and show a tappable FAQ link.
flxschmidt Mar 14, 2023
f575cc0
14916: Split the guard to get better log informations.
flxschmidt Mar 14, 2023
b504d44
16916: Replace the word CWA with App.
flxschmidt Mar 14, 2023
dd49ca2
Merge branch 'story/14427-ramp-down-cwa' into story/14916-Prepare-ram…
flxschmidt Mar 14, 2023
2789fd7
14916: Swiftlint.
flxschmidt Mar 15, 2023
42aaa5b
14916: Swiftlint.
flxschmidt Mar 15, 2023
d9890dc
Merge branch 'story/14427-ramp-down-cwa' into story/14916-Prepare-ram…
flxschmidt Mar 16, 2023
beec127
Merge branch 'release/ramp-down.x' into story/14916-Prepare-ramp-down…
30mar Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/bg.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
4 changes: 2 additions & 2 deletions src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,9 +1525,9 @@ Bei ausgeschalteter Hintergrundaktualisierung müssen Sie die App täglich aufru

"Home_EndOfLifeThankYouTile_Title" = "Vielen Dank!";

"Home_EndOfLifeThankYouTile_description" = "Vielen Dank für die Nutzung der Corona-Warn-App. Während der Pandemie wurden durch die Nutzenden der Corona-Warn-App rund 9 Millionen positive Testergebnisse geteilt. Durch diese Teilung positiver Testergebnisse konnten Personen schnell vor einem erhöhten Infektionsrisiko gewarnt werden, das ihnen sonst unerkannt geblieben wäre. Viele Gewarnte wurden anschließend positiv getestet. Die Corona-Warn-App hat dank Ihrer Mithilfe ihren Zweck der frühzeitigen Warnung erfüllt und die Beendigung von Infektionsketten unterstützt.\n\nAb dem 1. Juni 2023 wird die Corona-Warn-App nicht mehr weiterentwickelt. Sie können weiterhin auf Ihre bereits in der CWA gespeicherten Zertifikate und das Kontakt-Tagebuch zugreifen. Alle anderen Funktionen stehen nicht mehr zur Verfügung.\n\nWeitere Informationen zum Betriebsende finden Sie in den %@.";
"Home_EndOfLifeThankYouTile_description" = "Vielen Dank für die Nutzung der Corona-Warn-App. Während der Pandemie wurden durch die Nutzenden der Corona-Warn-App rund 9 Millionen positive Testergebnisse geteilt. Durch diese Teilung positiver Testergebnisse konnten Personen schnell vor einem erhöhten Infektionsrisiko gewarnt werden, das ihnen sonst unerkannt geblieben wäre. Viele Gewarnte wurden anschließend positiv getestet. Die Corona-Warn-App hat dank Ihrer Mithilfe ihren Zweck der frühzeitigen Warnung erfüllt und die Beendigung von Infektionsketten unterstützt.\n\nAb dem 1. Juni 2023 wird die Corona-Warn-App nicht mehr weiterentwickelt. Sie können weiterhin auf Ihre bereits in der App gespeicherten Zertifikate und das Kontakt-Tagebuch zugreifen. Alle anderen Funktionen stehen nicht mehr zur Verfügung.\n\n%@";

"Home_EndOfLifeThankYouTile_faq" = "FAQ";
"Home_EndOfLifeThankYouTile_faq" = "Mehr Informationen finden Sie in den FAQ.";

/* Home Test Registration Card */

Expand Down
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/en.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/pl.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/ro.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Localization/tr.lproj/Localizable.links.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
11 changes: 8 additions & 3 deletions src/xcode/ENA/ENA/Source/Extensions/NSMutableAttributedString+Link.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
9 changes: 6 additions & 3 deletions src/xcode/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<rect key="frame" x="0.0" y="0.0" width="462" height="377"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="25b-YP-GPY" customClass="ENALabel" customModule="ENA" customModuleProvider="target">
<rect key="frame" x="16" y="0.0" width="446" height="20.333333333333332"/>
<rect key="frame" x="16" y="0.0" width="446" height="26.333333333333332"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="ENA Text Primary 1 Color"/>
<nil key="highlightedColor"/>
Expand All @@ -34,9 +34,9 @@
</userDefinedRuntimeAttributes>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" insetsLayoutMarginsFromSafeArea="NO" image="EndOfLifeThankYouIllustration" translatesAutoresizingMaskIntoConstraints="NO" id="MnV-8b-FIK">
<rect key="frame" x="0.0" y="24.333333333333343" width="462" height="304.33333333333326"/>
<rect key="frame" x="0.0" y="30.333333333333343" width="462" height="298.33333333333326"/>
</imageView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="251" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5xM-wZ-d5o">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="251" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="5xM-wZ-d5o">
<rect key="frame" x="16" y="332.66666666666669" width="1911" height="36.333333333333314"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<string key="text">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. </string>
Expand Down Expand Up @@ -94,6 +94,9 @@
</tableViewCell>
</objects>
<designables>
<designable name="25b-YP-GPY">
<size key="intrinsicContentSize" width="56" height="26.333333333333332"/>
</designable>
<designable name="GWJ-GG-Lqs">
<size key="intrinsicContentSize" width="63.333333333333336" height="26.333333333333332"/>
</designable>
Expand Down
9 changes: 4 additions & 5 deletions ...e/ENA/ENA/Source/Scenes/Home/Cells/EndOfLifeThankYou/EndOfLifeThankYouCellViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ 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: faqLinkAnchor
)

return attributedString
}
Expand Down