Temporarily opt ucrop activity out of Android 15 edge-to-edge

This should be reverted as soon as
https://github.com/Yalantis/uCrop/issues/913 is fixed

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased - 146
+
+- Ability to sort cards by start of validity
+
 ## v2.34.3 - 145 (2025-01-15)
 
 - Target Android 15

app/src/main/AndroidManifest.xml

@@ -179,7 +179,7 @@
 
         <activity
             android:name=".UCropWrapper"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/TempUCropAndroid15WorkaroundTheme" />
 
         <provider
             android:name=".contentprovider.CardsContentProvider"

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;
         }

app/src/main/res/values-v35/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>

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>

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>

app/src/main/res/values/themes.xml

@@ -1,4 +1,7 @@
 <resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+    </style>
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>

fastlane/metadata/android/en-US/changelogs/146.txt

@@ -0,0 +1 @@
+- Ability to sort cards by start of validity