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,9 +1,8 @@
 # Changelog
 
-## v2.34.4 - 146 (2025-01-17)
+## Unreleased - 146
 
 - Ability to sort cards by start of validity
-- Temporarily revert to targeting Android 14 to fix some UI issues
 
 ## v2.34.3 - 145 (2025-01-15)
 

app/build.gradle.kts

@@ -21,9 +21,9 @@ android {
     defaultConfig {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
-        targetSdk = 34
-        versionCode = 146
-        versionName = "2.34.4"
+        targetSdk = 35
+        versionCode = 145
+        versionName = "2.34.3"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

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/res/layout/barcode_selector_activity.xml

@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="fill_parent"

app/src/main/res/layout/import_export_activity.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                     android:layout_width="match_parent"
-                                                     android:layout_height="match_parent"
-                                                     android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"

app/src/main/res/layout/loyalty_card_view_layout.xml

@@ -8,7 +8,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -25,7 +26,8 @@
         android:layout_marginBottom="100dp"
         android:orientation="vertical"
         android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp">
+        android:layout_marginEnd="0dp"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:id="@+id/icon_container"
@@ -147,7 +149,8 @@
         android:id="@+id/fullscreen_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="false">
 
         <ImageView
             android:importantForAccessibility="no"
@@ -206,13 +209,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="?attr/colorPrimary"
-        app:contentInsetLeft="0dp"
-        app:contentInsetStart="0dp"
-        app:contentInsetRight="0dp"
-        app:contentInsetEnd="0dp"
-        app:fabAlignmentMode="center">
+        app:fabAlignmentMode="center"
+        app:fabCradleVerticalOffset="2dp"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layoutDirection="ltr">

app/src/main/res/layout/scan_activity.xml

@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout

app/src/main/res/values-bg/strings.xml

@@ -41,7 +41,7 @@
     <string name="removeImage">Премахване на изображение</string>
     <string name="takePhoto">Снимане</string>
     <string name="intent_import_card_from_url_share_multiple_text">Искам да споделя тези карти с вас</string>
-    <string name="wrongValueForBarcodeType">Стойността е неприемлива за избрания вид щрихкод</string>
+    <string name="wrongValueForBarcodeType">Стойноста е неприемлива за избрания щрихкод</string>
     <string name="setBarcodeId">Задаване на стойност</string>
     <string name="sameAsCardId">Като номера</string>
     <string name="barcodeId">Стойност на щрихкода</string>
@@ -308,5 +308,4 @@
     <string name="generic_error_please_retry">Съжаляваме, нещо се обърка, опитайте отново…</string>
     <string name="addFromPkpass">Изберете файл на Passbook (.pkpass)</string>
     <string name="unsupportedFile">Този вид файлове не се поддържат</string>
-    <string name="sort_by_valid_from">Начало валидност</string>
-</resources>
+</resources>

app/src/main/res/values-cs/strings.xml

@@ -314,5 +314,4 @@
     <string name="settings_column_count_7">7</string>
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_5">5</string>
-    <string name="sort_by_valid_from">Platnost od</string>
-</resources>
+</resources>

app/src/main/res/values-da/strings.xml

@@ -48,7 +48,7 @@
     <string name="settings_theme">Tema</string>
     <string name="settings">Indstillinger</string>
     <string name="starImage">Favorit stjerne</string>
-    <string name="thumbnailDescription">Thumbnail</string>
+    <string name="thumbnailDescription">Miniaturebillede til kort</string>
     <string name="selectBarcodeTitle">Vælg stregkode</string>
     <string name="app_copyright_old">Baseret på Loyalty Card Keychain
 \ncopyright © 2016-2020 Branden Archer.</string>
@@ -66,22 +66,22 @@
     <string name="noCardExistsError">Kunne ikke finde det kort</string>
     <string name="deleteConfirmationGroup">Slet gruppe\?</string>
     <string name="all">Alle</string>
-    <string name="noGroupCards">Denne gruppe er tom</string>
-    <string name="noGroups">Klik på + plus-knappen for at tilføje grupper til kategorisering.</string>
+    <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>
+    <string name="noGroups">Klik på + plus-knappen for først at tilføje grupper til kategorisering.</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Indtast gruppenavn</string>
-    <string name="exportSuccessful">Data eksporteret</string>
-    <string name="importSuccessful">Data importeret</string>
+    <string name="exportSuccessful">Eksporterede kortdata</string>
+    <string name="importSuccessful">Kortdata importeret</string>
     <string name="intent_import_card_from_url_share_text">Jeg vil dele et kort med jer</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
     <string name="settings_keep_screen_on">LHold skærm tændt</string>
     <string name="moveUp">Bevæg dig opad</string>
     <string name="leaveWithoutSaveConfirmation">Forlade uden at gemme\?</string>
-    <string name="settings_display_barcode_max_brightness">Gør skærm lysere</string>
+    <string name="settings_display_barcode_max_brightness">Lysere stregkodevisning</string>
     <string name="failedOpeningFileManager">Installer først en filhåndteringsprogram.</string>
     <string name="moveDown">Bevæger sig nedad</string>
     <string name="leaveWithoutSaveTitle">Afslut</string>
-    <string name="addManually">Indtast stregkoden manuelt</string>
+    <string name="addManually">Indtast kort-ID manuelt</string>
     <string name="noGiftCardsGroup">Opret kort og tildel dem gupper her.</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Slet dette <xliff:g>%d</xliff:g> kort permanent\?</item>
@@ -100,58 +100,4 @@
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_license">Copylefted libre software, GPLv3+ licens</string>
     <string name="barcodeImageDescriptionWithType">Billede<xliff:g>%s</xliff:g> stregkode</string>
-    <string name="group_name_already_in_use">Gruppenavn allerede i brug</string>
-    <string name="editGroup">Redigerer Gruppe: <xliff:g>%s</xliff:g></string>
-    <string name="importFidme">Importer fra FidMe</string>
-    <string name="settings_card_orientation">Skærm orientation</string>
-    <string name="settings_follow_system_orientation">Følg system</string>
-    <string name="settings_portrait_orientation">Portræt</string>
-    <string name="settings_landscape_orientation">Landskab</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Deaktiver låseskærm når et kort er åbent</string>
-    <string name="groupsList">Grupper: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Udløber: <xliff:g>%s</xliff:g></string>
-    <string name="moveBarcodeToTopOfScreen">Flyt stregkoden til toppen af skærmen</string>
-    <string name="accept">Acceptér</string>
-    <string name="importCatima">Importer fra Catima</string>
-    <string name="expiryDate">Udløbsdato</string>
-    <string name="never">Aldrig</string>
-    <string name="chooseExpiryDate">Vælg udløbsdato</string>
-    <string name="balance">Balance</string>
-    <string name="importStocard">Importer fra Stocard</string>
-    <string name="balanceSentence">Balance: <xliff:g>%s</xliff:g></string>
-    <string name="group_name_is_empty">Gruppenavn må ikke være tom</string>
-    <string name="group_updated">Gruppe opdateret</string>
-    <string name="card">Kort</string>
-    <string name="currency">Valuta</string>
-    <string name="settings_display_barcode_max_brightness_summary">Nødvendigt for nogle scannere til at fungerer</string>
-    <string name="editBarcode">Rediger stregkode</string>
-    <string name="points">Point</string>
-    <string name="privacy_policy">Privatlivspolitik</string>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kort</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kort</item>
-    </plurals>
-    <string name="settings_allow_content_provider_read_title">Tillid andre apps tilgang til min data</string>
-    <string name="settings_allow_content_provider_read_summary">Apps vil stadig have behov for at spørge om tilladelse for at få adgang</string>
-    <string name="barcodeId">Stregkode værdi</string>
-    <string name="setBarcodeId">Vælg stregkode værdi</string>
-    <string name="sameAsCardId">Samme som ID</string>
-    <string name="settings_system_theme">System</string>
-    <string name="settings_lock_on_opening_orientation">Lås til orientation når kort åbnes</string>
-    <string name="settings_keep_screen_on_summary">Deaktiver skærm tids slukning når et kort er åbent</string>
-    <string name="group_edit">Rediger gruppe</string>
-    <string name="settings_follow_sensor_orientation">Altid roter (ignorer system indstillinger)</string>
-    <string name="chooseImportType">Importer data fra</string>
-    <string name="importVoucherVault">Importer fra Voucher Vault</string>
-    <string name="settings_use_volume_keys_navigation">Skift kort ved brug af lydstyrke knapperne</string>
-    <string name="settings_use_volume_keys_navigation_summary">Brug lydstyrke knapperne til at ændre hvilket kort bliver vist</string>
-    <string name="addFromImage">Vælg et billede fra galleri</string>
-    <string name="expiryStateSentenceExpired">Udløbet: <xliff:g>%s</xliff:g></string>
-    <string name="noBarcodeFound">Ingen stregkode blev fundet</string>
-    <string name="errorReadingImage">Kunne ikke læse billedet</string>
-    <string name="balanceParsingFailed">Ugyldig balance</string>
-    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> point</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> point</item>
-    </plurals>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -163,7 +163,7 @@
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="sort_by">Sortieren nach</string>
-    <string name="sort_by_expiry">Gültig bis</string>
+    <string name="sort_by_expiry">Ablauf</string>
     <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
     <string name="sort_by_name">Name</string>
     <string name="sort">Sortieren</string>
@@ -305,5 +305,4 @@
     <string name="generic_error_please_retry">Entschuldigung, da ist etwas schief gelaufen, versuchen Sie es noch einmal ...</string>
     <string name="unsupportedFile">Diese Datei wird nicht unterstützt</string>
     <string name="addFromPkpass">Passbook-Datei (.pkpass) auswählen</string>
-    <string name="sort_by_valid_from">Gültig ab</string>
-</resources>
+</resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -307,5 +307,4 @@
     <string name="generic_error_please_retry">Λυπούμαστε, κάτι πήγε στραβά, δοκιμάστε ξανά...</string>
     <string name="unsupportedFile">Το αρχείο δεν υποστηρίζεται</string>
     <string name="addFromPkpass">Επιλογή αρχείου Passbook (.pkpass)</string>
-    <string name="sort_by_valid_from">Έναρξη ισχύος</string>
-</resources>
+</resources>

app/src/main/res/values-et/strings.xml

@@ -303,5 +303,4 @@
     <string name="generic_error_please_retry">Vabandust, midagi läks nüüd viltu, palun proovi uuesti...</string>
     <string name="unsupportedFile">See fail pole toetatud</string>
     <string name="addFromPkpass">Vali Passbooki fail (.pkpass)</string>
-    <string name="sort_by_valid_from">Kehtib alates</string>
-</resources>
+</resources>

app/src/main/res/values-gl/strings.xml

@@ -302,5 +302,4 @@
     <string name="unsupportedFile">Este ficheiro non é compatible</string>
     <string name="addFromPkpass">Selecciona un ficheiro Passbook (.pkpass)</string>
     <string name="generic_error_please_retry">Sentímolo, pero algo fallou, inténtao outra vez…</string>
-    <string name="sort_by_valid_from">Válido desde</string>
-</resources>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -308,5 +308,4 @@
     <string name="addFromPkpass">Kies een Passbook bestand (.pkpass)</string>
     <string name="unsupportedFile">Dit bestand wordt niet ondersteund</string>
     <string name="generic_error_please_retry">Sorry, er ging iets mis. Probeer het opnieuw.</string>
-    <string name="sort_by_valid_from">Op geldig vanaf</string>
-</resources>
+</resources>

app/src/main/res/values-ru/strings.xml

@@ -320,5 +320,4 @@
     <string name="unsupportedFile">Данный файл не поддерживается</string>
     <string name="addFromPkpass">Выбрать файл Passbook (.pkpass)</string>
     <string name="generic_error_please_retry">Извините, что-то пошло не так, попробуйте ещё раз…</string>
-    <string name="sort_by_valid_from">Начало действия</string>
-</resources>
+</resources>

app/src/main/res/values-uk/strings.xml

@@ -319,5 +319,4 @@
     <string name="unsupportedFile">Цей файл не підтримується</string>
     <string name="generic_error_please_retry">Вибачте, щось пішло не так, спробуйте ще раз...</string>
     <string name="addFromPkpass">Виберіть файл Passbook (.pkpass)</string>
-    <string name="sort_by_valid_from">Діє з</string>
-</resources>
+</resources>

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-zh-rCN/strings.xml

@@ -302,5 +302,4 @@
     <string name="addFromPkpass">选择 Passbook 文件（.pkpass）</string>
     <string name="unsupportedFile">此文件不受支持</string>
     <string name="generic_error_please_retry">抱歉，某个东西出错了，请再试…</string>
-    <string name="sort_by_valid_from">有效期开始日</string>
-</resources>
+</resources>

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>
@@ -31,6 +34,7 @@
         <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
 
         <item name="windowActionModeOverlay">true</item>
+
     </style>
 
     <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">

fastlane/metadata/android/cs-CZ/changelogs/145.txt

@@ -1,3 +1 @@
 - Cíl Android 15
-- Oprava klávesnice zakrývající tlačítko pro uložení na obrazovce úprav
-- Oprava některých souborů pkpass, které nejsou detekovány jako pkpass (podpora typu mime application/vnd-com.apple.pkpass)

fastlane/metadata/android/cs-CZ/changelogs/146.txt

@@ -1 +0,0 @@
-- Možnost třídit karty podle začátku platnosti

fastlane/metadata/android/de-DE/changelogs/146.txt

@@ -1 +0,0 @@
-- Ermöglicht Kartensortierung nach „Beginn der Gültigkeit“

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

@@ -1,2 +1 @@
-- Ability to sort cards by start of validity
-- Temporarily revert to targeting Android 14 to fix some UI issues
+- Ability to sort cards by start of validity

fastlane/metadata/android/ru-RU/changelogs/146.txt

@@ -1 +0,0 @@
-- Возможность сортировки карт по началу действия

fastlane/metadata/android/uk/changelogs/146.txt

@@ -1 +0,0 @@
-- Можливість сортування карток за терміном дії

fastlane/metadata/android/zh-CN/changelogs/146.txt

@@ -1 +0,0 @@
-- 可以根据有效期开始日排序卡片