diff options
| author | bananeweizen <bananeweizen@gmx.de> | 2011-10-31 19:09:03 +0100 |
|---|---|---|
| committer | bananeweizen <bananeweizen@gmx.de> | 2011-10-31 19:09:03 +0100 |
| commit | 28f8b812092ebe6015a53f0f60bc838ffe24f270 (patch) | |
| tree | 04abf5e15452e37f849ea828aa3edb1c1970a9f1 /main | |
| parent | 1459c2d315472a06216e56a577f57160c3a6acb1 (diff) | |
| download | cgeo-28f8b812092ebe6015a53f0f60bc838ffe24f270.zip cgeo-28f8b812092ebe6015a53f0f60bc838ffe24f270.tar.gz cgeo-28f8b812092ebe6015a53f0f60bc838ffe24f270.tar.bz2 | |
new: cache count after "more caches" label, fixes #730
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeocaches.java | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 8d9342d..5652a4f 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -248,9 +248,10 @@ <!-- caches --> <string name="caches_no_cache">There is no cache</string> - <string name="caches_more_caches">Not enough? Get more caches!</string> - <string name="caches_more_caches_no">That\'s all. No more caches.</string> + <string name="caches_more_caches">Load more caches</string> + <string name="caches_more_caches_no">No more caches</string> <string name="caches_more_caches_loading">Loading caches…</string> + <string name="caches_more_caches_currently">currently</string> <string name="caches_downloading">Downloading caches…\nETA: </string> <string name="caches_eta_ltm">Less than a minute</string> <string name="caches_eta_mins"> minutes</string> diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 7b78459..ed9f583 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -1422,19 +1422,18 @@ public class cgeocaches extends AbstractListActivity { return; } - if (!more) { + if (more) { + listFooterText.setText(res.getString(R.string.caches_more_caches) + " (" + res.getString(R.string.caches_more_caches_currently) + ": " + cacheList.size() + ")"); + listFooter.setOnClickListener(new moreCachesListener()); + } else { if (CollectionUtils.isEmpty(cacheList)) { listFooterText.setText(res.getString(R.string.caches_no_cache)); } else { listFooterText.setText(res.getString(R.string.caches_more_caches_no)); } - listFooter.setClickable(false); listFooter.setOnClickListener(null); - } else { - listFooterText.setText(res.getString(R.string.caches_more_caches)); - listFooter.setClickable(true); - listFooter.setOnClickListener(new moreCachesListener()); } + listFooter.setClickable(more); } private void init() { |