From 44feb7c26d85435843074039e055be577d3206f5 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 15 Aug 2018 11:34:21 +0000 Subject: [PATCH] Show "to do" for accounts, identities and permissions Fixes #18 --- .../main/java/eu/faircode/email/FragmentSetup.java | 12 ++++++------ app/src/main/res/values-af/strings.xml | 2 +- app/src/main/res/values-ar-rBH/strings.xml | 2 +- app/src/main/res/values-ar-rEG/strings.xml | 2 +- app/src/main/res/values-ar-rSA/strings.xml | 2 +- app/src/main/res/values-ar-rYE/strings.xml | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-es-rES/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv-rSE/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 38 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index cd4e4636..f14c1386 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -141,9 +141,9 @@ public class FragmentSetup extends FragmentEx { pbAccount.setVisibility(View.GONE); pbIdentity.setVisibility(View.GONE); - tvAccountDone.setVisibility(View.INVISIBLE); - tvIdentityDone.setVisibility(View.INVISIBLE); - tvPermissionsDone.setVisibility(View.INVISIBLE); + tvAccountDone.setText(R.string.title_setup_to_do); + tvIdentityDone.setText(R.string.title_setup_to_do); + tvPermissionsDone.setText(R.string.title_setup_to_do); int[] grantResults = new int[permissions.length]; for (int i = 0; i < permissions.length; i++) @@ -195,14 +195,14 @@ public class FragmentSetup extends FragmentEx { db.account().liveAccounts(true).observe(getViewLifecycleOwner(), new Observer>() { @Override public void onChanged(@Nullable List accounts) { - tvAccountDone.setVisibility(accounts != null && accounts.size() > 0 ? View.VISIBLE : View.INVISIBLE); + tvAccountDone.setText(accounts != null && accounts.size() > 0 ? R.string.title_setup_done : R.string.title_setup_to_do); } }); db.identity().liveIdentities(true).observe(getViewLifecycleOwner(), new Observer>() { @Override public void onChanged(@Nullable List identities) { - tvIdentityDone.setVisibility(identities != null && identities.size() > 0 ? View.VISIBLE : View.INVISIBLE); + tvIdentityDone.setText(identities != null && identities.size() > 0 ? R.string.title_setup_done : R.string.title_setup_to_do); } }); } @@ -217,6 +217,6 @@ public class FragmentSetup extends FragmentEx { } btnPermissions.setEnabled(!has); - tvPermissionsDone.setVisibility(has ? View.VISIBLE : View.INVISIBLE); + tvPermissionsDone.setText(has ? R.string.title_setup_done : R.string.title_setup_to_do); } } diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 48caffdf..f0db2561 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -59,8 +59,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 48caffdf..f0db2561 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -59,8 +59,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 48caffdf..f0db2561 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -59,8 +59,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 48caffdf..f0db2561 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -59,8 +59,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 48caffdf..f0db2561 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -59,8 +59,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bcc5b6c3..42a78372 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 751028a8..0a402653 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -43,8 +43,8 @@ Um E-Mails zu senden Berechtigungen erteilen Um Adressen zu autovervollständigen (optional) + To do Fertig - Gewährt Dunkles Thema Debug Your name diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 6fb73122..4828a5ab 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 6fb73122..4828a5ab 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7086ea5d..f5447e19 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -39,8 +39,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7086ea5d..f5447e19 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -39,8 +39,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bcc5b6c3..42a78372 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ecc831c8..80023334 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -43,8 +43,8 @@ Para enviar e-mail Garantir permissões To autocomplete addresses (optional) + To do Feito - Granted Tema escuro Depurar Your name diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 791e832e..9eded870 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -47,8 +47,8 @@ Pentru a trimite e-mail Acordă permisiuni To autocomplete addresses (optional) + To do Gata - Granted Temă întunecată Depanare Your name diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bcc5b6c3..42a78372 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index fd993f80..a7815561 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -47,8 +47,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 795acffc..978f4f9f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -43,8 +43,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bcc5b6c3..42a78372 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -51,8 +51,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 7086ea5d..f5447e19 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -39,8 +39,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7086ea5d..f5447e19 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -39,8 +39,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7086ea5d..f5447e19 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -39,8 +39,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug Your name diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87b7d2f1..466e0ec7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,8 +57,8 @@ To send email Grant permissions To autocomplete addresses (optional) + To do Done - Granted Dark theme Debug