diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestForAPIFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestForAPIFragment.kt index e755d25ccb3434ad6177ccb4363950020b553eaa..216e63c5fce26043bccacb4bbdbf57c793d5946a 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestForAPIFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestForAPIFragment.kt @@ -102,7 +102,8 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel private val tracingViewModel: TracingViewModel by activityViewModels() // Data and View binding - private lateinit var binding: FragmentTestForAPIBinding + private var _binding: FragmentTestForAPIBinding? = null + private val binding: FragmentTestForAPIBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -111,7 +112,7 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentTestForAPIBinding.inflate(inflater) + _binding = FragmentTestForAPIBinding.inflate(inflater) // set the viewmmodel variable that will be used for data binding binding.tracingViewModel = tracingViewModel @@ -123,6 +124,11 @@ class TestForAPIFragment : Fragment(), InternalExposureNotificationPermissionHel return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestRiskLevelCalculation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestRiskLevelCalculation.kt index b1f9739c044f88f797113232b76b5da0b37b7da1..7c76a021c136143cfc24ea622e70770d00d10ff8 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestRiskLevelCalculation.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/TestRiskLevelCalculation.kt @@ -54,14 +54,15 @@ class TestRiskLevelCalculation : Fragment() { private val tracingViewModel: TracingViewModel by activityViewModels() private val settingsViewModel: SettingsViewModel by activityViewModels() private val submissionViewModel: SubmissionViewModel by activityViewModels() - private lateinit var binding: FragmentTestRiskLevelCalculationBinding + private var _binding: FragmentTestRiskLevelCalculationBinding? = null + private val binding: FragmentTestRiskLevelCalculationBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentTestRiskLevelCalculationBinding.inflate(inflater) + _binding = FragmentTestRiskLevelCalculationBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.settingsViewModel = settingsViewModel binding.submissionViewModel = submissionViewModel @@ -69,6 +70,11 @@ class TestRiskLevelCalculation : Fragment() { return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + 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 7107692858b881eac96b7472e3e88770ad19ddf5..95a4182275b6e86dc45e82a388aae5bfa4ada30d 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 @@ -16,18 +16,25 @@ class InformationAboutFragment : BaseFragment() { private val TAG: String? = InformationAboutFragment::class.simpleName } - private lateinit var binding: FragmentInformationAboutBinding + private var _binding: FragmentInformationAboutBinding? = null + private val binding: FragmentInformationAboutBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationAboutBinding.inflate(inflater) + _binding = FragmentInformationAboutBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 3da4c84a61b69ccb942f73d09313873fcb1b1ac0..88f37c5fd8bf38c95c78d0acd7bd2404fe8f243c 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 @@ -18,18 +18,25 @@ class InformationContactFragment : BaseFragment() { private val TAG: String? = InformationContactFragment::class.simpleName } - private lateinit var binding: FragmentInformationContactBinding + private var _binding: FragmentInformationContactBinding? = null + private val binding: FragmentInformationContactBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationContactBinding.inflate(inflater) + _binding = FragmentInformationContactBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 76866d570f16e5c64ccdaa1d81dc081050d0ccc5..80e7e541cd5e347fd2b49c61a8f1b5fbf93d268d 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 @@ -18,18 +18,25 @@ class InformationFragment : BaseFragment() { private val TAG: String? = InformationFragment::class.simpleName } - private lateinit var binding: FragmentInformationBinding + private var _binding: FragmentInformationBinding? = null + private val binding: FragmentInformationBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationBinding.inflate(inflater) + _binding = FragmentInformationBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 2d32a639d14c751fd4d015c5e2f2d8defbb8d013..16abadd8c53e290a51e84053f71a93db19a4e0cf 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 @@ -16,18 +16,25 @@ class InformationLegalFragment : BaseFragment() { private val TAG: String? = InformationLegalFragment::class.simpleName } - private lateinit var binding: FragmentInformationLegalBinding + private var _binding: FragmentInformationLegalBinding? = null + private val binding: FragmentInformationLegalBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationLegalBinding.inflate(inflater) + _binding = FragmentInformationLegalBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 7b3cc61e44cfe8aafdd007c016e955f2a076dd4c..b3ab39e4cc44447d0ff849576a4c6ca09ccdd860 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 @@ -16,18 +16,25 @@ class InformationPrivacyFragment : BaseFragment() { private val TAG: String? = InformationPrivacyFragment::class.simpleName } - private lateinit var binding: FragmentInformationPrivacyBinding + private var _binding: FragmentInformationPrivacyBinding? = null + private val binding: FragmentInformationPrivacyBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationPrivacyBinding.inflate(inflater) + _binding = FragmentInformationPrivacyBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 a4e295f7e5e30c3525b164f08240e0bc8294be30..9ce43c29ff7032dcc1ff4e131d12e5556d3f1b3a 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 @@ -16,18 +16,25 @@ class InformationTechnicalFragment : BaseFragment() { private val TAG: String? = InformationTechnicalFragment::class.simpleName } - private lateinit var binding: FragmentInformationTechnicalBinding + private var _binding: FragmentInformationTechnicalBinding? = null + private val binding: FragmentInformationTechnicalBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationTechnicalBinding.inflate(inflater) + _binding = FragmentInformationTechnicalBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } 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 486172f2a36d982f5f641b006c01708bad2c6d47..8189f124017edf14f702456629654b912c4c771f 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 @@ -16,18 +16,25 @@ class InformationTermsFragment : BaseFragment() { private val TAG: String? = InformationTermsFragment::class.simpleName } - private lateinit var binding: FragmentInformationTermsBinding + private var _binding: FragmentInformationTermsBinding? = null + private val binding: FragmentInformationTermsBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentInformationTermsBinding.inflate(inflater) + _binding = FragmentInformationTermsBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt index 6f9355b522059c605e357ffebdde14038a5bc98c..53404e0f9d1bfb0a53ca7ee0188e94699adf4c90 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt @@ -38,14 +38,15 @@ class MainFragment : BaseFragment() { private val tracingViewModel: TracingViewModel by activityViewModels() private val settingsViewModel: SettingsViewModel by activityViewModels() private val submissionViewModel: SubmissionViewModel by activityViewModels() - private lateinit var binding: FragmentMainBinding + private var _binding: FragmentMainBinding? = null + private val binding: FragmentMainBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentMainBinding.inflate(inflater) + _binding = FragmentMainBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.settingsViewModel = settingsViewModel binding.submissionViewModel = submissionViewModel @@ -53,6 +54,11 @@ class MainFragment : BaseFragment() { return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt index 03d4f39297202d74b84262ed53cc4f537dc1ef41..40502e586078b1894230396cae56aa11bfc588d4 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainOverviewFragment.kt @@ -20,17 +20,23 @@ class MainOverviewFragment : BaseFragment() { private val TAG: String? = MainOverviewFragment::class.simpleName } - private lateinit var binding: FragmentMainOverviewBinding + private var _binding: FragmentMainOverviewBinding? = null + private val binding: FragmentMainOverviewBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentMainOverviewBinding.inflate(inflater) + _binding = FragmentMainOverviewBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt index e6b42e0eab63e620e68c122cf92df54947561464..8ba1bb2e6fc3a1311b6049d059686be336ffcb79 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainShareFragment.kt @@ -23,19 +23,25 @@ class MainShareFragment : BaseFragment() { } private val tracingViewModel: TracingViewModel by activityViewModels() - private lateinit var binding: FragmentMainShareBinding + private var _binding: FragmentMainShareBinding? = null + private val binding: FragmentMainShareBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentMainShareBinding.inflate(inflater) + _binding = FragmentMainShareBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() 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 da9b29651831d7cdbc3eaa0f6549475a49ea38d5..bad65043b8eef49991552a9573f6d90589400d94 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 @@ -15,17 +15,23 @@ class OnboardingFragment : BaseFragment() { private val TAG: String? = OnboardingFragment::class.simpleName } - private lateinit var binding: FragmentOnboardingBinding + private var _binding: FragmentOnboardingBinding? = null + private val binding: FragmentOnboardingBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentOnboardingBinding.inflate(inflater) + _binding = FragmentOnboardingBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.onboardingButtonNext.setOnClickListener { 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 11f6fb9ba9e08b10f6af9811d98ff097bdfe2c33..7b9c98795324eae81cadcc1657377c841ab499c3 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 @@ -20,17 +20,23 @@ class OnboardingNotificationsFragment : BaseFragment() { private val TAG: String? = OnboardingNotificationsFragment::class.simpleName } - private lateinit var binding: FragmentOnboardingNotificationsBinding + private var _binding: FragmentOnboardingNotificationsBinding? = null + private val binding: FragmentOnboardingNotificationsBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentOnboardingNotificationsBinding.inflate(inflater) + _binding = FragmentOnboardingNotificationsBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() 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 941ece49508bb2c60bb68b5436950d08abbfc3dc..21bacc7920e6f332672a6eab63d6ccdbc1cd039c 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 @@ -15,17 +15,23 @@ class OnboardingPrivacyFragment : BaseFragment() { private val TAG: String? = OnboardingPrivacyFragment::class.simpleName } - private lateinit var binding: FragmentOnboardingPrivacyBinding + private var _binding: FragmentOnboardingPrivacyBinding? = null + private val binding: FragmentOnboardingPrivacyBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentOnboardingPrivacyBinding.inflate(inflater) + _binding = FragmentOnboardingPrivacyBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() 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 248c12d9142fdd624b7a5c37bfa0a46da2915c39..494b6fbd7c8ba3e93dceaee7b9b3b568acda303f 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 @@ -15,17 +15,23 @@ class OnboardingTestFragment : BaseFragment() { private val TAG: String? = OnboardingTestFragment::class.simpleName } - private lateinit var binding: FragmentOnboardingTestBinding + private var _binding: FragmentOnboardingTestBinding? = null + private val binding: FragmentOnboardingTestBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentOnboardingTestBinding.inflate(inflater) + _binding = FragmentOnboardingTestBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() 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 15cc2dce96a14451aef385c2b17a534112cb759c..023b07e91f91db49428e98edfb71b3c12c408b06 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 @@ -26,7 +26,8 @@ class OnboardingTracingFragment : BaseFragment(), } private lateinit var internalExposureNotificationPermissionHelper: InternalExposureNotificationPermissionHelper - private lateinit var binding: FragmentOnboardingTracingBinding + private var _binding: FragmentOnboardingTracingBinding? = null + private val binding: FragmentOnboardingTracingBinding get() = _binding!! override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { internalExposureNotificationPermissionHelper.onResolutionComplete( @@ -46,10 +47,15 @@ class OnboardingTracingFragment : BaseFragment(), container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentOnboardingTracingBinding.inflate(inflater) + _binding = FragmentOnboardingTracingBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt index 7e0a5d01ef17e69dd0dfaf78db48a361d1aa47cd..13e9e6564aee8e45f3758bb32e2c5e4a0b2056dc 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt @@ -26,21 +26,28 @@ class RiskDetailsFragment : BaseFragment() { private val tracingViewModel: TracingViewModel by activityViewModels() private val settingsViewModel: SettingsViewModel by activityViewModels() - private lateinit var binding: FragmentRiskDetailsBinding + private var _binding: FragmentRiskDetailsBinding? = null + private val binding: FragmentRiskDetailsBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentRiskDetailsBinding.inflate(inflater) + _binding = FragmentRiskDetailsBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.settingsViewModel = settingsViewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListeners() } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt index ed39f3716067f5f353c59e90740a59f9d5b2fcf1..55f10e0461720bb023f0518023bc4f6a7a8237c8 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsFragment.kt @@ -25,20 +25,26 @@ class SettingsFragment : BaseFragment() { private val tracingViewModel: TracingViewModel by activityViewModels() private val settingsViewModel: SettingsViewModel by activityViewModels() - private lateinit var binding: FragmentSettingsBinding + private var _binding: FragmentSettingsBinding? = null + private val binding: FragmentSettingsBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSettingsBinding.inflate(inflater) + _binding = FragmentSettingsBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.settingsViewModel = settingsViewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt index 695362b30c0d7ad3bd044cfe18308642eb4eb673..2344f700960106f66274889270eeb6319c162ca5 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt @@ -26,19 +26,25 @@ class SettingsNotificationFragment : Fragment() { } private val settingsViewModel: SettingsViewModel by activityViewModels() - private lateinit var binding: FragmentSettingsNotificationsBinding + private var _binding: FragmentSettingsNotificationsBinding? = null + private val binding: FragmentSettingsNotificationsBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSettingsNotificationsBinding.inflate(inflater) + _binding = FragmentSettingsNotificationsBinding.inflate(inflater) binding.settingsViewModel = settingsViewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() 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 0606f781908a2808c4e184f3c9fcc9cbb348f0de..6fb673f152fcab218e1feb3869b03e41d179b1bb 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 @@ -30,17 +30,23 @@ class SettingsResetFragment : BaseFragment() { private val TAG: String? = SettingsResetFragment::class.simpleName } - private lateinit var binding: FragmentSettingsResetBinding + private var _binding: FragmentSettingsResetBinding? = null + private val binding: FragmentSettingsResetBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSettingsResetBinding.inflate(inflater) + _binding = FragmentSettingsResetBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.settingsResetButtonDelete.setOnClickListener { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt index 219dfa2cd4b05121813785ba867b375750e543dd..7a4f6cbc0c4fbe736bbc53e695dee92e08e33d4c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt @@ -39,7 +39,8 @@ class SettingsTracingFragment : BaseFragment(), private val tracingViewModel: TracingViewModel by activityViewModels() private val settingsViewModel: SettingsViewModel by activityViewModels() - private lateinit var binding: FragmentSettingsTracingBinding + private var _binding: FragmentSettingsTracingBinding? = null + private val binding: FragmentSettingsTracingBinding get() = _binding!! private lateinit var internalExposureNotificationPermissionHelper: InternalExposureNotificationPermissionHelper @@ -48,14 +49,20 @@ class SettingsTracingFragment : BaseFragment(), container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSettingsTracingBinding.inflate(inflater) + _binding = FragmentSettingsTracingBinding.inflate(inflater) binding.tracingViewModel = tracingViewModel binding.settingsViewModel = settingsViewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt index 14607969a6038acc50ab3d0f8969e855caff1c37..0d1693898f557f30e2dc4087d9a8f9580f8f31f4 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt @@ -15,7 +15,8 @@ import de.rki.coronawarnapp.util.CallHelper */ class SubmissionContactFragment : BaseFragment() { - private lateinit var binding: FragmentSubmissionContactBinding + private var _binding: FragmentSubmissionContactBinding? = null + private val binding: FragmentSubmissionContactBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -23,10 +24,15 @@ class SubmissionContactFragment : BaseFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionContactBinding.inflate(inflater) + _binding = FragmentSubmissionContactBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt index b575c9ccd17bd2e471dac82ef80ce54fc9687d55..4178eea3bd4c910f4b4a770de066ae589d806c0e 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt @@ -16,18 +16,24 @@ class SubmissionDispatcherFragment : BaseFragment() { private val TAG: String? = SubmissionDispatcherFragment::class.simpleName } - private lateinit var binding: FragmentSubmissionDispatcherBinding + private var _binding: FragmentSubmissionDispatcherBinding? = null + private val binding: FragmentSubmissionDispatcherBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSubmissionDispatcherBinding.inflate(inflater) + _binding = FragmentSubmissionDispatcherBinding.inflate(inflater) binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt index e3625fa8812cebf08d690423876147c8a5de8b4d..330c86d79ff30d014c784ca077d29a01cbe87f69 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDoneFragment.kt @@ -12,7 +12,8 @@ import de.rki.coronawarnapp.ui.BaseFragment */ class SubmissionDoneFragment : BaseFragment() { - private lateinit var binding: FragmentSubmissionDoneBinding + private var _binding: FragmentSubmissionDoneBinding? = null + private val binding: FragmentSubmissionDoneBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -20,10 +21,15 @@ class SubmissionDoneFragment : BaseFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionDoneBinding.inflate(inflater) + _binding = FragmentSubmissionDoneBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt index 279b084230fdcdc0724a90f59c418ed015b714d1..219457cb2e0ede908527ef890d44bdb64a4cf15b 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt @@ -12,7 +12,8 @@ import de.rki.coronawarnapp.ui.BaseFragment */ class SubmissionIntroFragment : BaseFragment() { - private lateinit var binding: FragmentSubmissionIntroBinding + private var _binding: FragmentSubmissionIntroBinding? = null + private val binding: FragmentSubmissionIntroBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -20,10 +21,15 @@ class SubmissionIntroFragment : BaseFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionIntroBinding.inflate(inflater) + _binding = FragmentSubmissionIntroBinding.inflate(inflater) return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt index ad089960cb424056cc1d187cfe64d94e279ee805..928c49fc3f184652e3e1550b371e2d8ec6cb0267 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt @@ -29,14 +29,15 @@ class SubmissionQRCodeScanFragment : BaseFragment() { } private val viewModel: SubmissionViewModel by viewModels() - private lateinit var binding: FragmentSubmissionQrCodeScanBinding + private var _binding: FragmentSubmissionQrCodeScanBinding? = null + private val binding: FragmentSubmissionQrCodeScanBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSubmissionQrCodeScanBinding.inflate(inflater) + _binding = FragmentSubmissionQrCodeScanBinding.inflate(inflater) binding.lifecycleOwner = this return binding.root } @@ -49,6 +50,11 @@ class SubmissionQRCodeScanFragment : BaseFragment() { binding.submissionQrCodeScanPreview.decodeSingle { decodeCallback(it) } } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + 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/SubmissionRegisterDeviceFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt index 853c16b6e8b644a85dccf505fe05ef12f24fd446..de5655f4a419e237b74ca1f6c6cdea45f6cad8cb 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt @@ -12,18 +12,24 @@ import de.rki.coronawarnapp.ui.viewmodel.SubmissionViewModel class SubmissionRegisterDeviceFragment : BaseFragment() { private val viewModel: SubmissionViewModel by activityViewModels() - private lateinit var binding: FragmentSubmissionRegisterDeviceBinding + private var _binding: FragmentSubmissionRegisterDeviceBinding? = null + private val binding: FragmentSubmissionRegisterDeviceBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSubmissionRegisterDeviceBinding.inflate(inflater) + _binding = FragmentSubmissionRegisterDeviceBinding.inflate(inflater) binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + 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/SubmissionResultPositiveOtherWarningFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt index 96ef049bc5e015bac99e633b48e17f772e04970a..7fc0b62982dad204ebd94c0cc3b84db311d32972 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt @@ -25,7 +25,8 @@ class SubmissionResultPositiveOtherWarningFragment : BaseFragment(), private val submissionViewModel: SubmissionViewModel by activityViewModels() private val tracingViewModel: TracingViewModel by activityViewModels() - private lateinit var binding: FragmentSubmissionPositiveOtherWarningBinding + private var _binding: FragmentSubmissionPositiveOtherWarningBinding? = null + private val binding: FragmentSubmissionPositiveOtherWarningBinding get() = _binding!! private var submissionRequested = false private var submissionFailed = false private lateinit var internalExposureNotificationPermissionHelper: @@ -55,11 +56,16 @@ class SubmissionResultPositiveOtherWarningFragment : BaseFragment(), ): View? { internalExposureNotificationPermissionHelper = InternalExposureNotificationPermissionHelper(this, this) - binding = FragmentSubmissionPositiveOtherWarningBinding.inflate(inflater) + _binding = FragmentSubmissionPositiveOtherWarningBinding.inflate(inflater) binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionSuccessDialogFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionSuccessDialogFragment.kt index de42246623d88ab318194700c0a1c6964cc32a4c..5b936c1ffbbea618d787339dff9089bcb9139799 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionSuccessDialogFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionSuccessDialogFragment.kt @@ -18,7 +18,8 @@ class SubmissionSuccessDialogFragment : DialogFragment() { private val TAG: String? = SubmissionSuccessDialogFragment::class.simpleName } - private lateinit var binding: FragmentSubmissionDialogBinding + private var _binding: FragmentSubmissionDialogBinding? = null + private val binding: FragmentSubmissionDialogBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -26,12 +27,17 @@ class SubmissionSuccessDialogFragment : DialogFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionDialogBinding.inflate(inflater) + _binding = FragmentSubmissionDialogBinding.inflate(inflater) // Inflate the layout for this fragment return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { binding.submissionVerificationSuccessButton.setOnClickListener { Log.i(TAG, "button OK clicked") diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt index 4f05de4597fc1666a32ebcea2730a8dad7fd4028..c01259274092ef4df4741794189848b1a26aeb3f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt @@ -14,7 +14,8 @@ import de.rki.coronawarnapp.ui.BaseFragment class SubmissionTanFragment : BaseFragment() { private val viewModel: SubmissionTanViewModel by activityViewModels() - private lateinit var binding: FragmentSubmissionTanBinding + private var _binding: FragmentSubmissionTanBinding? = null + private val binding: FragmentSubmissionTanBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -22,12 +23,17 @@ class SubmissionTanFragment : BaseFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionTanBinding.inflate(inflater) + _binding = FragmentSubmissionTanBinding.inflate(inflater) binding.viewmodel = viewModel binding.lifecycleOwner = this return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + 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/SubmissionTestResultFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt index cdb2f61ca13010f1d02736c3354a170463b13e33..553ce28b902a44cac9b0d6cbf27c9251de4b9862 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt @@ -23,7 +23,8 @@ class SubmissionTestResultFragment : BaseFragment() { private val submissionViewModel: SubmissionViewModel by activityViewModels() private val tracingViewModel: TracingViewModel by activityViewModels() - private lateinit var binding: FragmentSubmissionTestResultBinding + private var _binding: FragmentSubmissionTestResultBinding? = null + private val binding: FragmentSubmissionTestResultBinding get() = _binding!! override fun onCreateView( inflater: LayoutInflater, @@ -31,13 +32,18 @@ class SubmissionTestResultFragment : BaseFragment() { savedInstanceState: Bundle? ): View? { // get the binding reference by inflating it with the current layout - binding = FragmentSubmissionTestResultBinding.inflate(inflater) + _binding = FragmentSubmissionTestResultBinding.inflate(inflater) binding.submissionViewModel = submissionViewModel binding.lifecycleOwner = this // Inflate the layout for this fragment return binding.root } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener()