From ad72cb6f560549a26688ea227e2da468f4381376 Mon Sep 17 00:00:00 2001 From: aminecmi Date: Fri, 30 Jun 2023 20:37:43 +0200 Subject: [PATCH] feat: Added confirmation dialog for disconnect item menu. --- .../apps/readerforselfossv2/android/HomeActivity.kt | 12 +++++++----- androidApp/src/main/res/values-ca-rES/strings.xml | 2 ++ androidApp/src/main/res/values-de-rDE/strings.xml | 2 ++ androidApp/src/main/res/values-es-rES/strings.xml | 2 ++ androidApp/src/main/res/values-fa-rIR/strings.xml | 2 ++ androidApp/src/main/res/values-fr-rFR/strings.xml | 2 ++ androidApp/src/main/res/values-gl-rES/strings.xml | 2 ++ androidApp/src/main/res/values-in-rID/strings.xml | 2 ++ androidApp/src/main/res/values-it-rIT/strings.xml | 2 ++ androidApp/src/main/res/values-ko-rKR/strings.xml | 2 ++ androidApp/src/main/res/values-nl-rNL/strings.xml | 2 ++ androidApp/src/main/res/values-pt-rBR/strings.xml | 2 ++ androidApp/src/main/res/values-pt-rPT/strings.xml | 2 ++ androidApp/src/main/res/values-si-rLK/strings.xml | 2 ++ androidApp/src/main/res/values-tr-rTR/strings.xml | 2 ++ androidApp/src/main/res/values-zh-rCN/strings.xml | 2 ++ androidApp/src/main/res/values-zh-rTW/strings.xml | 2 ++ androidApp/src/main/res/values/strings.xml | 2 ++ 18 files changed, 41 insertions(+), 5 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt index ab4d547..3a2a84f 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt @@ -599,12 +599,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar return true } R.id.action_disconnect -> { - runBlocking { - repository.logout() + needsConfirmation(R.string.confirm_disconnect_title, R.string.confirm_disconnect_description) { + runBlocking { + repository.logout() + } + val intent = Intent(this, LoginActivity::class.java) + this.startActivity(intent) + finish() } - val intent = Intent(this, LoginActivity::class.java) - this.startActivity(intent) - finish() return true } R.id.action_settings -> { diff --git a/androidApp/src/main/res/values-ca-rES/strings.xml b/androidApp/src/main/res/values-ca-rES/strings.xml index 67949a0..be27994 100644 --- a/androidApp/src/main/res/values-ca-rES/strings.xml +++ b/androidApp/src/main/res/values-ca-rES/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-de-rDE/strings.xml b/androidApp/src/main/res/values-de-rDE/strings.xml index 0ec144a..036dcb9 100644 --- a/androidApp/src/main/res/values-de-rDE/strings.xml +++ b/androidApp/src/main/res/values-de-rDE/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-es-rES/strings.xml b/androidApp/src/main/res/values-es-rES/strings.xml index f8cc8e6..9f9f902 100644 --- a/androidApp/src/main/res/values-es-rES/strings.xml +++ b/androidApp/src/main/res/values-es-rES/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-fa-rIR/strings.xml b/androidApp/src/main/res/values-fa-rIR/strings.xml index f5967ef..d4951bb 100644 --- a/androidApp/src/main/res/values-fa-rIR/strings.xml +++ b/androidApp/src/main/res/values-fa-rIR/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-fr-rFR/strings.xml b/androidApp/src/main/res/values-fr-rFR/strings.xml index 21c972a..d99f94e 100644 --- a/androidApp/src/main/res/values-fr-rFR/strings.xml +++ b/androidApp/src/main/res/values-fr-rFR/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-gl-rES/strings.xml b/androidApp/src/main/res/values-gl-rES/strings.xml index 18cde05..d32b7d1 100644 --- a/androidApp/src/main/res/values-gl-rES/strings.xml +++ b/androidApp/src/main/res/values-gl-rES/strings.xml @@ -128,4 +128,6 @@ Esta aplicación só funciona cunha instancia de Selfoss, e con ningún outro filtro RSS. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-in-rID/strings.xml b/androidApp/src/main/res/values-in-rID/strings.xml index 35c8aef..0f48e73 100644 --- a/androidApp/src/main/res/values-in-rID/strings.xml +++ b/androidApp/src/main/res/values-in-rID/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-it-rIT/strings.xml b/androidApp/src/main/res/values-it-rIT/strings.xml index 9c5a95f..5b28be0 100644 --- a/androidApp/src/main/res/values-it-rIT/strings.xml +++ b/androidApp/src/main/res/values-it-rIT/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-ko-rKR/strings.xml b/androidApp/src/main/res/values-ko-rKR/strings.xml index bd2e722..e155386 100644 --- a/androidApp/src/main/res/values-ko-rKR/strings.xml +++ b/androidApp/src/main/res/values-ko-rKR/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-nl-rNL/strings.xml b/androidApp/src/main/res/values-nl-rNL/strings.xml index f57a72b..21b72a2 100644 --- a/androidApp/src/main/res/values-nl-rNL/strings.xml +++ b/androidApp/src/main/res/values-nl-rNL/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-pt-rBR/strings.xml b/androidApp/src/main/res/values-pt-rBR/strings.xml index cdcb12b..a13d2dd 100644 --- a/androidApp/src/main/res/values-pt-rBR/strings.xml +++ b/androidApp/src/main/res/values-pt-rBR/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-pt-rPT/strings.xml b/androidApp/src/main/res/values-pt-rPT/strings.xml index a77e8a7..84bdc30 100644 --- a/androidApp/src/main/res/values-pt-rPT/strings.xml +++ b/androidApp/src/main/res/values-pt-rPT/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-si-rLK/strings.xml b/androidApp/src/main/res/values-si-rLK/strings.xml index bc46c4b..a6fcab7 100644 --- a/androidApp/src/main/res/values-si-rLK/strings.xml +++ b/androidApp/src/main/res/values-si-rLK/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-tr-rTR/strings.xml b/androidApp/src/main/res/values-tr-rTR/strings.xml index be4fa36..8cd2816 100644 --- a/androidApp/src/main/res/values-tr-rTR/strings.xml +++ b/androidApp/src/main/res/values-tr-rTR/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-zh-rCN/strings.xml b/androidApp/src/main/res/values-zh-rCN/strings.xml index 5cd071d..9198954 100644 --- a/androidApp/src/main/res/values-zh-rCN/strings.xml +++ b/androidApp/src/main/res/values-zh-rCN/strings.xml @@ -128,4 +128,6 @@ 此应用只适用于 Selfoss 实例,不适用于其他 RSS 。 更新源 + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values-zh-rTW/strings.xml b/androidApp/src/main/res/values-zh-rTW/strings.xml index 523da1f..45c006d 100644 --- a/androidApp/src/main/res/values-zh-rTW/strings.xml +++ b/androidApp/src/main/res/values-zh-rTW/strings.xml @@ -128,4 +128,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance. diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index ab8b0bf..fc9504e 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -131,4 +131,6 @@ This app only works with a Selfoss instance, and no other RSS feed. Sources Update source + Disconnect ? + You will be disconnected from your selfoss instance.