From 4ad5ec085d54800eece8bf2ca25f3ad04bee39fa Mon Sep 17 00:00:00 2001
From: Rituraj Sambherao <54317407+ritsam@users.noreply.github.com>
Date: Tue, 1 Sep 2020 14:02:03 +0100
Subject: [PATCH] Voice assist double tap on link fix (EXPOSUREAPP-2288)
(#1094)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../ui/information/InformationAboutFragment.kt | 10 ++++++++--
.../coronawarnapp/ui/onboarding/OnboardingFragment.kt | 10 ++++++++--
Corona-Warn-App/src/main/res/values-de/strings.xml | 2 ++
Corona-Warn-App/src/main/res/values/strings.xml | 2 ++
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
index 52153ca9f..5cc5be6d7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt
@@ -1,12 +1,14 @@
package de.rki.coronawarnapp.ui.information
+import android.content.Intent
+import android.net.Uri
import android.os.Bundle
-import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.accessibility.AccessibilityEvent
import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentInformationAboutBinding
import de.rki.coronawarnapp.ui.main.MainActivity
@@ -43,7 +45,11 @@ class InformationAboutFragment : Fragment() {
private fun setLinks() {
binding.informationAboutEasyLanguage
- .movementMethod = LinkMovementMethod.getInstance()
+ .setOnClickListener {
+ val browserIntent = Intent(Intent.ACTION_VIEW,
+ Uri.parse(getString(R.string.onboarding_tracing_easy_language_explanation_url)))
+ startActivity(browserIntent)
+ }
}
override fun onResume() {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt
index e01dac101..6b18c0845 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt
@@ -1,13 +1,15 @@
package de.rki.coronawarnapp.ui.onboarding
+import android.content.Intent
+import android.net.Uri
import android.os.Bundle
-import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.accessibility.AccessibilityEvent
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
+import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentOnboardingBinding
import de.rki.coronawarnapp.ui.doNavigate
@@ -48,7 +50,11 @@ class OnboardingFragment : Fragment() {
private fun setLinks() {
binding.onboardingInclude.onboardingEasyLanguage
- .movementMethod = LinkMovementMethod.getInstance()
+ .setOnClickListener {
+ val browserIntent = Intent(Intent.ACTION_VIEW,
+ Uri.parse(getString(R.string.onboarding_tracing_easy_language_explanation_url)))
+ startActivity(browserIntent)
+ }
}
override fun onResume() {
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 0f785eaa0..f7046db6a 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -412,6 +412,8 @@
<string name="onboarding_tracing_body_emphasized">"Die verschlüsselten Zufallscodes geben nur Auskunft über das Datum, die Dauer und die anhand der Signalstärke berechnete Entfernung zu Ihren Mitmenschen. Persönliche Daten wie Name, Adresse oder Aufenthaltsort werden zu keiner Zeit erfasst. Konkrete Rückschlüsse auf Personen sind nicht möglich."</string>
<!-- YTXT: onboarding(tracing) - easy language explain tracing link-->
<string name="onboarding_tracing_easy_language_explanation"><a href="https://www.bundesregierung.de/breg-de/themen/corona-warn-app/corona-warn-app-leichte-sprache-gebaerdensprache">Informationen zur App in leichter Sprache und Gebärdensprache</a></string>
+ <!-- NOTR: onboarding(tracing) - easy language explain tracing link URL-->
+ <string name="onboarding_tracing_easy_language_explanation_url">"https://www.bundesregierung.de/breg-de/themen/corona-warn-app/corona-warn-app-leichte-sprache-gebaerdensprache"</string>
<!-- XHED: onboarding(tracing) - headline for consent information -->
<string name="onboarding_tracing_headline_consent">"Einwilligungserklärung"</string>
<!-- YTXT: onboarding(tracing) - body for consent information -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 8e0958794..81a41bb7b 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -414,6 +414,8 @@
<string name="onboarding_tracing_body_emphasized">"The encrypted random IDs only pass information about date, duration and proximity (using signal strength) to other people. Personal data such as name, address, location is never recorded. Individuals cannot be identified."</string>
<!-- YTXT: onboarding(tracing) - easy language explain tracing link-->
<string name="onboarding_tracing_easy_language_explanation"><a href="https://www.bundesregierung.de/breg-de/themen/corona-warn-app/corona-warn-app-leichte-sprache-gebaerdensprache">"App Information in Simplified Language and Sign Language"</a></string>
+ <!-- NOTR: onboarding(tracing) - easy language explain tracing link URL-->
+ <string name="onboarding_tracing_easy_language_explanation_url">"https://www.bundesregierung.de/breg-de/themen/corona-warn-app/corona-warn-app-leichte-sprache-gebaerdensprache"</string>
<!-- XHED: onboarding(tracing) - headline for consent information -->
<string name="onboarding_tracing_headline_consent">"Declaration of Consent"</string>
<!-- YTXT: onboarding(tracing) - body for consent information -->
--
GitLab