Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #372 from immuni-app/feature/remove-call-center
Browse files Browse the repository at this point in the history 
feat: removed call center in app
  • Loading branch information
@astagi
astagi authored Dec 29, 2021
2 parents 1dba015 + 399421a commit 6800084
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 150 deletions.
5 changes: 0 additions & 5 deletions app/src/main/java/it/ministerodellasalute/immuni/ui/cun/ReportPositivityIndependently.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
20 changes: 0 additions & 20 deletions app/src/main/java/it/ministerodellasalute/immuni/ui/support/SupportDialogFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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
Expand Down
64 changes: 0 additions & 64 deletions app/src/main/res/layout/report_positivity_cun.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,70 +306,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>

<TextView
android:id="@+id/orLabel"
style="@style/P1Text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="25dp"
android:text="@string/or_label"
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/formCard" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/callCenterCard"
style="@style/SettingsMenuCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="25dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/orLabel">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="25dp"
android:paddingBottom="25dp">

<TextView
android:id="@+id/titleCallCenter"
style="@style/H4Section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:drawablePadding="16dp"
android:gravity="center_vertical"
android:text="@string/call_center_report_positivity_title"
android:textColor="@color/colorPrimary"
app:drawableStartCompat="@drawable/ic_call_center"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/goTo"
style="@style/RoundedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="40dp"
android:elevation="10dp"
android:text="@string/continue_label"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleCallCenter" />

</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

Expand Down
56 changes: 1 addition & 55 deletions app/src/main/res/layout/support_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,65 +62,11 @@
android:layout_marginEnd="32dp"
android:text="@string/support_contact_support" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/phoneContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="30dp">

<ImageView
android:id="@+id/phoneIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_call" />

<TextView
android:id="@+id/phoneTitle"
style="@style/P1Text.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:paddingBottom="5dp"
android:text="@string/support_phone_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/phoneIcon"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/phoneDescription"
style="@style/P1Text.Generic"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:paddingBottom="5dp"
android:text="@string/support_phone_description_android"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/phoneIcon"
app:layout_constraintTop_toBottomOf="@+id/phoneTitle" />

<TextView
android:id="@+id/contactSupport"
style="@style/P1Text.Generic"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/phoneIcon"
app:layout_constraintTop_toBottomOf="@+id/phoneDescription"
tools:text="128120 2912" />

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/mailContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingBottom="30dp">
android:padding="30dp">

<ImageView
android:id="@+id/mailIcon"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Betriebssystem: iOS 13.5.1; Modell: iPhone XS; Expositionsmeldungen: Aktiv; [wei
<string name="cdum_description_OS">Folgen Sie die Anweisungen, um Ihre Positivität zu melden</string>
<string name="continue_label">Weiter</string>
<string name="cdum_title_independently">Haben Sie den CUN-Code?</string>
<string name="cdum_description_independently">Sie können die Daten direkt in die App oder telefonisch beim Call Center 800.91.24.91 eingeben</string>
<string name="cdum_description_independently">Sie können die Daten direkt in die App</string>
<string name="report_positivity_description_independently">Mit dieser Funktion können Sie Ihre Positivität melden, indem Sie die angeforderten Daten direkt eingeben.</string>
<string name="form_report_positivity_title">Freischalten in Autonomie</string>
<string name="call_center_report_positivity_title">Rufen Sie das Callcenter unter 800.91.24.91 an</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ Sistema operativo: iOS 13.5.1; modelo: iPhone XS; notificaciones de exposición:
<string name="cdum_description_OS">Sigue el procedimiento para informar tu positividad</string>
<string name="continue_label">Continúa</string>
<string name="cdum_title_independently">¿Tienes el codigo CUN?</string>
<string name="cdum_description_independently">Puede ingresar los datos directamente en la aplicación o llamando al centro de llamadas 800.91.24.91</string>
<string name="cdum_description_independently">Puede ingresar los datos directamente en la aplicación</string>
<string name="report_positivity_description_independently">Esta función te permite reportar tu positividad ingresando directamente los datos solicitados.</string>
<string name="form_report_positivity_title">Desbloquea por tu cuenta</string>
<string name="call_center_report_positivity_title">Llama el centro de llamadas 800.91.24.91</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ Système d\'exploitation : iOS 13.5.1; Modèle iPhone XS ; Notifications de risq
<string name="cdum_description_OS">Suivez la procédure pour signaler votre positivité</string>
<string name="continue_label">Continuer</string>
<string name="cdum_title_independently">Avez-vous le code CUN?</string>
<string name="cdum_description_independently">Vous pouvez saisir les données directement dans l\'application ou en appelant le centre d\'appels 800.91.24.91</string>
<string name="cdum_description_independently">Vous pouvez saisir les données directement dans l\'application</string>
<string name="report_positivity_description_independently">Cette fonction vous permet de signaler votre positivité en saisissant directement les données demandées.</string>
<string name="form_report_positivity_title">Déverrouillez vous-même</string>
<string name="call_center_report_positivity_title">Appelez le centre d\'appels 800.91.24.91</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ Sistema operativo: iOS 13.5.1; Modello iPhone XS; Notifiche di esposizione: Atti
<string name="cdum_description_OS">Segui la procedura per segnalare la tua positività</string>
<string name="continue_label">Prosegui</string>
<string name="cdum_title_independently">Hai il codice CUN?</string>
<string name="cdum_description_independently">Puoi inserire i dati direttamente in app oppure chiamando il call center 800.91.24.91</string>
<string name="cdum_description_independently">Puoi inserire i dati direttamente in app</string>
<string name="report_positivity_description_independently">Questa funzione ti permette di segnalare la tua positività inserendo direttamente i dati richiesti.</string>
<string name="form_report_positivity_title">Sblocca in autonomia</string>
<string name="call_center_report_positivity_title">Chiama il call center 800.91.24.91</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ Operating system: iOS 13.5.1; Model: iPhone XS; Exposure notifications: Active;
<string name="cdum_description_OS">Follow the procedure to report your being positive</string>
<string name="continue_label">Continue</string>
<string name="cdum_title_independently">Do you have a CUN code?</string>
<string name="cdum_description_independently">You can enter the data directly in the app or by calling the call center at 800.91.24.91</string>
<string name="cdum_description_independently">You can enter the data directly in the app</string>
<string name="report_positivity_description_independently">This function allows you to report your positivity by directly entering the requested data.</string>
<string name="form_report_positivity_title">Unblock freely</string>
<string name="call_center_report_positivity_title">Call the Call Center at 800.91.24.91</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
// App version digits
versionMajor = 2
versionMinor = 5
versionPatch = 5
versionPatch = 7

// Version name follows the <major>.<minor>.<patch> convention
computeVersionName = { ->
Expand Down

0 comments on commit 6800084

Please sign in to comment.