From a42ba1298bbbb85371fa3b62a59afc7c202e7b6c Mon Sep 17 00:00:00 2001 From: Alex Paulescu <alex.paulescu@gmail.com> Date: Tue, 15 Dec 2020 17:02:31 +0200 Subject: [PATCH] Made the whole diary card clickable (EXPOSUREAPP-4152) (#1902) * Made the whole diary card clickable, not just the button. * Moved diary card setup to separate function to eliminate detekt issues. --- .../coronawarnapp/ui/main/home/HomeFragment.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt index cdf2281b9..952f98013 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt @@ -56,13 +56,13 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject { } setupToolbar() + setupRiskCard() + setupDiaryCard() binding.mainTracing.setOnClickListener { doNavigate(HomeFragmentDirections.actionMainFragmentToSettingsTracingFragment()) } - setupRiskCard() - binding.mainAbout.mainCard.apply { setOnClickListener { ExternalActionHelper.openUrl(this@HomeFragment, getString(R.string.main_about_link)) @@ -104,10 +104,6 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject { } vm.observeTestResultToSchedulePositiveTestResultReminder() - - binding.contactDiaryCard.contactDiaryCardHomescreenButton.setOnClickListener { - vm.moveToContactDiary() - } } override fun onResume() { @@ -211,6 +207,13 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject { } } + private fun setupDiaryCard() { + binding.contactDiaryCard.apply { + contactDiaryCardHomescreenButton.setOnClickListener { vm.moveToContactDiary() } + contactDiaryHomescreenCard.setOnClickListener { vm.moveToContactDiary() } + } + } + private fun showRiskLevelLoweredDialog() { val riskLevelLoweredDialog = DialogHelper.DialogInstance( context = requireActivity(), -- GitLab