diff --git a/app/src/main/java/it/ministerodellasalute/immuni/ui/cun/ReportPositivityIndependently.kt b/app/src/main/java/it/ministerodellasalute/immuni/ui/cun/ReportPositivityIndependently.kt index deff133d8..567f366b5 100644 --- a/app/src/main/java/it/ministerodellasalute/immuni/ui/cun/ReportPositivityIndependently.kt +++ b/app/src/main/java/it/ministerodellasalute/immuni/ui/cun/ReportPositivityIndependently.kt @@ -114,11 +114,6 @@ class ReportPositivityIndependently : Fragment(R.layout.report_positivity_cun), ) } - goTo.setSafeOnClickListener { - val action = DataUploadDirections.actionUploadData(true) - findNavController().navigate(action) - } - viewModel.loading.observe(viewLifecycleOwner) { activity?.loading(it, ProgressDialogFragment(), Bundle().apply { putString( diff --git a/app/src/main/java/it/ministerodellasalute/immuni/ui/support/SupportDialogFragment.kt b/app/src/main/java/it/ministerodellasalute/immuni/ui/support/SupportDialogFragment.kt index a4a2f0f72..9ed7d74da 100644 --- a/app/src/main/java/it/ministerodellasalute/immuni/ui/support/SupportDialogFragment.kt +++ b/app/src/main/java/it/ministerodellasalute/immuni/ui/support/SupportDialogFragment.kt @@ -28,7 +28,6 @@ import it.ministerodellasalute.immuni.extensions.view.getColorCompat import it.ministerodellasalute.immuni.extensions.view.gone import it.ministerodellasalute.immuni.extensions.view.setSafeOnClickListener import it.ministerodellasalute.immuni.ui.dialog.PopupDialogFragment -import it.ministerodellasalute.immuni.util.startPhoneDial import it.ministerodellasalute.immuni.util.startSendingEmail import kotlinx.android.synthetic.main.support_dialog.* import org.koin.androidx.viewmodel.ext.android.getViewModel @@ -45,22 +44,6 @@ class SupportDialogFragment : PopupDialogFragment() { setContentLayout(R.layout.support_dialog) setTitle(getString(R.string.support_title)) - contactSupport.movementMethod = LinkMovementMethod.getInstance() - viewModel.contactSupportPhone.observe(viewLifecycleOwner) { - - if (it == null) phoneContainer.gone() - else { - @SuppressLint("SetTextI18n") - contactSupport.text = "{$it}" - .coloredClickable( - color = requireContext().getColorCompat(R.color.colorPrimary), - bold = true - ) { - startPhoneDial(it) - } - } - } - mailSupport.movementMethod = LinkMovementMethod.getInstance() viewModel.contactSupportEmail.observe(viewLifecycleOwner) { if (it == null) mailContainer.gone() @@ -88,9 +71,6 @@ class SupportDialogFragment : PopupDialogFragment() { } } } - viewModel.supportWorkingHours.observe(viewLifecycleOwner) { (from, to) -> - phoneDescription.text = getString(R.string.support_phone_description_android, from, to) - } viewModel.osVersion.observe(viewLifecycleOwner) { osVersion.text = it diff --git a/app/src/main/res/layout/report_positivity_cun.xml b/app/src/main/res/layout/report_positivity_cun.xml index b30cb7b6b..3f99b68af 100644 --- a/app/src/main/res/layout/report_positivity_cun.xml +++ b/app/src/main/res/layout/report_positivity_cun.xml @@ -306,70 +306,6 @@ - - - - - - - - -