Skip to content
Snippets Groups Projects
Commit 2a0cb2ba authored by Oliver Zimmerman's avatar Oliver Zimmerman
Browse files

Lint formatting and Detekt changes

parent 7b48c6d4
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,8 @@ import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider ...@@ -21,7 +21,8 @@ import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModels import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
import javax.inject.Inject 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 @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
private val viewModel: SubmissionTestResultConsentGivenViewModel by cwaViewModels { viewModelFactory } private val viewModel: SubmissionTestResultConsentGivenViewModel by cwaViewModels { viewModelFactory }
...@@ -33,7 +34,6 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm ...@@ -33,7 +34,6 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
SubmissionTestResultConsentGivenFragmentDirections.actionSubmissionTestResultConsentGivenFragmentToHomeFragment() SubmissionTestResultConsentGivenFragmentDirections.actionSubmissionTestResultConsentGivenFragmentToHomeFragment()
) )
private fun buildErrorDialog(exception: CwaWebException): DialogHelper.DialogInstance { private fun buildErrorDialog(exception: CwaWebException): DialogHelper.DialogInstance {
return when (exception) { return when (exception) {
is CwaClientError, is CwaServerError -> DialogHelper.DialogInstance( is CwaClientError, is CwaServerError -> DialogHelper.DialogInstance(
...@@ -105,14 +105,14 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm ...@@ -105,14 +105,14 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
} }
private fun setButtonOnClickListener() { private fun setButtonOnClickListener() {
binding.submissionTestResultButtonConsentGivenContinue.setOnClickListener { binding.submissionTestResultButtonConsentGivenContinue.setOnClickListener {
viewModel.onContinuePressed() viewModel.onContinuePressed()
} }
binding.submissionTestResultButtonConsentGivenContinueWithoutSymptoms.setOnClickListener { binding.submissionTestResultButtonConsentGivenContinueWithoutSymptoms.setOnClickListener {
viewModel.onShowCancelDialog() viewModel.onShowCancelDialog()
} }
} }
private fun showCancelDialog() { private fun showCancelDialog() {
...@@ -127,5 +127,4 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm ...@@ -127,5 +127,4 @@ class SubmissionTestResultConsentGivenFragment : Fragment(R.layout.fragment_subm
} }
}.show() }.show()
} }
}
}
...@@ -53,7 +53,7 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor( ...@@ -53,7 +53,7 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor(
val showCancelDialog = SingleLiveEvent<Unit>() val showCancelDialog = SingleLiveEvent<Unit>()
fun onContinuePressed(){ fun onContinuePressed() {
Timber.d("Beginning symptom flow") Timber.d("Beginning symptom flow")
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToSymptomIntroduction) routeToScreen.postValue(SubmissionNavigationEvents.NavigateToSymptomIntroduction)
} }
...@@ -67,7 +67,6 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor( ...@@ -67,7 +67,6 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor(
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToMainActivity) routeToScreen.postValue(SubmissionNavigationEvents.NavigateToMainActivity)
} }
@AssistedInject.Factory @AssistedInject.Factory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultConsentGivenViewModel> interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultConsentGivenViewModel>
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment