From 23b07892f0274d8ebcec05db6f85f5506373f649 Mon Sep 17 00:00:00 2001
From: Rituraj Sambherao <54317407+ritsam@users.noreply.github.com>
Date: Mon, 17 Aug 2020 21:45:29 +0100
Subject: [PATCH] Initial commit - implmentation done (#1028)
1. Onboarding and About fragments are added with the easy language texts
---
.../information/InformationAboutFragment.kt | 7 ++++++
.../ui/onboarding/OnboardingFragment.kt | 7 ++++++
.../res/layout/fragment_information_about.xml | 16 +++++++++++++
.../main/res/layout/fragment_onboarding.xml | 2 ++
.../main/res/layout/include_onboarding.xml | 23 ++++++++++++++++++-
.../src/main/res/values-de/strings.xml | 2 ++
.../src/main/res/values/strings.xml | 2 ++
7 files changed, 58 insertions(+), 1 deletion(-)
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 7f0860263..52153ca9f 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,6 +1,7 @@
package de.rki.coronawarnapp.ui.information
import android.os.Bundle
+import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -37,6 +38,12 @@ class InformationAboutFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setButtonOnClickListener()
+ setLinks()
+ }
+
+ private fun setLinks() {
+ binding.informationAboutEasyLanguage
+ .movementMethod = LinkMovementMethod.getInstance()
}
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 ace481434..e01dac101 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,6 +1,7 @@
package de.rki.coronawarnapp.ui.onboarding
import android.os.Bundle
+import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -42,6 +43,12 @@ class OnboardingFragment : Fragment() {
OnboardingFragmentDirections.actionOnboardingFragmentToOnboardingPrivacyFragment()
)
}
+ setLinks()
+ }
+
+ private fun setLinks() {
+ binding.onboardingInclude.onboardingEasyLanguage
+ .movementMethod = LinkMovementMethod.getInstance()
}
override fun onResume() {
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
index b2f48c1a2..5d5c89cfd 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
@@ -69,6 +69,22 @@
app:layout_constraintStart_toEndOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/information_about_body_emphasized" />
+ <TextView
+ android:id="@+id/information_about_easy_language"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:clickable="true"
+ android:focusable="true"
+ android:linksClickable="true"
+ android:textColorLink="@color/colorTextTint"
+ android:text="@string/onboarding_tracing_easy_language_explanation"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/information_about_body" />
+
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_start"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
index 1f778ffbc..e3a0f1186 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
@@ -12,6 +12,7 @@
tools:context="de.rki.coronawarnapp.ui.onboarding.OnboardingFragment">
<include
+ android:id="@+id/onboarding_include"
layout="@layout/include_onboarding"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -20,6 +21,7 @@
app:body="@{@string/onboarding_body}"
app:bodyEmphasized="@{@string/onboarding_body_emphasized}"
app:headline="@{@string/onboarding_headline}"
+ app:easyLanguageText="@{@string/onboarding_tracing_easy_language_explanation}"
app:illustration="@{@drawable/ic_illustration_together}"
app:illustrationDescription="@{@string/onboarding_illustration_description}"
app:layout_constraintBottom_toTopOf="@+id/onboarding_button_next"
diff --git a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
index 9a3fe133c..2998539b5 100644
--- a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
@@ -53,6 +53,10 @@
name="locationBodyCard"
type="String" />
+ <variable
+ name="easyLanguageText"
+ type="String" />
+
</data>
<ScrollView
@@ -130,6 +134,23 @@
app:layout_constraintTop_toBottomOf="@id/onboarding_body"
tools:text="@string/onboarding_body_emphasized" />
+ <TextView
+ android:id="@+id/onboarding_easy_language"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:clickable="true"
+ android:focusable="true"
+ android:linksClickable="true"
+ android:textColorLink="@color/colorTextTint"
+ android:text="@string/onboarding_tracing_easy_language_explanation"
+ android:visibility="@{FormatterHelper.formatVisibilityText(easyLanguageText)}"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/onboarding_body_emphasized"
+ tools:text="@string/onboarding_tracing_easy_language_explanation" />
+
<include
android:id="@+id/onboarding_location_card"
layout="@layout/include_tracing_status_card"
@@ -143,7 +164,7 @@
app:icon="@{locationIconCard}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
- app:layout_constraintTop_toBottomOf="@+id/onboarding_body_emphasized" />
+ app:layout_constraintTop_toBottomOf="@+id/onboarding_easy_language" />
<include
android:id="@+id/onboarding_card"
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 4df2b6b5a..aacf67310 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -408,6 +408,8 @@
<string name="onboarding_tracing_body">"Die Risiko-Ermittlung funktioniert, indem Ihr Handy per Bluetooth verschlüsselte Zufallscodes anderer Nutzerinnen und Nutzer empfängt und Ihren eigenen Zufallscode an deren Smartphones weitergibt. Die Funktion lässt sich jederzeit wieder deaktivieren."</string>
<!-- YTXT: onboarding(tracing) - explain tracing -->
<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>
<!-- 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 44cbf8737..0a2b46bee 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -410,6 +410,8 @@
<string name="onboarding_tracing_body">"Exposure logging works by your device receiving, via Bluetooth, encrypted random IDs of other users and passing your own random ID to their devices. This feature can be deactivated at any time."</string>
<!-- YTXT: onboarding(tracing) - explain tracing -->
<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">Informationen zur App in leichter Sprache und Gebärdensprache</a></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