diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragment.kt index 7732c39381124be8d7f5fa910e53c814247d6d56..283bcea25957d8972633835d4f8225bcbf45c2dc 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragment.kt @@ -3,6 +3,7 @@ package de.rki.coronawarnapp.tracing.ui.details import android.os.Bundle import android.view.View import android.view.accessibility.AccessibilityEvent +import androidx.core.graphics.drawable.DrawableCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager @@ -10,6 +11,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.TracingDetailsFragmentLayoutBinding import de.rki.coronawarnapp.util.ExternalActionHelper import de.rki.coronawarnapp.util.di.AutoInject +import de.rki.coronawarnapp.util.getDrawableCompat import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 @@ -48,7 +50,7 @@ class TracingDetailsFragment : Fragment(R.layout.tracing_details_fragment_layout vm.buttonStates.observe2(this) { binding.tracingDetailsState = it - binding.toolbar.navigationIcon?.setTint(it.getStableTextColor(requireContext())) + binding.toolbar.navigationIcon = closeIcon(it) } vm.routeToScreen.observe2(this) { @@ -76,6 +78,18 @@ class TracingDetailsFragment : Fragment(R.layout.tracing_details_fragment_layout } } + private fun closeIcon(it: TracingDetailsState) = + resources.getDrawableCompat(R.drawable.ic_close)?.let { drawable -> + DrawableCompat + .wrap(drawable) + .mutate() + .apply { + setTint( + it.getStableTextColor(requireContext()) + ) + } + } + override fun onResume() { super.onResume() vm.refreshData()