From e0e0018a2f16638b63d3733f97617ecc8b906d78 Mon Sep 17 00:00:00 2001 From: Mohamed Metwalli <mohamed.metwalli@sap.com> Date: Thu, 20 May 2021 14:55:37 +0200 Subject: [PATCH] View binding polishing (DEV) (#3234) * Tweak view binding lazy * Update VaccinationListFragment.kt Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> --- .../de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt | 4 ++-- .../test/appconfig/ui/AppConfigTestFragment.kt | 4 ++-- .../test/contactdiary/ui/ContactDiaryTestFragment.kt | 4 ++-- .../test/coronatest/ui/CoronaTestTestFragment.kt | 4 ++-- .../crash.ui/SettingsCrashReportDetailsFragment.kt | 4 ++-- .../test/crash.ui/SettingsCrashReportFragment.kt | 4 ++-- .../test/datadonation/ui/DataDonationTestFragment.kt | 4 ++-- .../test/debugoptions/ui/DebugOptionsFragment.kt | 4 ++-- .../test/deltaonboarding/ui/DeltaonboardingFragment.kt | 4 ++-- .../test/hometestcards/ui/HomeTestCardsFragment.kt | 4 ++-- .../test/keydownload/ui/KeyDownloadTestFragment.kt | 4 ++-- .../rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt | 4 ++-- .../test/playground/ui/PlaygroundFragment.kt | 4 ++-- .../presencetracing/ui/PresenceTracingTestFragment.kt | 4 ++-- .../ui/poster/QrCodePosterTestFragment.kt | 4 ++-- .../risklevel/ui/TestRiskLevelCalculationFragment.kt | 4 ++-- .../test/submission/ui/SubmissionTestFragment.kt | 4 ++-- .../test/tasks/ui/TestTaskControllerFragment.kt | 4 ++-- .../vaccination/ui/VaccinationTestFragment.kt | 4 ++-- .../bugreporting/debuglog/ui/DebugLogFragment.kt | 4 ++-- .../debuglog/ui/legal/DebugLogLegalFragment.kt | 4 ++-- .../debuglog/ui/upload/DebugLogUploadFragment.kt | 4 ++-- .../ui/upload/history/LogUploadHistoryFragment.kt | 4 ++-- .../contactdiary/ui/day/ContactDiaryDayFragment.kt | 4 ++-- .../ui/day/tabs/ContactDiaryCommentInfoFragment.kt | 4 ++-- .../tabs/location/ContactDiaryLocationListFragment.kt | 4 ++-- .../day/tabs/person/ContactDiaryPersonListFragment.kt | 4 ++-- .../ui/edit/ContactDiaryEditLocationsFragment.kt | 4 ++-- .../ui/edit/ContactDiaryEditPersonsFragment.kt | 4 ++-- .../ui/location/ContactDiaryAddLocationFragment.kt | 4 ++-- .../ui/onboarding/ContactDiaryOnboardingFragment.kt | 4 ++-- .../ui/overview/ContactDiaryOverviewFragment.kt | 4 ++-- .../ui/person/ContactDiaryAddPersonFragment.kt | 4 ++-- .../datadonation/analytics/ui/PpaMoreInfoFragment.kt | 4 ++-- .../analytics/ui/input/AnalyticsUserInputFragment.kt | 4 ++-- .../survey/consent/SurveyConsentDetailFragment.kt | 4 ++-- .../survey/consent/SurveyConsentFragment.kt | 4 ++-- .../coronawarnapp/release/NewReleaseInfoFragment.kt | 4 ++-- .../statistics/ui/StatisticsExplanationFragment.kt | 4 ++-- .../testresults/negative/RATResultNegativeFragment.kt | 4 ++-- .../tracing/ui/details/TracingDetailsFragment.kt | 4 ++-- .../tracing/ui/settings/SettingsTracingFragment.kt | 4 ++-- .../rat/profile/create/RATProfileCreateFragment.kt | 4 ++-- .../profile/onboarding/RATProfileOnboardingFragment.kt | 4 ++-- .../rat/profile/qrcode/RATProfileQrCodeFragment.kt | 4 ++-- .../coronawarnapp/ui/durationpicker/DurationPicker.kt | 4 ++-- .../ui/information/InformationAboutFragment.kt | 4 ++-- .../ui/information/InformationContactFragment.kt | 4 ++-- .../ui/information/InformationFragment.kt | 4 ++-- .../ui/information/InformationLegalFragment.kt | 4 ++-- .../ui/information/InformationPrivacyFragment.kt | 4 ++-- .../ui/information/InformationTechnicalFragment.kt | 4 ++-- .../ui/information/InformationTermsFragment.kt | 4 ++-- .../InteroperabilityConfigurationFragment.kt | 4 ++-- .../de/rki/coronawarnapp/ui/main/home/HomeFragment.kt | 4 ++-- .../ui/main/overview/MainOverviewFragment.kt | 4 ++-- .../coronawarnapp/ui/main/share/MainShareFragment.kt | 4 ++-- .../ui/onboarding/OnboardingAnalyticsFragment.kt | 4 ++-- .../ui/onboarding/OnboardingDeltaAnalyticsFragment.kt | 4 ++-- .../OnboardingDeltaInteroperabilityFragment.kt | 4 ++-- .../coronawarnapp/ui/onboarding/OnboardingFragment.kt | 4 ++-- .../ui/onboarding/OnboardingNotificationsFragment.kt | 4 ++-- .../ui/onboarding/OnboardingPrivacyFragment.kt | 4 ++-- .../ui/onboarding/OnboardingTestFragment.kt | 4 ++-- .../ui/onboarding/OnboardingTracingFragment.kt | 4 ++-- .../attendee/checkins/CheckInsFragment.kt | 4 ++-- .../checkins/consent/CheckInsConsentFragment.kt | 4 ++-- .../attendee/confirm/ConfirmCheckInFragment.kt | 4 ++-- .../attendee/edit/EditCheckInFragment.kt | 4 ++-- .../attendee/onboarding/CheckInOnboardingFragment.kt | 4 ++-- .../attendee/scan/ScanCheckInQrCodeFragment.kt | 4 ++-- .../category/TraceLocationCategoryFragment.kt | 4 ++-- .../organizer/create/TraceLocationCreateFragment.kt | 4 ++-- .../organizer/details/QrCodeDetailFragment.kt | 4 ++-- .../organizer/list/TraceLocationsFragment.kt | 4 ++-- .../organizer/poster/QrCodePosterFragment.kt | 4 ++-- .../organizer/qrinfo/TraceLocationQRInfoFragment.kt | 4 ++-- .../ui/qrcode/fullscreen/QrCodeFullScreenFragment.kt | 4 ++-- .../coronawarnapp/ui/settings/SettingsResetFragment.kt | 4 ++-- .../SettingsPrivacyPreservingAnalyticsFragment.kt | 4 ++-- .../SettingsBackgroundPriorityFragment.kt | 4 ++-- .../notifications/NotificationSettingsFragment.kt | 4 ++-- .../ui/settings/start/SettingsFragment.kt | 4 ++-- .../SubmissionDeletionWarningFragment.kt | 4 ++-- .../submission/fragment/SubmissionContactFragment.kt | 4 ++-- .../fragment/SubmissionDispatcherFragment.kt | 4 ++-- .../qrcode/consent/SubmissionConsentFragment.kt | 4 ++-- .../qrcode/scan/SubmissionQRCodeScanFragment.kt | 4 ++-- .../SubmissionTestResultAvailableFragment.kt | 4 ++-- .../resultready/SubmissionResultReadyFragment.kt | 4 ++-- .../submissiondone/SubmissionDoneFragment.kt | 4 ++-- .../calendar/SubmissionSymptomCalendarFragment.kt | 4 ++-- .../SubmissionSymptomIntroductionFragment.kt | 4 ++-- .../ui/submission/tan/SubmissionTanFragment.kt | 4 ++-- .../invalid/SubmissionTestResultInvalidFragment.kt | 4 ++-- .../negative/SubmissionTestResultNegativeFragment.kt | 4 ++-- .../pending/SubmissionTestResultPendingFragment.kt | 4 ++-- .../SubmissionTestResultConsentGivenFragment.kt | 4 ++-- .../positive/SubmissionTestResultKeysSharedFragment.kt | 4 ++-- .../positive/SubmissionTestResultNoConsentFragment.kt | 4 ++-- ...ssionResultPositiveOtherWarningNoConsentFragment.kt | 4 ++-- .../yourconsent/SubmissionYourConsentFragment.kt | 4 ++-- .../rki/coronawarnapp/util/ui/ViewBindingExtensions.kt | 10 +++++----- .../ui/consent/VaccinationConsentFragment.kt | 4 ++-- .../ui/details/VaccinationDetailsFragment.kt | 4 ++-- .../vaccination/ui/list/VaccinationListFragment.kt | 4 ++-- .../ui/scan/VaccinationQrCodeScanFragment.kt | 4 ++-- 107 files changed, 217 insertions(+), 217 deletions(-) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt index 67b2d7be1..eea90254e 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.FragmentTestDeviceinfoBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class MiscInfoFragment : Fragment(R.layout.fragment_test_deviceinfo), AutoInject @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: MiscInfoFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestDeviceinfoBinding by viewBindingLazy() + private val binding: FragmentTestDeviceinfoBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt index c151d90a7..b6bcb6f1f 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.FragmentTestAppconfigBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.DateTimeZone @@ -23,7 +23,7 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: AppConfigTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestAppconfigBinding by viewBindingLazy() + private val binding: FragmentTestAppconfigBinding by viewBinding() private val timeFormatter = ISODateTimeFormat.dateTime() .withZone(DateTimeZone.forID("Europe/Berlin")) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt index 3cf44a65b..471438763 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.ui.durationpicker.DurationPicker import de.rki.coronawarnapp.ui.durationpicker.toContactDiaryFormat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.Duration @@ -27,7 +27,7 @@ class ContactDiaryTestFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: ContactDiaryTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestContactDiaryBinding by viewBindingLazy() + private val binding: FragmentTestContactDiaryBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt index db311e72a..16d5cdc45 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt @@ -17,7 +17,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.permission.CameraPermissionHelper import de.rki.coronawarnapp.util.tryHumanReadableError import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -28,7 +28,7 @@ class CoronaTestTestFragment : Fragment(R.layout.fragment_test_coronatest), Auto @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: CoronaTestTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestCoronatestBinding by viewBindingLazy() + private val binding: FragmentTestCoronatestBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt index f7b9ce4db..4c7eb4270 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt @@ -8,7 +8,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentSettingsCrashReportDetailsBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class SettingsCrashReportDetailsFragment : ownerProducer = { requireActivity().viewModelStore }, factoryProducer = { viewModelFactory } ) - private val fragmentSettingsCrashReportDetailsBinding: FragmentSettingsCrashReportDetailsBinding by viewBindingLazy() + private val fragmentSettingsCrashReportDetailsBinding: FragmentSettingsCrashReportDetailsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt index 9268d0cde..e4b5894a4 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -24,7 +24,7 @@ class SettingsCrashReportFragment : Fragment(R.layout.fragment_crashreporter_ove factoryProducer = { viewModelFactory } ) - private val fragmentCrashreporterOverviewBinding: FragmentCrashreporterOverviewBinding by viewBindingLazy() + private val fragmentCrashreporterOverviewBinding: FragmentCrashreporterOverviewBinding by viewBinding() private lateinit var adapter: CrashReportAdapter override fun onCreate(savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt index 26659a702..ee563f419 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt @@ -19,7 +19,7 @@ import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.tryHumanReadableError import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.json.JSONObject @@ -31,7 +31,7 @@ class DataDonationTestFragment : Fragment(R.layout.fragment_test_datadonation), @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: DataDonationTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestDatadonationBinding by viewBindingLazy() + private val binding: FragmentTestDatadonationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt index b0e02bfce..7c18b62ce 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.databinding.FragmentTestDebugoptionsBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -26,7 +26,7 @@ class DebugOptionsFragment : Fragment(R.layout.fragment_test_debugoptions), Auto @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: DebugOptionsFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestDebugoptionsBinding by viewBindingLazy() + private val binding: FragmentTestDebugoptionsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt index a11cf74e0..17a54fe5b 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt @@ -8,7 +8,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentTestDeltaonboardingBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -19,7 +19,7 @@ class DeltaonboardingFragment : Fragment(R.layout.fragment_test_deltaonboarding) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: DeltaOnboardingFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestDeltaonboardingBinding by viewBindingLazy() + private val binding: FragmentTestDeltaonboardingBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt index 7983ba7de..841e52ebb 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/hometestcards/ui/HomeTestCardsFragment.kt @@ -14,7 +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.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -24,7 +24,7 @@ class HomeTestCardsFragment : Fragment(R.layout.fragment_test_home_test_cards_la @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: HomeTestCardsFragmentViewModel by cwaViewModels { viewModelFactory } - val binding: FragmentTestHomeTestCardsLayoutBinding by viewBindingLazy() + val binding: FragmentTestHomeTestCardsLayoutBinding by viewBinding() private val homeAdapter = HomeAdapter() diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt index 4ef7851fb..14dd2b7c3 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -24,7 +24,7 @@ class KeyDownloadTestFragment : Fragment(R.layout.fragment_test_keydownload), Au @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: KeyDownloadTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestKeydownloadBinding by viewBindingLazy() + private val binding: FragmentTestKeydownloadBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt index 8ccbcf5f5..9e859a892 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentTestMenuBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -19,7 +19,7 @@ class TestMenuFragment : Fragment(R.layout.fragment_test_menu), AutoInject { @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: TestMenuFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestMenuBinding by viewBindingLazy() + private val binding: FragmentTestMenuBinding by viewBinding() @Inject lateinit var menuAdapter: TestMenuAdapter diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/playground/ui/PlaygroundFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/playground/ui/PlaygroundFragment.kt index 82abd140c..e2a173fe2 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/playground/ui/PlaygroundFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/playground/ui/PlaygroundFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.datadonation.analytics.ui.input.AnalyticsUserInputFr import de.rki.coronawarnapp.datadonation.analytics.ui.input.AnalyticsUserInputFragmentArgs import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -22,7 +22,7 @@ class PlaygroundFragment : Fragment(R.layout.fragment_test_playground), AutoInje @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: PlaygroundViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestPlaygroundBinding by viewBindingLazy() + private val binding: FragmentTestPlaygroundBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt index df4137e7e..6bb242129 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt @@ -19,7 +19,7 @@ import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -30,7 +30,7 @@ class PresenceTracingTestFragment : Fragment(R.layout.fragment_test_presence_tra @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: PresenceTracingTestViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestPresenceTracingBinding by viewBindingLazy() + private val binding: FragmentTestPresenceTracingBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt index c4aa4a257..62b579655 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt @@ -28,7 +28,7 @@ import de.rki.coronawarnapp.ui.print.PrintingAdapter import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -51,7 +51,7 @@ class QrCodePosterTestFragment : Fragment(R.layout.fragment_test_qr_code_poster) private var itemId = -1 - private val binding: FragmentTestQrCodePosterBinding by viewBindingLazy() + private val binding: FragmentTestQrCodePosterBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt index d4c56ea83..d8e1a5ba4 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt @@ -18,7 +18,7 @@ import de.rki.coronawarnapp.storage.TestSettings import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -39,7 +39,7 @@ class TestRiskLevelCalculationFragment : } ) - private val binding: FragmentTestRiskLevelCalculationBinding by viewBindingLazy() + private val binding: FragmentTestRiskLevelCalculationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragment.kt index 5281b569b..5b08b0ce3 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.tracing.ui.TracingConsentDialog import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -23,7 +23,7 @@ class SubmissionTestFragment : Fragment(R.layout.fragment_test_submission), Auto @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: SubmissionTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestSubmissionBinding by viewBindingLazy() + private val binding: FragmentTestSubmissionBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragment.kt index 13ccbc2e9..07cb7c986 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.FragmentTestTaskControllerBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class TestTaskControllerFragment : Fragment(R.layout.fragment_test_task_controll @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: TestTaskControllerFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestTaskControllerBinding by viewBindingLazy() + private val binding: FragmentTestTaskControllerBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt index 0c8f3dafe..97cc21c5f 100644 --- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt +++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.databinding.FragmentTestVaccinationBinding import de.rki.coronawarnapp.test.menu.ui.TestMenuItem import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -20,7 +20,7 @@ class VaccinationTestFragment : Fragment(R.layout.fragment_test_vaccination), Au @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: VaccinationTestFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTestVaccinationBinding by viewBindingLazy() + private val binding: FragmentTestVaccinationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt index 7c2913791..0f2eb8372 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt @@ -21,7 +21,7 @@ import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.setGone -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.Duration @@ -34,7 +34,7 @@ class DebugLogFragment : Fragment(R.layout.bugreporting_debuglog_fragment), Auto @Inject lateinit var fileSharing: FileSharing private val vm: DebugLogViewModel by cwaViewModels { viewModelFactory } - private val binding: BugreportingDebuglogFragmentBinding by viewBindingLazy() + private val binding: BugreportingDebuglogFragmentBinding by viewBinding() @Suppress("ComplexMethod") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/legal/DebugLogLegalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/legal/DebugLogLegalFragment.kt index a56f0df18..ecbc5f7b1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/legal/DebugLogLegalFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/legal/DebugLogLegalFragment.kt @@ -8,7 +8,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.BugreportingLegalFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -18,7 +18,7 @@ class DebugLogLegalFragment : Fragment(R.layout.bugreporting_legal_fragment), Au @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: DebugLogLegalViewModel by cwaViewModels { viewModelFactory } - private val binding: BugreportingLegalFragmentBinding by viewBindingLazy() + private val binding: BugreportingLegalFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt index 8f4c80f1a..7a3543d9a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/DebugLogUploadFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.util.tryHumanReadableError import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -22,7 +22,7 @@ class DebugLogUploadFragment : Fragment(R.layout.bugreporting_debuglog_upload_fr @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: DebugLogUploadViewModel by cwaViewModels { viewModelFactory } - private val binding: BugreportingDebuglogUploadFragmentBinding by viewBindingLazy() + private val binding: BugreportingDebuglogUploadFragmentBinding by viewBinding() private lateinit var uploadDialog: LogUploadBlockingDialog override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/history/LogUploadHistoryFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/history/LogUploadHistoryFragment.kt index a608c49a4..487d25dd3 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/history/LogUploadHistoryFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/upload/history/LogUploadHistoryFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.BugreportingUploadHistoryFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -19,7 +19,7 @@ class LogUploadHistoryFragment : Fragment(R.layout.bugreporting_upload_history_f @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: LogUploadHistoryViewModel by cwaViewModels { viewModelFactory } - private val binding: BugreportingUploadHistoryFragmentBinding by viewBindingLazy() + private val binding: BugreportingUploadHistoryFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt index 91f74937c..eff34b120 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt @@ -20,13 +20,13 @@ import de.rki.coronawarnapp.databinding.ContactDiaryDayFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject class ContactDiaryDayFragment : Fragment(R.layout.contact_diary_day_fragment), AutoInject { - private val binding: ContactDiaryDayFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryDayFragmentBinding by viewBinding() private val navArgs by navArgs<ContactDiaryDayFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/ContactDiaryCommentInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/ContactDiaryCommentInfoFragment.kt index 06b77c17c..3297d95b0 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/ContactDiaryCommentInfoFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/ContactDiaryCommentInfoFragment.kt @@ -6,11 +6,11 @@ import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.ContactDiaryCommentInfoFragmentBinding import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding class ContactDiaryCommentInfoFragment : Fragment(R.layout.contact_diary_comment_info_fragment) { - private val binding: ContactDiaryCommentInfoFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryCommentInfoFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt index aaac0159e..7ebedf30e 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.onScroll import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -25,7 +25,7 @@ class ContactDiaryLocationListFragment : Fragment(R.layout.contact_diary_location_list_fragment), AutoInject { - private val binding: ContactDiaryLocationListFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryLocationListFragmentBinding by viewBinding() private val navArgs by navArgs<ContactDiaryLocationListFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt index a824b4934..173f72708 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt @@ -15,13 +15,13 @@ import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.onScroll import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject class ContactDiaryPersonListFragment : Fragment(R.layout.contact_diary_person_list_fragment), AutoInject { - private val binding: ContactDiaryPersonListFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryPersonListFragmentBinding by viewBinding() private val navArgs by navArgs<ContactDiaryPersonListFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt index d5a83e00c..8e198500f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -25,7 +25,7 @@ class ContactDiaryEditLocationsFragment : Fragment(R.layout.contact_diary_edit_l @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: ContactDiaryEditLocationsViewModel by cwaViewModels { viewModelFactory } - private val binding: ContactDiaryEditLocationsFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryEditLocationsFragmentBinding by viewBinding() private lateinit var listAdapter: LocationEditAdapter diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt index e3faf7989..232efce0a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -25,7 +25,7 @@ class ContactDiaryEditPersonsFragment : Fragment(R.layout.contact_diary_edit_per @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: ContactDiaryEditPersonsViewModel by cwaViewModels { viewModelFactory } - private val binding: ContactDiaryEditPersonsFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryEditPersonsFragmentBinding by viewBinding() private lateinit var listAdapter: PersonEditAdapter diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt index bc0aa5196..8dac8125c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt @@ -16,14 +16,14 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.setTextOnTextInput import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_location_fragment), AutoInject { - private val binding: ContactDiaryAddLocationFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryAddLocationFragmentBinding by viewBinding() @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: ContactDiaryAddLocationViewModel by cwaViewModelsAssisted( diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt index eabc87c54..306abb316 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.LocalDate @@ -28,7 +28,7 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin @Inject lateinit var settings: ContactDiarySettings private val vm: ContactDiaryOnboardingFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: ContactDiaryOnboardingFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryOnboardingFragmentBinding by viewBinding() private val args by navArgs<ContactDiaryOnboardingFragmentArgs>() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt index d08d046da..5b26115e8 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -25,7 +25,7 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: ContactDiaryOverviewViewModel by cwaViewModels { viewModelFactory } - private val binding: ContactDiaryOverviewFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryOverviewFragmentBinding by viewBinding() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt index 6379a8778..f758771f6 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.setTextOnTextInput import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -25,7 +25,7 @@ class ContactDiaryAddPersonFragment : Fragment(R.layout.contact_diary_add_person_fragment), AutoInject { - private val binding: ContactDiaryAddPersonFragmentBinding by viewBindingLazy() + private val binding: ContactDiaryAddPersonFragmentBinding by viewBinding() @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: ContactDiaryAddPersonViewModel by cwaViewModelsAssisted( diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/PpaMoreInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/PpaMoreInfoFragment.kt index 3f921b2f1..91a5558e2 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/PpaMoreInfoFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/PpaMoreInfoFragment.kt @@ -6,7 +6,7 @@ import android.view.accessibility.AccessibilityEvent import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentPpaMoreInfoBinding -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * The fragment displays static informative content to the user @@ -17,7 +17,7 @@ import de.rki.coronawarnapp.util.ui.viewBindingLazy class PpaMoreInfoFragment : Fragment(R.layout.fragment_ppa_more_info) { - private val binding: FragmentPpaMoreInfoBinding by viewBindingLazy() + private val binding: FragmentPpaMoreInfoBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputFragment.kt index b23dee43a..12addb490 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.AnalyticsPpaUserinfoInputFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -28,7 +28,7 @@ class AnalyticsUserInputFragment : Fragment(R.layout.analytics_ppa_userinfo_inpu } ) - private val binding: AnalyticsPpaUserinfoInputFragmentBinding by viewBindingLazy() + private val binding: AnalyticsPpaUserinfoInputFragmentBinding by viewBinding() @Inject lateinit var itemAdapter: UserInfoItemAdapter diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentDetailFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentDetailFragment.kt index 54444e600..8f0a318a0 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentDetailFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentDetailFragment.kt @@ -5,11 +5,11 @@ import android.view.View import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.SurveyConsentDetailFragmentBinding -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding class SurveyConsentDetailFragment : Fragment(R.layout.survey_consent_detail_fragment) { - private val binding: SurveyConsentDetailFragmentBinding by viewBindingLazy() + private val binding: SurveyConsentDetailFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentFragment.kt index 9935ba7d6..fb9efabe0 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -31,7 +31,7 @@ class SurveyConsentFragment : Fragment(R.layout.survey_consent_fragment), AutoIn } ) - private val binding: SurveyConsentFragmentBinding by viewBindingLazy() + private val binding: SurveyConsentFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt index 5e090ad15..1faefc7e3 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt @@ -18,7 +18,7 @@ import de.rki.coronawarnapp.util.setUrl import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -28,7 +28,7 @@ class NewReleaseInfoFragment : Fragment(R.layout.new_release_info_screen_fragmen @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: NewReleaseInfoViewModel by cwaViewModels { viewModelFactory } - private val binding: NewReleaseInfoScreenFragmentBinding by viewBindingLazy() + private val binding: NewReleaseInfoScreenFragmentBinding by viewBinding() private val args: NewReleaseInfoFragmentArgs by navArgs() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/StatisticsExplanationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/StatisticsExplanationFragment.kt index f796aac3f..9c446a568 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/StatisticsExplanationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/statistics/ui/StatisticsExplanationFragment.kt @@ -8,7 +8,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentStatisticsExplanationBinding import de.rki.coronawarnapp.util.setUrl import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * The fragment displays static informative content to the user @@ -19,7 +19,7 @@ import de.rki.coronawarnapp.util.ui.viewBindingLazy class StatisticsExplanationFragment : Fragment(R.layout.fragment_statistics_explanation) { - private val binding: FragmentStatisticsExplanationBinding by viewBindingLazy() + private val binding: FragmentStatisticsExplanationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/ui/testresults/negative/RATResultNegativeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/ui/testresults/negative/RATResultNegativeFragment.kt index 9ff20b118..b04ebebf8 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/ui/testresults/negative/RATResultNegativeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/ui/testresults/negative/RATResultNegativeFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.databinding.FragmentSubmissionAntigenTestResultNegat import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.format.DateTimeFormat @@ -20,7 +20,7 @@ class RATResultNegativeFragment : Fragment(R.layout.fragment_submission_antigen_ @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: RATResultNegativeViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionAntigenTestResultNegativeBinding by viewBindingLazy() + private val binding: FragmentSubmissionAntigenTestResultNegativeBinding by viewBinding() private val shortTime = DateTimeFormat.shortTime() 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 94891a7dd..687c4a25e 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 @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -31,7 +31,7 @@ class TracingDetailsFragment : Fragment(R.layout.tracing_details_fragment_layout ownerProducer = { requireActivity().viewModelStore }, factoryProducer = { viewModelFactory } ) - private val binding: TracingDetailsFragmentLayoutBinding by viewBindingLazy() + private val binding: TracingDetailsFragmentLayoutBinding by viewBinding() private val detailsAdapter = TracingDetailsAdapter { vm.onItemClicked(it) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragment.kt index d4fabbb85..f6834b448 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -32,7 +32,7 @@ class SettingsTracingFragment : Fragment(R.layout.fragment_settings_tracing), Au factoryProducer = { viewModelFactory } ) - private val binding: FragmentSettingsTracingBinding by viewBindingLazy() + private val binding: FragmentSettingsTracingBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragment.kt index 2ef3dcaca..c6f7dfe76 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/create/RATProfileCreateFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.databinding.RatProfileCreateFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import org.joda.time.LocalDate @@ -20,7 +20,7 @@ import javax.inject.Inject class RATProfileCreateFragment : Fragment(R.layout.rat_profile_create_fragment), AutoInject { @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory - private val binding: RatProfileCreateFragmentBinding by viewBindingLazy() + private val binding: RatProfileCreateFragmentBinding by viewBinding() private val viewModel: RATProfileCreateFragmentViewModel by cwaViewModels { viewModelFactory } override fun onViewCreated(view: View, savedInstanceState: Bundle?) = diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt index bf3e0cb31..05943239f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt @@ -8,14 +8,14 @@ import de.rki.coronawarnapp.databinding.RatProfileOnboardingFragmentBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject class RATProfileOnboardingFragment : Fragment(R.layout.rat_profile_onboarding_fragment), AutoInject { - private val binding: RatProfileOnboardingFragmentBinding by viewBindingLazy() + private val binding: RatProfileOnboardingFragmentBinding by viewBinding() @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragment.kt index 447555b9e..1a12ab550 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/qrcode/RATProfileQrCodeFragment.kt @@ -18,7 +18,7 @@ import de.rki.coronawarnapp.ui.qrcode.fullscreen.QrCodeFullScreenFragmentArgs import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.joinToSpannable import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -29,7 +29,7 @@ class RATProfileQrCodeFragment : Fragment(R.layout.rat_profile_qr_code_fragment) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: RATProfileQrCodeFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: RatProfileQrCodeFragmentBinding by viewBindingLazy() + private val binding: RatProfileQrCodeFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { setToolbarOverlay() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt index 69a59f987..a0aae6b2b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt @@ -6,7 +6,7 @@ import androidx.annotation.IntRange import androidx.fragment.app.DialogFragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.DurationPickerBinding -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import org.joda.time.Duration import org.joda.time.format.PeriodFormatter import org.joda.time.format.PeriodFormatterBuilder @@ -23,7 +23,7 @@ class DurationPicker : DialogFragment(R.layout.duration_picker) { private val title by lazy { requireArguments().getString(TITLE_KEY).orEmpty() } private val minutesArray by lazy { requireArguments().getStringArray(MINUTES_KEY).orEmpty() } - private val binding: DurationPickerBinding by viewBindingLazy() + private val binding: DurationPickerBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt index 60ef5d4f7..8a17d70a7 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt @@ -9,14 +9,14 @@ import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentInformationAboutBinding import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. */ class InformationAboutFragment : Fragment(R.layout.fragment_information_about) { - private val binding: FragmentInformationAboutBinding by viewBindingLazy() + private val binding: FragmentInformationAboutBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt index ad4112ba4..2c06b5b9c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt @@ -9,14 +9,14 @@ import de.rki.coronawarnapp.databinding.FragmentInformationContactBinding import de.rki.coronawarnapp.util.ExternalActionHelper.callPhone import de.rki.coronawarnapp.util.linkifyPhoneNumbers import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. */ class InformationContactFragment : Fragment(R.layout.fragment_information_contact) { - private val binding: FragmentInformationContactBinding by viewBindingLazy() + private val binding: FragmentInformationContactBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) 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 303701ed5..7d41741cc 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 @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.setGone -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -29,7 +29,7 @@ class InformationFragment : Fragment(R.layout.fragment_information), AutoInject @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: InformationFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentInformationBinding by viewBindingLazy() + private val binding: FragmentInformationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt index 2bf010437..4055ba402 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt @@ -9,14 +9,14 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentInformationLegalBinding import de.rki.coronawarnapp.util.convertToHyperlink import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. */ class InformationLegalFragment : Fragment(R.layout.fragment_information_legal) { - private val binding: FragmentInformationLegalBinding by viewBindingLazy() + private val binding: FragmentInformationLegalBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt index 9bc1f33f8..f3d89b417 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationPrivacyFragment.kt @@ -7,13 +7,13 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentInformationPrivacyBinding -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. */ class InformationPrivacyFragment : Fragment(R.layout.fragment_information_privacy) { - private val binding: FragmentInformationPrivacyBinding by viewBindingLazy() + private val binding: FragmentInformationPrivacyBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt index fe10de37f..4ebc24ff7 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt @@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentInformationTechnicalBinding import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. @@ -17,7 +17,7 @@ class InformationTechnicalFragment : Fragment(R.layout.fragment_information_tech private val TAG: String? = InformationTechnicalFragment::class.simpleName } - private val binding: FragmentInformationTechnicalBinding by viewBindingLazy() + private val binding: FragmentInformationTechnicalBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt index 63c99ca82..4d0765918 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt @@ -7,14 +7,14 @@ import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentInformationTermsBinding import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * Basic Fragment which only displays static content. */ class InformationTermsFragment : Fragment(R.layout.fragment_information_terms) { - private val binding: FragmentInformationTermsBinding by viewBindingLazy() + private val binding: FragmentInformationTermsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt index 347111db1..5e0d279f9 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.databinding.FragmentInteroperabilityConfigurationBin import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -22,7 +22,7 @@ class InteroperabilityConfigurationFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: InteroperabilityConfigurationFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentInteroperabilityConfigurationBinding by viewBindingLazy() + private val binding: FragmentInteroperabilityConfigurationBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) 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 78005f509..86ed99b07 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 @@ -26,7 +26,7 @@ import de.rki.coronawarnapp.util.lists.decorations.TopBottomPaddingDecorator import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragment @@ -45,7 +45,7 @@ class HomeFragment : Fragment(R.layout.home_fragment_layout), AutoInject { factoryProducer = { viewModelFactory } ) - val binding: HomeFragmentLayoutBinding by viewBindingLazy() + val binding: HomeFragmentLayoutBinding by viewBinding() @Inject lateinit var tracingExplanationDialog: TracingExplanationDialog @Inject lateinit var deviceTimeIncorrectDialog: DeviceTimeIncorrectDialog diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt index 4696cb136..59de6c5eb 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt @@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentMainOverviewBinding import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * The fragment displays static informative content to the user @@ -18,7 +18,7 @@ import de.rki.coronawarnapp.util.ui.viewBindingLazy class MainOverviewFragment : Fragment(R.layout.fragment_main_overview) { - private val binding: FragmentMainOverviewBinding by viewBindingLazy() + private val binding: FragmentMainOverviewBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt index 0fb6b9eaf..4df5f327a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt @@ -8,14 +8,14 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentMainShareBinding import de.rki.coronawarnapp.util.ExternalActionHelper.shareText import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding /** * This fragment informs the user about what he is going to share and how he is going to help everybody with this :) */ class MainShareFragment : Fragment(R.layout.fragment_main_share) { - private val binding: FragmentMainShareBinding by viewBindingLazy() + private val binding: FragmentMainShareBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt index cd2d2231d..a8aebbdd5 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.server.protocols.internal.ppdd.PpaData import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class OnboardingAnalyticsFragment : Fragment(R.layout.fragment_onboarding_ppa), @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: OnboardingAnalyticsViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingPpaBinding by viewBindingLazy() + private val binding: FragmentOnboardingPpaBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt index 8efd0a961..f229edec4 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -23,7 +23,7 @@ class OnboardingDeltaAnalyticsFragment : Fragment(R.layout.fragment_onboarding_d @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: OnboardingAnalyticsViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingDeltaPpaBinding by viewBindingLazy() + private val binding: FragmentOnboardingDeltaPpaBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt index 527103651..36b431511 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.convertToHyperlink import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -23,7 +23,7 @@ class OnboardingDeltaInteroperabilityFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: OnboardingDeltaInteroperabilityFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingDeltaInteroperabilityBinding by viewBindingLazy() + private val binding: FragmentOnboardingDeltaInteroperabilityBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt index dc080acf5..9b7f010b1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentOnboardingBinding import de.rki.coronawarnapp.util.ExternalActionHelper.openUrl import de.rki.coronawarnapp.util.ui.doNavigate -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import java.util.Locale /** @@ -17,7 +17,7 @@ import java.util.Locale */ class OnboardingFragment : Fragment(R.layout.fragment_onboarding) { - private val binding: FragmentOnboardingBinding by viewBindingLazy() + private val binding: FragmentOnboardingBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragment.kt index 60986d453..bc6283548 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.databinding.FragmentOnboardingNotificationsBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -28,7 +28,7 @@ class OnboardingNotificationsFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: OnboardingNotificationsViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingNotificationsBinding by viewBindingLazy() + private val binding: FragmentOnboardingNotificationsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyFragment.kt index 286e52393..ed82a3750 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.databinding.FragmentOnboardingPrivacyBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class OnboardingPrivacyFragment : Fragment(R.layout.fragment_onboarding_privacy) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: OnboardingPrivacyViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingPrivacyBinding by viewBindingLazy() + private val binding: FragmentOnboardingPrivacyBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestFragment.kt index 138cf3e09..a63ba07f1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.databinding.FragmentOnboardingTestBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -21,7 +21,7 @@ class OnboardingTestFragment : Fragment(R.layout.fragment_onboarding_test), Auto @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: OnboardingTestViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentOnboardingTestBinding by viewBindingLazy() + private val binding: FragmentOnboardingTestBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt index 9c657fa36..56dd5e6b1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.ui.doNavigate import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -23,7 +23,7 @@ import javax.inject.Inject */ class OnboardingTracingFragment : Fragment(R.layout.fragment_onboarding_tracing), AutoInject { - private val binding: FragmentOnboardingTracingBinding by viewBindingLazy() + private val binding: FragmentOnboardingTracingBinding by viewBinding() @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: OnboardingTracingFragmentViewModel by cwaViewModels { viewModelFactory } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt index 435473778..d03a3c9ff 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt @@ -34,7 +34,7 @@ import de.rki.coronawarnapp.util.onScroll import de.rki.coronawarnapp.util.tryHumanReadableError import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -57,7 +57,7 @@ class CheckInsFragment : Fragment(R.layout.trace_location_attendee_checkins_frag ) } ) - private val binding: TraceLocationAttendeeCheckinsFragmentBinding by viewBindingLazy() + private val binding: TraceLocationAttendeeCheckinsFragmentBinding by viewBinding() private val checkInsAdapter = CheckInsAdapter() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/consent/CheckInsConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/consent/CheckInsConsentFragment.kt index 509c63832..df3550b21 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/consent/CheckInsConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/consent/CheckInsConsentFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -20,7 +20,7 @@ import javax.inject.Inject class CheckInsConsentFragment : Fragment(R.layout.check_ins_consent_fragment), AutoInject { - private val binding: CheckInsConsentFragmentBinding by viewBindingLazy() + private val binding: CheckInsConsentFragmentBinding by viewBinding() private val navArgs by navArgs<CheckInsConsentFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt index 5b234f97b..7174a5495 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.ui.durationpicker.DurationPicker import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import org.joda.time.Duration @@ -39,7 +39,7 @@ class ConfirmCheckInFragment : Fragment(R.layout.fragment_confirm_check_in), Aut returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false) } - private val binding: FragmentConfirmCheckInBinding by viewBindingLazy() + private val binding: FragmentConfirmCheckInBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt index af5a38c45..8f79f71c6 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.databinding.FragmentEditCheckInBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import org.joda.time.DateTimeZone @@ -44,7 +44,7 @@ class EditCheckInFragment : Fragment(R.layout.fragment_edit_check_in), AutoInjec sharedElementReturnTransition = MaterialContainerTransform() } - private val binding: FragmentEditCheckInBinding by viewBindingLazy() + private val binding: FragmentEditCheckInBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt index f7c9de003..ea2cabae6 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -22,7 +22,7 @@ class CheckInOnboardingFragment : Fragment(R.layout.fragment_trace_location_onbo @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: CheckInOnboardingViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentTraceLocationOnboardingBinding by viewBindingLazy() + private val binding: FragmentTraceLocationOnboardingBinding by viewBinding() private val args by navArgs<CheckInOnboardingFragmentArgs>() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt index d1729d68b..c3e6e906a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt @@ -21,7 +21,7 @@ import de.rki.coronawarnapp.util.permission.CameraPermissionHelper import de.rki.coronawarnapp.util.ui.LazyString import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -34,7 +34,7 @@ class ScanCheckInQrCodeFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: ScanCheckInQrCodeViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentScanQrCodeBinding by viewBindingLazy() + private val binding: FragmentScanQrCodeBinding by viewBinding() private var showsPermissionDialog = false override fun onCreate(savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt index 99a29a467..c66bda5b1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -22,7 +22,7 @@ class TraceLocationCategoryFragment : Fragment(R.layout.trace_location_organizer @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: TraceLocationCategoryViewModel by cwaViewModels { viewModelFactory } - private val binding: TraceLocationOrganizerCategoryFragmentBinding by viewBindingLazy() + private val binding: TraceLocationOrganizerCategoryFragmentBinding by viewBinding() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt index 64348cc5a..7777f7c6a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt @@ -22,7 +22,7 @@ import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import org.joda.time.DateTime @@ -33,7 +33,7 @@ import javax.inject.Inject class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_fragment), AutoInject { - private val binding: TraceLocationCreateFragmentBinding by viewBindingLazy() + private val binding: TraceLocationCreateFragmentBinding by viewBinding() private val navArgs by navArgs<TraceLocationCreateFragmentArgs>() @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt index 75a23ca0a..ee6f9e9bd 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt @@ -23,7 +23,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -42,7 +42,7 @@ class QrCodeDetailFragment : Fragment(R.layout.trace_location_organizer_qr_code_ } ) - private val binding: TraceLocationOrganizerQrCodeDetailFragmentBinding by viewBindingLazy() + private val binding: TraceLocationOrganizerQrCodeDetailFragmentBinding by viewBinding() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt index 05326b20b..3c20d506d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt @@ -28,7 +28,7 @@ import de.rki.coronawarnapp.util.onScroll import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -38,7 +38,7 @@ class TraceLocationsFragment : Fragment(R.layout.trace_location_organizer_trace_ @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: TraceLocationsViewModel by cwaViewModels { viewModelFactory } - private val binding: TraceLocationOrganizerTraceLocationsListFragmentBinding by viewBindingLazy() + private val binding: TraceLocationOrganizerTraceLocationsListFragmentBinding by viewBinding() private val traceLocationsAdapter = TraceLocationsAdapter() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt index 0d7b28cd6..afdc14203 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt @@ -23,7 +23,7 @@ import de.rki.coronawarnapp.ui.print.PrintingAdapter import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.files.FileSharing import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -43,7 +43,7 @@ class QrCodePosterFragment : Fragment(R.layout.qr_code_poster_fragment), AutoInj } ) - private val binding: QrCodePosterFragmentBinding by viewBindingLazy() + private val binding: QrCodePosterFragmentBinding by viewBinding() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt index d69518a4d..8a5ed8715 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt @@ -13,14 +13,14 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject class TraceLocationQRInfoFragment : Fragment(R.layout.trace_location_organizer_qr_code_info_fragment), AutoInject { - private val binding: TraceLocationOrganizerQrCodeInfoFragmentBinding by viewBindingLazy() + private val binding: TraceLocationOrganizerQrCodeInfoFragmentBinding by viewBinding() @Inject lateinit var settings: TraceLocationOrganizerSettings diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/qrcode/fullscreen/QrCodeFullScreenFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/qrcode/fullscreen/QrCodeFullScreenFragment.kt index 6a6b7da82..0f4420cc9 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/qrcode/fullscreen/QrCodeFullScreenFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/qrcode/fullscreen/QrCodeFullScreenFragment.kt @@ -21,7 +21,7 @@ import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentQrCodeFullScreenBinding import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -30,7 +30,7 @@ class QrCodeFullScreenFragment : Fragment(R.layout.fragment_qr_code_full_screen) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory - private val binding: FragmentQrCodeFullScreenBinding by viewBindingLazy() + private val binding: FragmentQrCodeFullScreenBinding by viewBinding() private val args by navArgs<QrCodeFullScreenFragmentArgs>() private val viewModel: QrCodeFullScreenViewModel by cwaViewModelsAssisted( factoryProducer = { viewModelFactory }, diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt index b0ee388ea..46044d20b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -26,7 +26,7 @@ class SettingsResetFragment : Fragment(R.layout.fragment_settings_reset), AutoIn @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: SettingsResetViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSettingsResetBinding by viewBindingLazy() + private val binding: FragmentSettingsResetBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt index 1613ba258..128e5914c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -23,7 +23,7 @@ class SettingsPrivacyPreservingAnalyticsFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SettingsPrivacyPreservingAnalyticsViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSettingsPrivacyPreservingAnalyticsBinding by viewBindingLazy() + private val binding: FragmentSettingsPrivacyPreservingAnalyticsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt index e4ae1166f..96d83db8f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.ui.main.MainActivity import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -25,7 +25,7 @@ class SettingsBackgroundPriorityFragment : Fragment(R.layout.fragment_settings_b @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: SettingsBackgroundPriorityFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSettingsBackgroundPriorityBinding by viewBindingLazy() + private val binding: FragmentSettingsBackgroundPriorityBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragment.kt index f5f75de0b..e7db1b6b1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragment.kt @@ -10,7 +10,7 @@ import de.rki.coronawarnapp.util.ExternalActionHelper.openAppNotificationSetting import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -27,7 +27,7 @@ class NotificationSettingsFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: NotificationSettingsFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSettingsNotificationsBinding by viewBindingLazy() + private val binding: FragmentSettingsNotificationsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt index e2c60ec83..eb07d1e0b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragment.kt @@ -11,7 +11,7 @@ import de.rki.coronawarnapp.ui.doNavigate import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -24,7 +24,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), AutoInject { @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val vm: SettingsFragmentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSettingsBinding by viewBindingLazy() + private val binding: FragmentSettingsBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt index 562c87cfc..623f30a36 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt @@ -21,7 +21,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.SingleLiveEvent import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -41,7 +41,7 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_ factory.create(args.coronaTestQrCode, args.coronaTestTan, args.isConsentGiven) } ) - private val binding: FragmentSubmissionDeletionWarningBinding by viewBindingLazy() + private val binding: FragmentSubmissionDeletionWarningBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionContactFragment.kt index 7d6e8d04f..00252e584 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionContactFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionContactFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.linkifyPhoneNumbers import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -27,7 +27,7 @@ class SubmissionContactFragment : Fragment(R.layout.fragment_submission_contact) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SubmissionContactViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionContactBinding by viewBindingLazy() + private val binding: FragmentSubmissionContactBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) 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 11f758563..7c6f9a9b3 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 @@ -13,7 +13,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import timber.log.Timber @@ -23,7 +23,7 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SubmissionDispatcherViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionDispatcherBinding by viewBindingLazy() + private val binding: FragmentSubmissionDispatcherBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentFragment.kt index b25f5d676..e5fd022f5 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentFragment.kt @@ -24,7 +24,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -33,7 +33,7 @@ class SubmissionConsentFragment : Fragment(R.layout.fragment_submission_consent) @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SubmissionConsentViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionConsentBinding by viewBindingLazy() + private val binding: FragmentSubmissionConsentBinding by viewBinding() private val navArgs by navArgs<SubmissionConsentFragmentArgs>() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt index 3bf210bdb..f77d17f36 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt @@ -27,7 +27,7 @@ import de.rki.coronawarnapp.util.permission.CameraPermissionHelper import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -49,7 +49,7 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co } ) - private val binding: FragmentSubmissionQrCodeScanBinding by viewBindingLazy() + private val binding: FragmentSubmissionQrCodeScanBinding by viewBinding() private var showsPermissionDialog = false @Suppress("ComplexMethod") diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt index 93053d7e0..42d8a6a53 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import timber.log.Timber @@ -30,7 +30,7 @@ class SubmissionTestResultAvailableFragment : Fragment(R.layout.fragment_submiss @Inject lateinit var appShortcutsHelper: AppShortcutsHelper @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory - private val binding: FragmentSubmissionTestResultAvailableBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultAvailableBinding by viewBinding() private lateinit var keyRetrievalProgress: SubmissionBlockingDialog private val navArgs by navArgs<SubmissionTestResultAvailableFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyFragment.kt index a97360430..46787962c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -27,7 +27,7 @@ class SubmissionResultReadyFragment : Fragment(R.layout.fragment_submission_resu @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SubmissionResultReadyViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionResultReadyBinding by viewBindingLazy() + private val binding: FragmentSubmissionResultReadyBinding by viewBinding() private val navArgs by navArgs<CheckInsConsentFragmentArgs>() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/submissiondone/SubmissionDoneFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/submissiondone/SubmissionDoneFragment.kt index 4c6ddaa7d..95be36500 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/submissiondone/SubmissionDoneFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/submissiondone/SubmissionDoneFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -32,7 +32,7 @@ class SubmissionDoneFragment : Fragment(R.layout.fragment_submission_done), Auto } ) - private val binding: FragmentSubmissionDoneBinding by viewBindingLazy() + private val binding: FragmentSubmissionDoneBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt index 937971aba..2cd5e961b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.formatter.formatSymptomBackgroundButtonStyleByS import de.rki.coronawarnapp.util.formatter.formatSymptomButtonTextStyleByState import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -36,7 +36,7 @@ class SubmissionSymptomCalendarFragment : } ) - private val binding: FragmentSubmissionSymptomCalendarBinding by viewBindingLazy() + private val binding: FragmentSubmissionSymptomCalendarBinding by viewBinding() private lateinit var uploadDialog: SubmissionBlockingDialog override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt index ebed31ec0..34d64ce1c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt @@ -17,7 +17,7 @@ import de.rki.coronawarnapp.util.formatter.formatSymptomBackgroundButtonStyleByS import de.rki.coronawarnapp.util.formatter.formatSymptomButtonTextStyleByState import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -40,7 +40,7 @@ class SubmissionSymptomIntroductionFragment : factory.create(navArgs.testType) } ) - private val binding: FragmentSubmissionSymptomIntroBinding by viewBindingLazy() + private val binding: FragmentSubmissionSymptomIntroBinding by viewBinding() private lateinit var uploadDialog: SubmissionBlockingDialog diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanFragment.kt index eaad5f6f9..97ea51f53 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanFragment.kt @@ -19,7 +19,7 @@ import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack import de.rki.coronawarnapp.util.ui.setGone -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -32,7 +32,7 @@ class SubmissionTanFragment : Fragment(R.layout.fragment_submission_tan), AutoIn @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: SubmissionTanViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentSubmissionTanBinding by viewBindingLazy() + private val binding: FragmentSubmissionTanBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt index 98206cd2a..890ff33df 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -34,7 +34,7 @@ class SubmissionTestResultInvalidFragment : Fragment(R.layout.fragment_submissio } ) - private val binding: FragmentSubmissionTestResultInvalidBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultInvalidBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeFragment.kt index a746633a5..b3eb8f9bb 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -32,7 +32,7 @@ class SubmissionTestResultNegativeFragment : Fragment(R.layout.fragment_submissi } ) - private val binding: FragmentSubmissionTestResultNegativeBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultNegativeBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt index ba8642e7b..c855fe1ad 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt @@ -22,14 +22,14 @@ import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.observeOnce import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject class SubmissionTestResultPendingFragment : Fragment(R.layout.fragment_submission_test_result_pending), AutoInject { - private val binding: FragmentSubmissionTestResultPendingBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultPendingBinding by viewBinding() private var errorDialog: AlertDialog? = null diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenFragment.kt index 2141e745c..e8cd9231b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -38,7 +38,7 @@ class SubmissionTestResultConsentGivenFragment : } ) - private val binding: FragmentSubmissionTestResultConsentGivenBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultConsentGivenBinding by viewBinding() private lateinit var uploadDialog: SubmissionBlockingDialog diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultKeysSharedFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultKeysSharedFragment.kt index 922622724..5276dbefe 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultKeysSharedFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultKeysSharedFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -39,7 +39,7 @@ class SubmissionTestResultKeysSharedFragment : } ) - private val binding: FragmentSubmissionTestResultPositiveKeysSharedBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultPositiveKeysSharedBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentFragment.kt index 8e02c19bb..4b01ad51f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentFragment.kt @@ -14,7 +14,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -29,7 +29,7 @@ class SubmissionTestResultNoConsentFragment : @Inject lateinit var appShortcutsHelper: AppShortcutsHelper @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory - private val binding: FragmentSubmissionTestResultPositiveNoConsentBinding by viewBindingLazy() + private val binding: FragmentSubmissionTestResultPositiveNoConsentBinding by viewBinding() private val viewModel: SubmissionTestResultNoConsentViewModel by cwaViewModelsAssisted( factoryProducer = { viewModelFactory }, constructorCall = { factory, _ -> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt index 7a4c5ce4b..ece7bce10 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentFragment.kt @@ -15,7 +15,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -39,7 +39,7 @@ class SubmissionResultPositiveOtherWarningNoConsentFragment : } ) - private val binding: FragmentSubmissionNoConsentPositiveOtherWarningBinding by viewBindingLazy() + private val binding: FragmentSubmissionNoConsentPositiveOtherWarningBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentFragment.kt index 6c0ba694a..66db5c93e 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentFragment.kt @@ -12,7 +12,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import javax.inject.Inject @@ -32,7 +32,7 @@ class SubmissionYourConsentFragment : Fragment(R.layout.fragment_submission_your factory.create(navArgs.testType) } ) - private val binding: FragmentSubmissionYourConsentBinding by viewBindingLazy() + private val binding: FragmentSubmissionYourConsentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/ViewBindingExtensions.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/ViewBindingExtensions.kt index 39453c07d..21b663e70 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/ViewBindingExtensions.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/ViewBindingExtensions.kt @@ -13,8 +13,8 @@ import timber.log.Timber import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty -inline fun <FragmentT : Fragment, reified BindingT : ViewBinding> FragmentT.viewBindingLazy() = - this.viewBindingLazy( +inline fun <reified BindingT : ViewBinding> Fragment.viewBinding() = + viewBinding( bindingProvider = { val bindingMethod = BindingT::class.java.getMethod("bind", View::class.java) val binding = bindingMethod(null, requireView()) as BindingT @@ -27,9 +27,9 @@ inline fun <FragmentT : Fragment, reified BindingT : ViewBinding> FragmentT.view ) @Suppress("unused") -fun <FragmentT : Fragment, BindingT : ViewBinding> FragmentT.viewBindingLazy( - bindingProvider: FragmentT.() -> BindingT, - lifecycleOwnerProvider: FragmentT.() -> LifecycleOwner +fun <BindingT : ViewBinding> Fragment.viewBinding( + bindingProvider: Fragment.() -> BindingT, + lifecycleOwnerProvider: Fragment.() -> LifecycleOwner ) = ViewBindingProperty(bindingProvider, lifecycleOwnerProvider) class ViewBindingProperty<ComponentT : LifecycleOwner, BindingT : ViewBinding>( diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt index e2121c5b7..8d748c1ea 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt @@ -9,7 +9,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -19,7 +19,7 @@ class VaccinationConsentFragment : Fragment(R.layout.vaccination_consent_fragmen @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: VaccinationConsentViewModel by cwaViewModels { viewModelFactory } - private val binding: VaccinationConsentFragmentBinding by viewBindingLazy() + private val binding: VaccinationConsentFragmentBinding by viewBinding() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { with(binding) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt index edc037001..b0dd68778 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt @@ -17,7 +17,7 @@ import de.rki.coronawarnapp.ui.view.onOffsetChange import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate @@ -29,7 +29,7 @@ class VaccinationDetailsFragment : Fragment(R.layout.fragment_vaccination_detail @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val args by navArgs<VaccinationDetailsFragmentArgs>() - private val binding: FragmentVaccinationDetailsBinding by viewBindingLazy() + private val binding: FragmentVaccinationDetailsBinding by viewBinding() private val viewModel: VaccinationDetailsViewModel by cwaViewModelsAssisted( factoryProducer = { viewModelFactory }, constructorCall = { factory, _ -> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt index 017f9a00c..c28098130 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt @@ -23,7 +23,7 @@ import de.rki.coronawarnapp.util.list.onSwipeItem import de.rki.coronawarnapp.util.lists.diffutil.update import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson @@ -39,7 +39,7 @@ class VaccinationListFragment : Fragment(R.layout.fragment_vaccination_list), Au @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val args by navArgs<VaccinationListFragmentArgs>() - private val binding: FragmentVaccinationListBinding by viewBindingLazy() + private val binding: FragmentVaccinationListBinding by viewBinding() private val viewModel: VaccinationListViewModel by cwaViewModelsAssisted( factoryProducer = { viewModelFactory }, constructorCall = { factory, _ -> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt index 55cc22525..48a09d125 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.permission.CameraPermissionHelper import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.popBackStack -import de.rki.coronawarnapp.util.ui.viewBindingLazy +import de.rki.coronawarnapp.util.ui.viewBinding import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import javax.inject.Inject @@ -28,7 +28,7 @@ class VaccinationQrCodeScanFragment : @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory private val viewModel: VaccinationQrCodeScanViewModel by cwaViewModels { viewModelFactory } - private val binding: FragmentScanQrCodeBinding by viewBindingLazy() + private val binding: FragmentScanQrCodeBinding by viewBinding() private var showsPermissionDialog = false override fun onViewCreated( -- GitLab