From 3f33509b2c3f219ba7db57c76588668ebeb10ac1 Mon Sep 17 00:00:00 2001
From: campbeb <bpcampbell@gmail.com>
Date: Sat, 9 Jun 2012 09:34:29 +0900
Subject: Allow sorting by date logged in lists

---
 main/res/values-cs/strings.xml                                | 2 +-
 main/res/values-de/strings.xml                                | 2 +-
 main/res/values-es/strings.xml                                | 2 +-
 main/res/values-fr/strings.xml                                | 2 +-
 main/res/values-hu/strings.xml                                | 2 +-
 main/res/values-it/strings.xml                                | 2 +-
 main/res/values-ja/strings.xml                                | 2 +-
 main/res/values-nl/strings.xml                                | 2 +-
 main/res/values-pl/strings.xml                                | 2 +-
 main/res/values-pt/strings.xml                                | 2 +-
 main/res/values-sk/strings.xml                                | 2 +-
 main/res/values-sv/strings.xml                                | 2 +-
 main/res/values/strings.xml                                   | 3 ++-
 main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java | 3 ++-
 main/src/cgeo/geocaching/sorting/VisitComparator.java         | 2 +-
 15 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'main')

diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index e2e0c2e..45eb519 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -217,7 +217,7 @@
   <string name="caches_sort_rating">Hodnocení</string>
   <string name="caches_sort_vote">Hlasy (vaše vlastní hodnocení)</string>
   <string name="caches_sort_inventory">Počet položek v inventáři</string>
-  <string name="caches_sort_date">Datum</string>
+  <string name="caches_sort_date_hidden">Datum</string>
   <string name="caches_sort_finds">Počet nálezů</string>
   <string name="caches_sort_state">Stav</string>
   <string name="caches_sort_storage">Datum uložení do zařízení</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 793f798..1b65807 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -284,7 +284,7 @@
   <string name="caches_sort_rating">Bewertung</string>
   <string name="caches_sort_vote">Eigene Bewertung</string>
   <string name="caches_sort_inventory">Inventaranzahl</string>
-  <string name="caches_sort_date">Datum</string>
+  <string name="caches_sort_date_hidden">Datum</string>
   <string name="caches_sort_finds">Funde</string>
   <string name="caches_sort_state">Status</string>
   <string name="caches_sort_storage">Speicherdatum</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index bc68aeb..c64468a 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -257,7 +257,7 @@
   <string name="caches_sort_rating">valoración</string>
   <string name="caches_sort_vote">votar (valoración propia)</string>
   <string name="caches_sort_inventory">recuento de inventario</string>
-  <string name="caches_sort_date">fecha</string>
+  <string name="caches_sort_date_hidden">fecha</string>
   <string name="caches_select_mode">Modo selección</string>
   <string name="caches_select_mode_exit">Salir de modo selección</string>
   <string name="caches_select_invert">Invertir selección</string>  
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index a1a8ff4..f18996a 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -284,7 +284,7 @@
   <string name="caches_sort_rating">note</string>
   <string name="caches_sort_vote">vote (note perso)</string>
   <string name="caches_sort_inventory">nombre d\'objets dans l\'inventaire</string>
-  <string name="caches_sort_date">date</string>
+  <string name="caches_sort_date_hidden">date</string>
   <string name="caches_sort_finds">trouvées</string>
   <string name="caches_sort_state">état</string>
   <string name="caches_sort_storage">date de sauvegarde dans l\'appareil</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index a298d15..c86c333 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -260,7 +260,7 @@
   <string name="caches_sort_rating">osztályzat</string>
   <string name="caches_sort_vote">szavazat (saját osztályzat)</string>
   <string name="caches_sort_inventory">tárgyak száma</string>
-  <string name="caches_sort_date">dátum</string>
+  <string name="caches_sort_date_hidden">dátum</string>
   <string name="caches_sort_finds">megtalálások</string>
   <string name="caches_sort_state">állapot</string>
   <string name="caches_select_mode">Kiválsztó mód</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 1257659..0075fbc 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -284,7 +284,7 @@
   <string name="caches_sort_rating">Voto</string>
   <string name="caches_sort_vote">Il tuo voto</string>
   <string name="caches_sort_inventory">Oggetti trackables</string>
-  <string name="caches_sort_date">Data</string>
+  <string name="caches_sort_date_hidden">Data</string>
   <string name="caches_sort_finds">Numero ritrovamenti</string>
   <string name="caches_sort_state">Stato</string>
   <string name="caches_sort_storage">Data salvataggio</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index e4e6ac5..18248bc 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -283,7 +283,7 @@
   <string name="caches_sort_rating">評価</string>
   <string name="caches_sort_vote">Vote (Own Rating)</string>
   <string name="caches_sort_inventory">目録の数</string>
-  <string name="caches_sort_date">日付</string>
+  <string name="caches_sort_date_hidden">日付</string>
   <string name="caches_sort_finds">Finds</string>
   <string name="caches_sort_state">State</string>
   <string name="caches_sort_storage">オフライン用に保存した日時</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index fc576ab..34e4774 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -278,7 +278,7 @@
   <string name="caches_sort_rating">waardering</string>
   <string name="caches_sort_vote">stemmen (eigen waardering)</string>
   <string name="caches_sort_inventory">aantal items</string>
-  <string name="caches_sort_date">datum</string>
+  <string name="caches_sort_date_hidden">datum</string>
   <string name="caches_sort_finds">Aantal keer gevonden</string>
   <string name="caches_sort_state">staat</string>
   <string name="caches_select_mode">Selectie modus</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 9c91fba..45b6c3d 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -254,7 +254,7 @@
   <string name="caches_sort_rating">oceny</string>
   <string name="caches_sort_vote">głosów (twoja ocena)</string>
   <string name="caches_sort_inventory">ilości w inwentarzu</string>
-  <string name="caches_sort_date">daty</string>
+  <string name="caches_sort_date_hidden">daty</string>
   <string name="caches_select_mode">Tryb wyboru</string>
   <string name="caches_select_mode_exit">Wyjście z trybu wyboru</string>
   <string name="caches_select_invert">Odwróć zaznaczenie</string>  
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 2262d70..930726e 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -273,7 +273,7 @@
   <string name="caches_sort_rating">pontuação</string>
   <string name="caches_sort_vote">votos (pontuação própria)</string>
   <string name="caches_sort_inventory">somatório do inventário</string>
-  <string name="caches_sort_date">data</string>
+  <string name="caches_sort_date_hidden">data</string>
   <string name="caches_sort_finds">Encontradas</string>
   <string name="caches_sort_state">Estado</string>
   <string name="caches_select_mode">Modo de selecção</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index c522735..2164c53 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -283,7 +283,7 @@
   <string name="caches_sort_rating">hodnotenia</string>
   <string name="caches_sort_vote">hlasovania (vlastného hodn.)</string>
   <string name="caches_sort_inventory">počtu položiek v skrýši</string>
-  <string name="caches_sort_date">dátumu</string>
+  <string name="caches_sort_date_hidden">dátumu</string>
   <string name="caches_sort_finds">nájdení</string>
   <string name="caches_sort_state">stavu</string>
   <string name="caches_sort_storage">dátumu uloženia v zariadení</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 68410e2..b997e90 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -282,7 +282,7 @@
   <string name="caches_sort_rating">Betyg (GC-vote)</string>
   <string name="caches_sort_vote">Betyg (eget)</string>
   <string name="caches_sort_inventory">Antal trackable</string>
-  <string name="caches_sort_date">Datum</string>
+  <string name="caches_sort_date_hidden">Datum</string>
   <string name="caches_sort_finds">Antal som hittat</string>
   <string name="caches_sort_state">Status</string>
   <string name="caches_sort_storage">Tid för sparandet i enheten</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index e5dd8d8..f029970 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -285,7 +285,8 @@
   <string name="caches_sort_rating">Rating</string>
   <string name="caches_sort_vote">Vote (Own Rating)</string>
   <string name="caches_sort_inventory">Count of Inventory</string>
-  <string name="caches_sort_date">Date</string>
+  <string name="caches_sort_date_hidden">Date Hidden</string>
+  <string name="caches_sort_date_logged">Date Logged</string>
   <string name="caches_sort_finds">Finds</string>
   <string name="caches_sort_state">State</string>
   <string name="caches_sort_storage">Date stored on device</string>
diff --git a/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java b/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java
index 247bb3b..7497392 100644
--- a/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java
+++ b/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java
@@ -49,7 +49,8 @@ public class ComparatorUserInterface {
         register(R.string.caches_sort_rating, RatingComparator.class);
         register(R.string.caches_sort_vote, VoteComparator.class);
         register(R.string.caches_sort_inventory, InventoryComparator.class);
-        register(R.string.caches_sort_date, DateComparator.class);
+        register(R.string.caches_sort_date_hidden, DateComparator.class);
+        register(R.string.caches_sort_date_logged, VisitComparator.class);
         register(R.string.caches_sort_finds, FindsComparator.class);
         register(R.string.caches_sort_state, StateComparator.class);
         register(R.string.caches_sort_storage, StorageTimeComparator.class);
diff --git a/main/src/cgeo/geocaching/sorting/VisitComparator.java b/main/src/cgeo/geocaching/sorting/VisitComparator.java
index 548ec7a..46d8c58 100644
--- a/main/src/cgeo/geocaching/sorting/VisitComparator.java
+++ b/main/src/cgeo/geocaching/sorting/VisitComparator.java
@@ -10,7 +10,7 @@ public class VisitComparator extends AbstractCacheComparator {
 
     @Override
     protected boolean canCompare(final cgCache cache1, final cgCache cache2) {
-        return cache1.getVisitedDate() > 0 && cache2.getVisitedDate() > 0;
+        return true;
     }
 
     @Override
-- 
cgit v1.1