From 9a1d7d2e44a3d378fa9dbc8ef90547560f404321 Mon Sep 17 00:00:00 2001
From: Christos Tsingiropoylos <74056133+tsiggi@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:01:25 +0200
Subject: [PATCH] Sort by valid from date (#2297)

---
 app/src/main/java/protect/card_locker/DBHelper.java | 5 +++++
 app/src/main/res/values/arrays.xml                  | 1 +
 app/src/main/res/values/strings.xml                 | 1 +
 3 files changed, 7 insertions(+)

diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 418e517c9..ea244e688 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -70,6 +70,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public enum LoyaltyCardOrder {
         Alpha,
         LastUsed,
+        ValidFrom,
         Expiry
     }
 
@@ -916,6 +917,10 @@ public class DBHelper extends SQLiteOpenHelper {
             return LoyaltyCardDbIds.LAST_USED;
         }
 
+        if (order == LoyaltyCardOrder.ValidFrom) {
+            return LoyaltyCardDbIds.VALID_FROM;
+        }
+
         if (order == LoyaltyCardOrder.Expiry) {
             return LoyaltyCardDbIds.EXPIRY;
         }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e354b719a..bc2a62402 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -11,6 +11,7 @@
     <string-array name="sort_types_array">
         <item>@string/sort_by_name</item>
         <item>@string/sort_by_most_recently_used</item>
+        <item>@string/sort_by_valid_from</item>
         <item>@string/sort_by_expiry</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f09ac5aa..f25001e04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -255,6 +255,7 @@
     <string name="barcodeLongPressMessage">Only images can be opened in the gallery app</string>
     <string name="sort_by_name">Name</string>
     <string name="sort_by_most_recently_used">Most Recently Used</string>
+    <string name="sort_by_valid_from">Valid From</string>
     <string name="sort_by_expiry">Expiry</string>
     <!-- \"Reversed order\" is also OK. This is an option in the card sorting list -->
     <string name="reverse">…in reversed order</string>