diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
index 053d1bb2fa06b08794858cab2cb2393b616cc23c..4d5b127d03617c4bdde3b3a61994e9cf11464d4f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.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,17 @@ class InformationLegalFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setButtonOnClickListener()
+ setUpContactFormLinks()
+ }
+
+ /**
+ * Make the links clickable
+ */
+ private fun setUpContactFormLinks() {
+ binding.informationLegalContactForm.informationLegalContactForm
+ .movementMethod = LinkMovementMethod.getInstance()
+ binding.informationLegalContactForm.informationLegalContactFormNonEnDe
+ .movementMethod = LinkMovementMethod.getInstance()
}
override fun onResume() {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt
new file mode 100644
index 0000000000000000000000000000000000000000..37d044477804d4b497eb449f1c12a9659aae53e2
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterInformationLegalHelper.kt
@@ -0,0 +1,34 @@
+@file:JvmName("FormatterInformationLegalHelper")
+
+package de.rki.coronawarnapp.util.formatter
+import android.view.View
+import java.util.Locale
+
+/**
+ * Language based format visibility
+ *
+ * @param defaultLanguageEnglishOrGerman
+ * @param isContactFormView
+ * @return
+ */
+fun formatVisibilityLanguageBased(defaultLanguageEnglishOrGerman: Boolean, isContactFormView: Boolean?): Int {
+ if (defaultLanguageEnglishOrGerman) {
+ return if (isContactFormView == true) {
+ View.VISIBLE
+ } else View.GONE
+ }
+ return if (isContactFormView == false) {
+ View.VISIBLE
+ } else View.GONE
+}
+
+/**
+ * checks the default language of the device and formats the visibility
+ * Returns visibility value
+ *
+ * @param isContactFormView
+ * @return
+ */
+fun formatContactForm(isContactFormView: Boolean?): Int =
+ formatVisibilityLanguageBased(Locale.getDefault().language == Locale.ENGLISH.language ||
+ Locale.getDefault().language == Locale.GERMAN.language, isContactFormView)
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
index ceace17bfb5a0c8e8abbd04da7f585a591fe0860..0cbf75aee7fb813758e3e63bd205846e35624a36 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
@@ -105,6 +105,15 @@
app:layout_constraintStart_toEndOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/information_legal_headline_contact" />
+ <include
+ android:id="@+id/information_legal_contact_form"
+ layout="@layout/include_contact_form"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toStartOf="@+id/guideline_end"
+ app:layout_constraintStart_toEndOf="@+id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/information_legal_subtitle_contact" />
+
<include
android:id="@+id/information_legal_divider_taxid"
layout="@layout/include_divider"
@@ -113,7 +122,7 @@
android:layout_marginTop="@dimen/spacing_medium"
app:layout_constraintEnd_toEndOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/information_legal_subtitle_contact" />
+ app:layout_constraintTop_toBottomOf="@+id/information_legal_contact_form" />
<TextView
android:id="@+id/information_legal_headline_taxid"
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_form.xml b/Corona-Warn-App/src/main/res/layout/include_contact_form.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3369e7d09b226bca0af4011564fac16a261fdb63
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/layout/include_contact_form.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <data>
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterInformationLegalHelper" />
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/information_legal_contact_form"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:focusable="true"
+ android:linksClickable="true"
+ android:text="@string/information_legal_subtitle_contact_form"
+ android:textColorLink="@color/colorTextTint"
+ android:visibility="@{FormatterInformationLegalHelper.formatContactForm(true)}"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/information_legal_contact_form_non_en_de"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:focusable="true"
+ android:linksClickable="true"
+ android:text="@string/information_legal_subtitle_contact_form_non_en_de"
+ android:textColorLink="@color/colorTextTint"
+ android:visibility="@{FormatterInformationLegalHelper.formatContactForm(false)}"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/information_legal_contact_form" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
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 aacf673101b79c1fbc86824be9eb310cd69e24e3..90431f6e453f3e75d72817ce147b351580390888 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -689,7 +689,11 @@
<!-- XHED: Headline for legal information page, contact section -->
<string name="information_legal_headline_contact">"Kontakt"</string>
<!-- YTXT: subtitle for legal information page, contact section -->
- <string name="information_legal_subtitle_contact">"E-Mail: CoronaWarnApp@rki.de"<xliff:g id="line_break">"\n"</xliff:g>"Telefon: +49 30 18754 5100"</string>
+ <string name="information_legal_subtitle_contact">"E-Mail: CoronaWarnApp@rki.de"</string>
+ <!-- YTXT: subtitle for legal information page, open contact form -->
+ <string name="information_legal_subtitle_contact_form"><a href="https://www.rki.de/SharedDocs/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">Kontaktformular</a></string>
+ <!-- NOTR: subtitle for legal information page, open contact form for languages other than English and German -->
+ <string name="information_legal_subtitle_contact_form_non_en_de">Contact Form in <a href="https://www.rki.de/SharedDocs/Kontaktformulare/en/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">English</a> or <a href="https://www.rki.de/SharedDocs/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">German</a></string>
<!-- XHED: Headline for legal information page, tax section -->
<string name="information_legal_headline_taxid">"Umsatzsteueridentifikationsnummer"</string>
<!-- YTXT: subtitle for legal information page, tax section -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 0a2b46beeeb62241a9381722e004e1c0ecbd1df4..2fd04e08af8f3b1ddfa39964eb76f086f888b279 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -691,7 +691,11 @@
<!-- XHED: Headline for legal information page, contact section -->
<string name="information_legal_headline_contact">"Contact"</string>
<!-- YTXT: subtitle for legal information page, contact section -->
- <string name="information_legal_subtitle_contact">"E-Mail: CoronaWarnApp@rki.de"<xliff:g id="line_break">"\n"</xliff:g>"Telephone: +49 30 18754 5100"</string>
+ <string name="information_legal_subtitle_contact">"E-Mail: CoronaWarnApp@rki.de"</string>
+ <!-- YTXT: subtitle for legal information page, open contact form -->
+ <string name="information_legal_subtitle_contact_form"><a href="https://www.rki.de/SharedDocs/Kontaktformulare/en/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">Contact Form</a></string>
+ <!-- NOTR: subtitle for legal information page, open contact form for languages other than English and German -->
+ <string name="information_legal_subtitle_contact_form_non_en_de">Contact Form in <a href="https://www.rki.de/SharedDocs/Kontaktformulare/en/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">English</a> or <a href="https://www.rki.de/SharedDocs/Kontaktformulare/weitere/Corona-Warn-App/Corona-Warn-App_Integrator.html">German</a></string>
<!-- XHED: Headline for legal information page, tax section -->
<string name="information_legal_headline_taxid">"VAT identification number"</string>
<!-- YTXT: subtitle for legal information page, tax section -->