From 2a0cb2ba01f746cc1d84d68ab025c98cd8bd0463 Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Sun, 29 Nov 2020 14:47:33 +0000
Subject: [PATCH] Lint formatting and Detekt changes
---
...ubmissionTestResultConsentGivenFragment.kt | 19 +++++++++----------
...bmissionTestResultConsentGivenViewModel.kt | 3 +--
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenFragment.kt
index 4e9b879da..7e0db6b8a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenFragment.kt
@@ -21,7 +21,8 @@ import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
import javax.inject.Inject
-class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_submission_test_result_consent_given), AutoInject {
+class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_submission_test_result_consent_given),
+ AutoInject {
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
private val viewModel: SubmissionTestResultConsentGivenViewModel by cwaViewModels { viewModelFactory }
@@ -33,7 +34,6 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
SubmissionTestResultConsentGivenFragmentDirections.actionSubmissionTestResultConsentGivenFragmentToHomeFragment()
)
-
private fun buildErrorDialog(exception: CwaWebException): DialogHelper.DialogInstance {
return when (exception) {
is CwaClientError, is CwaServerError -> DialogHelper.DialogInstance(
@@ -105,14 +105,14 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
}
private fun setButtonOnClickListener() {
- binding.submissionTestResultButtonConsentGivenContinue.setOnClickListener {
- viewModel.onContinuePressed()
+ binding.submissionTestResultButtonConsentGivenContinue.setOnClickListener {
+ viewModel.onContinuePressed()
- }
+ }
- binding.submissionTestResultButtonConsentGivenContinueWithoutSymptoms.setOnClickListener {
- viewModel.onShowCancelDialog()
- }
+ binding.submissionTestResultButtonConsentGivenContinueWithoutSymptoms.setOnClickListener {
+ viewModel.onShowCancelDialog()
+ }
}
private fun showCancelDialog() {
@@ -127,5 +127,4 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
}
}.show()
}
-
- }
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenViewModel.kt
index 2b6db9268..60f3116af 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultConsentGivenViewModel.kt
@@ -53,7 +53,7 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor(
val showCancelDialog = SingleLiveEvent<Unit>()
- fun onContinuePressed(){
+ fun onContinuePressed() {
Timber.d("Beginning symptom flow")
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToSymptomIntroduction)
}
@@ -67,7 +67,6 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor(
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToMainActivity)
}
-
@AssistedInject.Factory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultConsentGivenViewModel>
}
--
GitLab