diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt index 8bf2871c95d849d0bcc6681bd8beb45491eb564a..38fb5df781d0f26725a8cbfb5f313167f4539909 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt @@ -1,5 +1,6 @@ package de.rki.coronawarnapp.ui.settings +import android.app.AlertDialog import android.content.Intent import android.os.Bundle import android.view.LayoutInflater @@ -9,6 +10,7 @@ import android.view.accessibility.AccessibilityEvent import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.google.android.gms.common.api.ApiException +import de.rki.coronawarnapp.R import de.rki.coronawarnapp.databinding.FragmentSettingsResetBinding import de.rki.coronawarnapp.exception.ExceptionCategory import de.rki.coronawarnapp.exception.reporting.report @@ -16,6 +18,7 @@ import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient import de.rki.coronawarnapp.ui.main.MainActivity import de.rki.coronawarnapp.ui.onboarding.OnboardingActivity import de.rki.coronawarnapp.util.DataRetentionHelper +import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.worker.BackgroundWorkScheduler import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -51,7 +54,7 @@ class SettingsResetFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.settingsResetButtonDelete.setOnClickListener { - deleteAllAppContent() + confirmReset() } binding.settingsResetButtonCancel.setOnClickListener { (activity as MainActivity).goBack() @@ -95,4 +98,22 @@ class SettingsResetFragment : Fragment() { private fun deleteLocalAppContent() { DataRetentionHelper.clearAllLocalData(requireContext()) } + + private fun confirmReset() { + val resetDialog = DialogHelper.DialogInstance( + requireActivity(), + R.string.settings_reset_dialog_headline, + R.string.settings_reset_dialog_body, + R.string.settings_reset_dialog_button_confirm, + R.string.settings_reset_dialog_button_cancel, + true, + { + deleteAllAppContent() + } + ) + + DialogHelper.showDialog(resetDialog).apply { + getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getColor(R.color.colorTextSemanticRed)) + } + } } diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 4019ad94d09a284f93c939d3d7d603ee49e0c6fa..6ad547687b66f07e4a82a1b061c50aba7309cb30 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -271,7 +271,7 @@ <!-- XBUT: Share app link page button --> <string name="main_share_button">Download-Link versenden</string> <!-- YMSG: Message when sharing is executed --> - <string name="main_share_message">Gemeinsam Corona bekämpfen<xliff:g id="line_break">\n</xliff:g>Ich bin dabei. Du auch?<xliff:g id="line_break">\n</xliff:g><xliff:g id="link_play_store">https://www.coronawarn.app/</xliff:g><xliff:g id="line_break">\n</xliff:g></string> + <string name="main_share_message">Gemeinsam Corona bekämpfen<xliff:g id="line_break">\n</xliff:g>Ich bin dabei. Du auch?<xliff:g id="line_break">\n</xliff:g><xliff:g id="link_play_store">https://www.corona-warn-app.de</xliff:g><xliff:g id="line_break">\n</xliff:g></string> <!-- XACT: main (share) - illustraction description, explanation image --> <string name="main_share_illustration_description">Ein Mann teilt die Corona-Warn-App mit vier anderen Personen.</string> @@ -568,7 +568,14 @@ <string name="settings_reset_button_negative">Abbrechen</string> <!-- XACT: main (overview) - illustraction description, explanation image --> <string name="settings_reset_illustration_description">Eine Hand hält ein Smartphone, auf dem das Zurücksetzen der Anwendung symbolisiert wird.</string> - + <!-- XHED: settings(reset) - dialog headline todo finalize texts for dialog headline, body, cancel button, confirm button--> + <string name="settings_reset_dialog_headline">Anwendung zurücksetzen</string> + <!-- XTXT: settings(reset) - dialog content --> + <string name="settings_reset_dialog_body">Sie werden nicht mehr über Ihre Risiko-Begegnungen informiert und können andere Nutzerinnen und Nutzer nicht mehr warnen. Dieser Vorgang kann nicht rückgängig gemacht werden.</string> + <!-- XBUT: settings(reset) - dialog cancel --> + <string name="settings_reset_dialog_button_cancel">Abbrechen</string> + <!-- XBUT: settings(reset) - dialog confirm --> + <string name="settings_reset_dialog_button_confirm">Zurücksetzen</string> <!-- #################################### App Information diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml index 4003d8094e521f6e3591c8cce3d99ea7098a7ee8..b6cccdcff8bf26744c3c28b60a4bbdd5b8bbc480 100644 --- a/Corona-Warn-App/src/main/res/values/styles.xml +++ b/Corona-Warn-App/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ <style name="AppTheme" parent="Theme.AppCompat.DayNight"> <item name="colorPrimary">@color/colorBrandSecondary</item> - <item name="colorPrimaryDark">@color/colorAccentTintButtonPressed</item> + <item name="colorPrimaryDark">@color/colorStableDark</item> <item name="android:windowBackground">@color/colorBackground</item> <item name="alertDialogTheme">@style/dialog</item> </style>