Remove all includes and data binding in layouts (EXPOSUREAPP-12794, 12795)

Corona-Warn-App/build.gradle

@@ -165,7 +165,6 @@ android {
     }
 
     buildFeatures {
-        dataBinding true
         viewBinding true
     }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/dccticketing/ui/consent/one/DccTicketingConsentOneFragmentTest.kt

@@ -84,7 +84,7 @@ class DccTicketingConsentOneFragmentTest : BaseUITest() {
         takeScreenshot<DccTicketingConsentOneFragment>("1")
 
         // Take legal part screenshot
-        onView(ViewMatchers.withId(R.id.legal_second_bulletpoint_text)).perform(betterScrollTo())
+        onView(ViewMatchers.withId(R.id.legal_second_bulletpoint_one)).perform(betterScrollTo())
         takeScreenshot<DccTicketingConsentOneFragment>("2")
 
         // Take description bullet point screenshot

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/dccticketing/ui/consent/two/DccTicketingConsentTwoFragmentTest.kt

@@ -95,7 +95,7 @@ class DccTicketingConsentTwoFragmentTest : BaseUITest() {
         takeScreenshot<DccTicketingConsentTwoFragment>()
 
         // Take legal part screenshot
-        onView(withId(R.id.legal_second_bulletpoint_text)).perform(scrollTo())
+        onView(withId(R.id.legal_second_bulletpoint_two)).perform(scrollTo())
         takeScreenshot<DccTicketingConsentTwoFragment>("2")
 
         // Take description bullet point screenshot

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragmentTest.kt

@@ -77,10 +77,10 @@ class SrsSubmissionConsentFragmentTest : BaseUITest() {
         )
         takeScreenshot<SrsSubmissionConsentFragment>("1")
 
-        onView(withId(R.id.first_bulletpoint)).perform(scrollTo())
+        onView(withId(R.id.first_bulletpoint_text)).perform(scrollTo())
         takeScreenshot<SrsSubmissionConsentFragment>("2")
 
-        onView(withId(R.id.third_bulletpoint)).perform(scrollTo())
+        onView(withId(R.id.third_bulletpoint_text)).perform(scrollTo())
         takeScreenshot<SrsSubmissionConsentFragment>("3")
 
         onView(withId(R.id.srs_submission_consent_more_info)).perform(scrollTo())

Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml

@@ -46,9 +46,8 @@
         app:srcCompat="@drawable/ic_nav_qrcode"
         app:tint="@android:color/white" />
 
-    <include
+    <de.rki.coronawarnapp.ui.view.FabTooltipView
         android:id="@+id/fake_fab_tooltip"
-        layout="@layout/fab_tooltip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/CrashReportAdapter.kt

@@ -37,9 +37,9 @@ class CrashReportAdapter(private val itemClickListener: (bugEvent: BugEvent) ->
     class CrashHolder(private val binding: ViewCrashreportListItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(bugEvent: BugEvent, pos: Int) {
-            binding.crashReportTitle = "#${pos + 1} ${bugEvent.exceptionClass}"
-            binding.message = bugEvent.info ?: bugEvent.exceptionMessage
-            binding.crashReportDateFormatted =
+            binding.textViewCrashReportTitle.text = "#${pos + 1} ${bugEvent.exceptionClass}"
+            binding.textViewCrashReportShortMessage.text = bugEvent.info ?: bugEvent.exceptionMessage
+            binding.textViewCrashReportDate.text =
                 bugEvent.createdAt.toLocalDateTimeUserTz().toString()
                     .replace("T", "  ")
         }

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt

@@ -31,7 +31,7 @@ class SettingsCrashReportDetailsFragment :
         }
 
         vm.selectedCrashReportFormattedText.observe2(this) {
-            fragmentSettingsCrashReportDetailsBinding.selectedCrashReportFormattedText = it
+            fragmentSettingsCrashReportDetailsBinding.textViewCrashReportDetails.text = it
         }
     }
 

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt

@@ -14,6 +14,7 @@ import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.lists.decorations.TopBottomPaddingDecorator
 import de.rki.coronawarnapp.util.lists.diffutil.update
 import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.setCWAContentDescription
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
@@ -30,6 +31,7 @@ class HomeTestCardsFragment : Fragment(R.layout.fragment_test_home_test_cards_la
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.mainHeaderLogo.setCWAContentDescription(getString(R.string.accessibility_logo))
 
         binding.recyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyFileDownloadAdapter.kt

@@ -2,14 +2,14 @@ package de.rki.coronawarnapp.test.keydownload.ui
 
 import android.text.format.Formatter
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestKeydownloadAdapterLineBinding
 import de.rki.coronawarnapp.diagnosiskeys.storage.CachedKeyInfo
 import de.rki.coronawarnapp.ui.lists.BaseAdapter
 import de.rki.coronawarnapp.util.lists.BindableVH
 import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
 import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
-import de.rki.coronawarnapp.util.ui.setGone
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
@@ -63,9 +63,9 @@ class KeyFileDownloadAdapter(
                 CachedKeyInfo.Type.LOCATION_HOUR -> "${item.info.day} ${item.info.hour!!.hour}:00"
             }
             creationData.text = item.info.createdAt.atZone(ZoneOffset.UTC).format(DOWNLOAD_TIME_FORMATTER)
-            creationLabel.setGone(!item.info.isDownloadComplete)
-            creationData.setGone(!item.info.isDownloadComplete)
-            progressIndicator.setGone(item.info.isDownloadComplete)
+            creationLabel.isGone = !item.info.isDownloadComplete
+            creationData.isGone = !item.info.isDownloadComplete
+            progressIndicator.isGone = item.info.isDownloadComplete
         }
     }
 

Corona-Warn-App/src/deviceForTesters/res/layout/fragment_settings_crash_report_details.xml

@@ -1,49 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".test.crash.ui.SettingsCrashReportDetailsFragment">
 
-    <data>
-        <variable
-            name="selectedCrashReportFormattedText"
-            type="String" />
-    </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".test.crash.ui.SettingsCrashReportDetailsFragment">
-
-
-        <ScrollView
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/margin_6"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toTopOf="@id/buttonCrashReportShare"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/textViewCrashReportDetails"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_margin="@dimen/margin_6"
-            android:scrollbars="vertical"
-            app:layout_constraintBottom_toTopOf="@id/buttonCrashReportShare"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/textViewCrashReportDetails"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{selectedCrashReportFormattedText}" />
+            android:layout_height="wrap_content" />
 
-        </ScrollView>
+    </ScrollView>
 
-        <Button
-            android:id="@+id/buttonCrashReportShare"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_10"
-            android:text="Share"
-            android:background="@color/colorCrashReporter"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+    <Button
+        android:id="@+id/buttonCrashReportShare"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_10"
+        android:background="@color/colorCrashReporter"
+        android:text="Share"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>