Remove FromatterAccessibilityHelper.kt and replace with BindingAdapters to...

Remove FromatterAccessibilityHelper.kt and replace with BindingAdapters to remove static app context access. (#1349)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FromatterAccessibilityHelper.kt

-@file:JvmName("FormatterAccessibilityHelper")
-
-package de.rki.coronawarnapp.util.formatter
-
-import de.rki.coronawarnapp.CoronaWarnApplication
-import de.rki.coronawarnapp.R
-
-fun formatSuffix(string: String?, suffix: Int): String {
-    val appContext = CoronaWarnApplication.getAppContext()
-    return if (string != null) {
-        "$string ${appContext.getString(suffix)}"
-    } else ""
-}
-
-fun formatButton(string: String?): String = formatSuffix(string, R.string.suffix_button)
-
-fun formatImage(string: String?): String = formatSuffix(string, R.string.suffix_image)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/bindingadapters/AccessibilityBindingAdapters.kt

+package de.rki.coronawarnapp.util.ui.bindingadapters
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import androidx.annotation.StringRes
+import androidx.databinding.BindingAdapter
+import de.rki.coronawarnapp.R
+
+private fun formatSuffix(context: Context, prefix: String, @StringRes suffix: Int): String {
+    return "$prefix ${context.getString(suffix)}"
+}
+
+@BindingAdapter("cwaContentDescription")
+fun ImageView.setCWAContentDescription(description: String) {
+    contentDescription = formatSuffix(context, description, R.string.suffix_image)
+}
+
+@BindingAdapter("cwaContentDescription")
+fun View.setCWAContentDescription(description: String) {
+    contentDescription = formatSuffix(context, description, R.string.suffix_button)
+}

Corona-Warn-App/src/main/res/layout/fragment_home.xml

 <?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"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -9,8 +10,6 @@
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterSubmissionHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="submissionViewModel"
             type="de.rki.coronawarnapp.ui.viewmodel.SubmissionViewModel" />
@@ -50,14 +49,15 @@
                     android:id="@+id/main_header_logo"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/accessibility_logo)}"
+                    bind:cwaContentDescription="@{@string/accessibility_logo}"
                     android:scaleType="fitStart"
                     android:src="@drawable/ic_main_header"
                     android:focusable="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/main_header_share"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="ContentDescription" />
 
                 <include
                     android:id="@+id/main_header_share"

Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml

 <?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"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -9,8 +10,6 @@
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterRiskHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <import type="android.view.View" />
 
         <variable
@@ -51,12 +50,13 @@
                     style="@style/icon"
                     android:layout_width="@dimen/icon_size_button"
                     android:layout_height="@dimen/icon_size_button"
-                    android:contentDescription="@{FormatterAccessibilityHelper.formatButton(@string/accessibility_back)}"
+                    bind:cwaContentDescription="@{@string/accessibility_back}"
                     android:src="@{@drawable/ic_close}"
                     android:tint="@{FormatterRiskHelper.formatStableTextColor(tracingViewModel.riskLevel)}"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="ContentDescription" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml

 <?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.FormatterAccessibilityHelper" />
-
-    </data>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/submission_qr_code_scan_container"
@@ -74,12 +70,13 @@
                 style="@style/iconStable"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/accessibility_close)"
+                bind:cwaContentDescription="@{@string/accessibility_close}"
                 android:src="@drawable/ic_close"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="ContentDescription" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

Corona-Warn-App/src/main/res/layout/include_button_icon.xml

 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="icon"
             type="android.graphics.drawable.Drawable" />
@@ -21,7 +20,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/button_icon"
         style="@style/buttonIcon"
-        android:contentDescription="@{FormatterAccessibilityHelper.formatButton(iconDescription)}"
+        bind:cwaContentDescription="@{iconDescription}"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"

Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml

 <?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"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="headline"
             type="String" />
@@ -66,7 +65,7 @@
             android:layout_marginEnd="@dimen/spacing_small"
             android:layout_marginBottom="@dimen/spacing_normal"
             android:text="@{body}"
-            android:contentDescription="@{FormatterAccessibilityHelper.formatButton(body)}"
+            bind:cwaContentDescription="@{body}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_illustration"
             app:layout_constraintStart_toStartOf="parent"

Corona-Warn-App/src/main/res/layout/include_information_details.xml

 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -7,8 +8,6 @@
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="illustration"
             type="android.graphics.drawable.Drawable" />
@@ -34,13 +33,14 @@
             android:id="@+id/information_details_header_illustration"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:contentDescription="@{FormatterAccessibilityHelper.formatImage(illustrationDescription)}"
+            bind:cwaContentDescription="@{illustrationDescription}"
             android:focusable="true"
             android:src="@{illustration}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_illustration_tracing_on" />
+            tools:src="@drawable/ic_illustration_tracing_on"
+            tools:ignore="ContentDescription" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"

Corona-Warn-App/src/main/res/layout/include_onboarding.xml

 <?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"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="illustration"
             type="android.graphics.drawable.Drawable" />
@@ -79,13 +78,14 @@
                 android:id="@+id/onboarding_illustration"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatImage(illustrationDescription)}"
+                bind:cwaContentDescription="@{illustrationDescription}"
                 android:focusable="true"
                 android:src="@{illustration}"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_illustration_together" />
+                tools:src="@drawable/ic_illustration_together"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/onboarding_headline"

Corona-Warn-App/src/main/res/layout/include_submission_contact.xml

 <?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.FormatterAccessibilityHelper" />
-
-    </data>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -21,11 +17,12 @@
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_submission_illustration_hotline"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/information_contact_illustration_description)}"
                 android:focusable="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                bind:cwaContentDescription="@{@string/information_contact_illustration_description}"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/submission_contact_body"

Corona-Warn-App/src/main/res/layout/include_submission_done.xml

 <?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.FormatterAccessibilityHelper" />
-
-    </data>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -21,12 +17,13 @@
                 android:id="@+id/submission_done_hero_illustration"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/submission_done_illustration_description)}"
                 android:focusable="true"
                 android:src="@drawable/ic_submission_illustration_thanks"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                bind:cwaContentDescription="@{@string/submission_done_illustration_description}"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/submission_done_headline"

Corona-Warn-App/src/main/res/layout/include_submission_intro.xml

 <?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.FormatterAccessibilityHelper" />
-
-    </data>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -18,14 +14,15 @@
 
             <ImageView
                 android:id="@+id/submission_intro_hero_illustration"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/submission_intro_illustration_description)}"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_illustration_test"
                 android:focusable="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                bind:cwaContentDescription="@{@string/submission_intro_illustration_description}"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/submission_intro_headline"

Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml

 <?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">
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <variable
             name="countryData"
             type="java.util.List&lt;de.rki.coronawarnapp.ui.Country&gt;" />
@@ -24,11 +24,12 @@
                 android:id="@+id/submission_positive_other_warning_hero_illustration"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
-                android:contentDescription="@{FormatterAccessibilityHelper.formatButton(@string/submission_positive_other_illustration_description)}"
+                bind:cwaContentDescription="@{@string/submission_positive_other_illustration_description}"
                 android:src="@drawable/ic_submission_illustration_other_warning"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="ContentDescription" />
 
             <TextView
                 android:id="@+id/submission_positive_other_warning_headline"

Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml

@@ -6,8 +6,6 @@
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <import type="android.view.View" />
 
         <variable

Corona-Warn-App/src/main/res/layout/include_tracing_status_card_location.xml

@@ -6,8 +6,6 @@
 
         <import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
 
-        <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
-
         <import type="android.view.View" />
 
         <variable