diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt index 0f9f90ed9879a3fd04452c987e85dd5e13f905ed..303701ed54ef232c2d6596f7fa7df1f6efea48d1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt @@ -112,7 +112,7 @@ class InformationFragment : Fragment(R.layout.fragment_information), AutoInject InformationFragmentDirections.actionInformationFragmentToDebuglogFragment() ) } - binding.informationHeader.headerButtonBack.buttonIcon.setOnClickListener { + binding.informationHeader.setNavigationOnClickListener { popBackStack() } binding.informationRelease.mainRow.setOnClickListener { diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml index 1fd3284d9b98cf9861372a0ffa1b6aecc9e50e96..bc53ba5441279ce8870bad5d40ae449452bf192e 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml @@ -9,26 +9,22 @@ android:layout_height="match_parent" android:contentDescription="@string/information_title"> - <include + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/information_header" - layout="@layout/include_header" - android:layout_width="match_parent" + style="@style/CWAToolbar.Close" + android:layout_width="0dp" android:layout_height="wrap_content" - app:icon="@{@drawable/ic_close}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/scrollview" - app:title="@{@string/information_title}" /> + app:title="@string/information_title" /> <ScrollView android:id="@+id/scrollview" android:layout_width="match_parent" android:layout_height="0dp" - android:fillViewport="true" android:paddingTop="@dimen/spacing_normal" android:paddingBottom="@dimen/spacing_normal" - android:clipToPadding="false" android:scrollbarStyle="outsideOverlay" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -124,14 +120,9 @@ android:focusable="true" android:paddingTop="@dimen/spacing_tiny" android:paddingBottom="@dimen/spacing_tiny" - android:visibility="gone" tools:text="16000000" tools:visibility="visible" /> - </LinearLayout> - </ScrollView> - </androidx.constraintlayout.widget.ConstraintLayout> - </layout>