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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/support_dialog.xml b/app/src/main/res/layout/support_dialog.xml
index 0ad93e48d..9a3697410 100644
--- a/app/src/main/res/layout/support_dialog.xml
+++ b/app/src/main/res/layout/support_dialog.xml
@@ -62,65 +62,11 @@
android:layout_marginEnd="32dp"
android:text="@string/support_contact_support" />
-
-
-
-
-
-
-
-
-
-
-
-
+ android:padding="30dp">
Folgen Sie die Anweisungen, um Ihre Positivität zu melden
WeiterHaben Sie den CUN-Code?
- Sie können die Daten direkt in die App oder telefonisch beim Call Center 800.91.24.91 eingeben
+ Sie können die Daten direkt in die AppMit dieser Funktion können Sie Ihre Positivität melden, indem Sie die angeforderten Daten direkt eingeben.Freischalten in AutonomieRufen Sie das Callcenter unter 800.91.24.91 an
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0cd06058b..27eb887f9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -391,7 +391,7 @@ Sistema operativo: iOS 13.5.1; modelo: iPhone XS; notificaciones de exposición:
Sigue el procedimiento para informar tu positividadContinúa¿Tienes el codigo CUN?
- Puede ingresar los datos directamente en la aplicación o llamando al centro de llamadas 800.91.24.91
+ Puede ingresar los datos directamente en la aplicaciónEsta función te permite reportar tu positividad ingresando directamente los datos solicitados.Desbloquea por tu cuentaLlama el centro de llamadas 800.91.24.91
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fa62f23e2..6935cc92f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -391,7 +391,7 @@ Système d\'exploitation : iOS 13.5.1; Modèle iPhone XS ; Notifications de risq
Suivez la procédure pour signaler votre positivitéContinuerAvez-vous le code CUN?
- Vous pouvez saisir les données directement dans l\'application ou en appelant le centre d\'appels 800.91.24.91
+ Vous pouvez saisir les données directement dans l\'applicationCette fonction vous permet de signaler votre positivité en saisissant directement les données demandées.Déverrouillez vous-mêmeAppelez le centre d\'appels 800.91.24.91
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b9c767ab6..43ffd9477 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -390,7 +390,7 @@ Sistema operativo: iOS 13.5.1; Modello iPhone XS; Notifiche di esposizione: Atti
Segui la procedura per segnalare la tua positivitàProseguiHai il codice CUN?
- Puoi inserire i dati direttamente in app oppure chiamando il call center 800.91.24.91
+ Puoi inserire i dati direttamente in appQuesta funzione ti permette di segnalare la tua positività inserendo direttamente i dati richiesti.Sblocca in autonomiaChiama il call center 800.91.24.91
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 743da34b1..b42d6bb0b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -385,7 +385,7 @@ Operating system: iOS 13.5.1; Model: iPhone XS; Exposure notifications: Active;
Follow the procedure to report your being positiveContinueDo you have a CUN code?
- You can enter the data directly in the app or by calling the call center at 800.91.24.91
+ You can enter the data directly in the appThis function allows you to report your positivity by directly entering the requested data.Unblock freelyCall the Call Center at 800.91.24.91
diff --git a/build.gradle b/build.gradle
index fe40b8f7b..6d0a3fc15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
// App version digits
versionMajor = 2
versionMinor = 5
- versionPatch = 5
+ versionPatch = 7
// Version name follows the .. convention
computeVersionName = { ->