From 1d0c1e82fa7a62167813e4e1896a94b1f0a6529e Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 30 Sep 2018 22:58:09 +0200 Subject: [PATCH] Add "Reset all warnings" menu item --- .../java/eu/depau/etchdroid/activities/ActivityBase.kt | 8 ++++++++ .../eu/depau/etchdroid/activities/ConfirmationActivity.kt | 1 - .../java/eu/depau/etchdroid/activities/StartActivity.kt | 1 - app/src/main/res/menu/menu_main.xml | 6 ++++++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt b/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt index 4811550..d443cdc 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt +++ b/app/src/main/java/eu/depau/etchdroid/activities/ActivityBase.kt @@ -6,11 +6,13 @@ import android.view.Menu import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import eu.depau.etchdroid.R +import eu.depau.etchdroid.kotlin_exts.toast import eu.depau.etchdroid.utils.NightModeHelper abstract class ActivityBase : AppCompatActivity() { protected lateinit var nightModeHelper: NightModeHelper + val DISMISSED_DIALOGS_PREFS = "dismissed_dialogs" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -33,6 +35,12 @@ abstract class ActivityBase : AppCompatActivity() { startActivity(intent) return true } + R.id.action_reset_warnings -> { + getSharedPreferences(DISMISSED_DIALOGS_PREFS, 0) + .edit().clear().apply() + toast(getString(R.string.warnings_reset)) + return true + } R.id.action_nightmode -> { nightModeHelper.toggle() return true diff --git a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt index 69b2c4e..51665c6 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/activities/ConfirmationActivity.kt @@ -21,7 +21,6 @@ import java.io.IOException class ConfirmationActivity : ActivityBase() { var canContinue: Boolean = false var issuesFound: String? = null - val DISMISSED_DIALOGS_PREFS = "dismissed_dialogs" var shouldShowDataLossAlertDialog: Boolean get() { diff --git a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt index 331c267..a5c611a 100644 --- a/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/activities/StartActivity.kt @@ -25,7 +25,6 @@ class StartActivity : ActivityBase() { val TAG = "StartActivity" val READ_REQUEST_CODE = 42 val READ_EXTERNAL_STORAGE_PERMISSION = 29 - val DISMISSED_DIALOGS_PREFS = "dismissed_dialogs" var delayedButtonClicked: Boolean = false var shouldShowDMGAlertDialog: Boolean diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index ba5e38f..346a65c 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -13,4 +13,10 @@ android:orderInCategory="100" android:title="@string/nightmode" app:showAsAction="never"/> + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e6e84d8..0ed0bd0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -106,4 +106,6 @@ Attiva modalità notturna Bug di Android Pie A causa di un bug di Android 9, alcune scritture potrebbero fallire.\nSe appare un messaggio di errore \"Scrittura fallita\", riavvia il dispositivo e prova di nuovo. + Reimposta tutti gli avvisi + Tutti gli avvisi sono stati ripristinati \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 066ad9e..0f7a439 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -105,4 +105,6 @@ Enable night mode Android Pie bug There is a bug on Android 9 which causes some writes to fail.\nIf it says \"Write failed\", reboot your device and try again. + Reset all warnings + All warning dialogs restored