From 4f2a4d1399fa62479c8a42b75469f3eff2c5f9ec Mon Sep 17 00:00:00 2001 From: Kevin Meyer Date: Tue, 16 Dec 2014 18:58:47 +0100 Subject: [PATCH] articleList: switch between Show All <-> Show Unread --- .../java/fr/gaulupeau/apps/Poche/ListArticles.java | 10 ++++++++-- app/src/main/res/menu/option_list.xml | 5 ++--- app/src/main/res/values-de/strings.xml | 5 +++++ app/src/main/res/values/strings.xml | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java index 898f859..0700086 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java @@ -59,7 +59,13 @@ public class ListArticles extends BaseActionBarActivity { return true; } - @Override + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + menu.findItem(R.id.menuShowAll).setTitle(getString(showAll ? R.string.menuShowUnread : R.string.menuShowAll)); + return true; + } + + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menuShowAll: @@ -83,7 +89,7 @@ public class ListArticles extends BaseActionBarActivity { } else { setupListAdapter(); } - setTitle("wallabag | " + readList.getCount() + " Articles"); + setTitle(getString(R.string.app_name) + " | " + getResources().getQuantityString(R.plurals.numberOfArticles, readList.getCount(), readList.getCount())); } private void setupListAdapter() { diff --git a/app/src/main/res/menu/option_list.xml b/app/src/main/res/menu/option_list.xml index 8b15da8..a4acce4 100644 --- a/app/src/main/res/menu/option_list.xml +++ b/app/src/main/res/menu/option_list.xml @@ -1,6 +1,5 @@ - - - + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dddcc4b..df5f0bb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,4 +21,9 @@ Dein Token: Fehler Fehler beim laden des Feeds + Ungelesene anzeigen + + %d Artikel + %d Artikel + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8f7bb4..41a3bd9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ Mark as Read Settings Show All + Show Unread Wipe Database Synchronize done ! Check Internet Connectivity ! @@ -21,4 +22,8 @@ Your Token: Error Error loading feed + + %d Article + %d Articles +