From cda2885fbb3d87ec86b92175cc652385057a647d Mon Sep 17 00:00:00 2001 From: Nikolaus Schauersberger Date: Wed, 11 Jan 2023 18:23:18 +0100 Subject: [PATCH] add ids --- .../profile/ui/create/ProfileCreateFragment.kt | 8 ++++++-- .../profile/ui/list/ProfileListFragment.kt | 18 +++++++++++------- .../ui/onboarding/ProfileOnboardingFragment.kt | 6 +++++- .../profile/ui/qrcode/ProfileQrCodeFragment.kt | 6 +++--- .../fragment/SubmissionDispatcherFragment.kt | 6 +++++- .../res/layout/profile_qr_code_fragment.xml | 3 ++- Corona-Warn-App/src/main/res/values/attrs.xml | 4 ++++ 7 files changed, 36 insertions(+), 15 deletions(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/create/ProfileCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/create/ProfileCreateFragment.kt index 9cbf0cfd1e9..6934281093b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/create/ProfileCreateFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/create/ProfileCreateFragment.kt @@ -20,6 +20,7 @@ import de.rki.coronawarnapp.profile.model.Profile import de.rki.coronawarnapp.ui.view.addEmojiFilter import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.toLocalDateUserTz +import de.rki.coronawarnapp.util.ui.addTitleId import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider @@ -56,8 +57,11 @@ class ProfileCreateFragment : Fragment(R.layout.profile_create_fragment), AutoIn override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { - toolbar.setNavigationOnClickListener { - viewModel.navigateBack() + toolbar.apply { + addTitleId(R.id.profile_create_fragment_title) + setNavigationOnClickListener { + viewModel.navigateBack() + } } profileSaveButton.setOnClickListener { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/list/ProfileListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/list/ProfileListFragment.kt index a5b4683f677..4379c7535f7 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/list/ProfileListFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/list/ProfileListFragment.kt @@ -13,6 +13,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.onScroll +import de.rki.coronawarnapp.util.ui.addTitleId import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.viewBinding @@ -37,14 +38,17 @@ class ProfileListFragment : Fragment(R.layout.profile_list_fragment), AutoInject onScrollChange(it) } } - binding.toolbar.setNavigationOnClickListener { popBackStack() } - binding.toolbar.setOnMenuItemClickListener { - findNavController().navigate( - ProfileListFragmentDirections.actionProfileListFragmentToProfileOnboardingFragment( - showButton = false + binding.toolbar.apply { + addTitleId(R.id.profile_list_fragment_title) + setNavigationOnClickListener { popBackStack() } + setOnMenuItemClickListener { + findNavController().navigate( + ProfileListFragmentDirections.actionProfileListFragmentToProfileOnboardingFragment( + showButton = false + ) ) - ) - true + true + } } binding.profileFab.setOnClickListener { viewModel.onCreateProfileClicked() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/onboarding/ProfileOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/onboarding/ProfileOnboardingFragment.kt index f79cdaab510..28990cf5082 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/onboarding/ProfileOnboardingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/onboarding/ProfileOnboardingFragment.kt @@ -9,6 +9,7 @@ import androidx.navigation.fragment.navArgs import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.ProfileOnboardingFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject +import de.rki.coronawarnapp.util.ui.addTitleId import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider @@ -26,7 +27,10 @@ class ProfileOnboardingFragment : Fragment(R.layout.profile_onboarding_fragment) override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) { - toolbar.setNavigationOnClickListener { popBackStack() } + toolbar.apply { + setNavigationOnClickListener { popBackStack() } + addTitleId(R.id.profile_onboarding_fragment_title) + } nextButton.apply { setOnClickListener { viewModel.onNext() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/qrcode/ProfileQrCodeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/qrcode/ProfileQrCodeFragment.kt index d37c79d9009..79883c8badc 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/qrcode/ProfileQrCodeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/qrcode/ProfileQrCodeFragment.kt @@ -50,7 +50,7 @@ class ProfileQrCodeFragment : Fragment(R.layout.profile_qr_code_fragment), AutoI binding.apply { appBarLayout.addOnOffsetChangedListener { appBarLayout, verticalOffset -> val alpha = 1.0f - abs(verticalOffset / (appBarLayout.totalScrollRange.toFloat() * 0.5f)) - title.alpha = alpha + profileQrCodeFragmentTitle.alpha = alpha } nextButton.setOnClickListener { viewModel.onNext() } @@ -137,9 +137,9 @@ class ProfileQrCodeFragment : Fragment(R.layout.profile_qr_code_fragment), AutoI val params: CoordinatorLayout.LayoutParams = binding.nestedScrollView.layoutParams as (CoordinatorLayout.LayoutParams) - val textParams = binding.title.layoutParams as (LinearLayout.LayoutParams) + val textParams = binding.profileQrCodeFragmentTitle.layoutParams as (LinearLayout.LayoutParams) textParams.bottomMargin = (width / 2) - 24 /* 24 is space between screen border and QrCode */ - binding.title.requestLayout() /* 24 is space between screen border and QrCode */ + binding.profileQrCodeFragmentTitle.requestLayout() /* 24 is space between screen border and QrCode */ val behavior: AppBarLayout.ScrollingViewBehavior = params.behavior as (AppBarLayout.ScrollingViewBehavior) behavior.overlayTop = (width / 2) - 24 diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt index 6166e7e5253..dfab2509eab 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt @@ -16,6 +16,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionDispatcherViewMode import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents import de.rki.coronawarnapp.util.ExternalActionHelper.openUrl import de.rki.coronawarnapp.util.di.AutoInject +import de.rki.coronawarnapp.util.ui.addTitleId import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider @@ -108,7 +109,10 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa private fun setButtonOnClickListener() { binding.apply { - toolbar.setNavigationOnClickListener { viewModel.onBackPressed() } + toolbar.apply { + setNavigationOnClickListener { viewModel.onBackPressed() } + addTitleId(R.id.submission_dispatcher_fragment_title) + } srsSelfTest.setOnClickListener { viewModel.onSrsTileClicked() } positiveSelfTest.setOnClickListener { viewModel.onSrsTileClicked(positiveNoAnswer = true) } submissionDispatcherQr.setOnClickListener { viewModel.onQRCodePressed() } diff --git a/Corona-Warn-App/src/main/res/layout/profile_qr_code_fragment.xml b/Corona-Warn-App/src/main/res/layout/profile_qr_code_fragment.xml index 3a0fd2ac643..44728f45094 100644 --- a/Corona-Warn-App/src/main/res/layout/profile_qr_code_fragment.xml +++ b/Corona-Warn-App/src/main/res/layout/profile_qr_code_fragment.xml @@ -48,7 +48,7 @@ app:layout_collapseMode="parallax"> + + + +