Re-enable missingQuantity lint checks

https://github.com/WeblateOrg/weblate/issues/7520

.github/workflows/gradle-update.yml

@@ -1,33 +0,0 @@
-name: Gradle update
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '3 6 * * *'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  gradle-update:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.2.2
-    - uses: obfusk/gradle-update-action@v3.0.0
-      id: gradle-update
-    - uses: gradle/actions/wrapper-validation@v4
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
-      with:
-        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
-        branch-suffix: timestamp

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased - 150
+
+- Made it harder to accidentally close edit view
+
 ## v2.35.1 - 149 (2025-06-17)
 
 - Dependency and translation updates

Gemfile.lock

@@ -10,26 +10,26 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
+    aws-eventstream (1.4.0)
-    aws-partitions (1.1105.0)
+    aws-partitions (1.1117.0)
-    aws-sdk-core (3.224.0)
+    aws-sdk-core (3.226.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.101.0)
+    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.186.1)
+    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
+    base64 (0.3.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -58,10 +58,10 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -71,7 +71,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.2)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -158,7 +158,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.0)
+    json (2.12.2)
     jwt (2.10.1)
       base64
     logger (1.7.0)
@@ -168,14 +168,14 @@ GEM
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.2.1)
+    naturally (2.3.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
     ostruct (0.6.1)
     plist (3.7.2)
     public_suffix (6.0.2)
-    rake (13.2.1)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)

app/build.gradle.kts

@@ -132,7 +132,7 @@ dependencies {
     val junitVersion = "4.13.2"
     testImplementation("androidx.test:core:$androidXTestVersion")
     testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.14.1")
+    testImplementation("org.robolectric:robolectric:4.15.1")
 
     androidTestImplementation("androidx.test:core:$androidXTestVersion")
     androidTestImplementation("junit:junit:$junitVersion")

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -24,6 +24,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -680,7 +681,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
             @Override
             public void handleOnBackPressed() {
-                askBeforeQuitIfChanged();
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                View view = getCurrentFocus();
+                if (view != null && imm.isAcceptingText()) {
+                    imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+                    view.clearFocus();
+                }
+                else {
+                    askBeforeQuitIfChanged();
+                }
             }
         });
     }
@@ -1514,7 +1523,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
-            askBeforeQuitIfChanged();
+            getOnBackPressedDispatcher().onBackPressed();
             return true;
         }
 

app/src/main/java/protect/card_locker/Utils.java

@@ -594,6 +594,11 @@ public class Utils {
         double width = bitmap.getWidth();
         double height = bitmap.getHeight();
 
+        // Early exit
+        if (Math.max(width, height) <= maxSize) {
+            return bitmap;
+        }
+
         if (height > width) {
             double scale = height / maxSize;
             height = maxSize;

app/src/main/res/raw/contributors.txt

@@ -22,22 +22,22 @@ Joel A
 Petr Novák
 laralem
 Priit Jõerüüt
+Silvério Santos
 Taco
 Edgars Andersons
 nadiafekihahmed
 pfaffenrodt
 Aayush Gupta
 Scrambled777
-Silvério Santos
 ikanakova
 Giovanni Donisi
 HudobniVolk
-Jiri Grönroos
 Nyatsuki
+Jiri Grönroos
 Samantaz Fox
-josé m
-Milo Ivir
 Balázs Meskó
+Milo Ivir
+josé m
 Arno-github
 Ankit Tiwari
 Cliff Heraldo
@@ -49,30 +49,30 @@ Milan Šalka
 huuhaa
 Skrripy
 Kachelkaiser
+Fjuro
 Projjal Moitra
 Quentin PAGÈS
 Vasilis
 ngocanhtve
 waffshappen
 Marnick L'Eau
-Fjuro
 Robin
 JungHee Lee
 hajertabbane
 Ziad OUALHADJ
-Denis Shilin
+Warder
+GitSpoon
 Robin Liu
 Renko
+Denis Shilin
 しいたけ
 Alexander Ivanov
-Miha Frangež
 Viet Nguyen Hoang
+Miha Frangež
 stavpup
 ehrt74
-Warder
 Virginie
 Tim Trek
-GitSpoon
 Ricky Tigg
 Peter Dave Hello
 Michael Gangolf
@@ -81,6 +81,6 @@ Kim Seohyun
 Govind S Nair
 Freddo espresso
 Augustin LAVILLE
+Aliaksandr Trush
 arshbeerSingh
 MisterCosta96
-Aliaksandr Trush

app/src/main/res/values-in-rID/strings.xml

@@ -300,4 +300,5 @@
     <string name="unsupportedFile">File ini tidak didukung</string>
     <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
     <string name="sort_by_valid_from">Berlaku dari</string>
+    <string name="width">Lebar</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -307,4 +307,6 @@
     <string name="addFromPkpass">Selectează un fișier de tip Passbook (.pkpass)</string>
     <string name="unsupportedFile">Acest fișier nu este suportat</string>
     <string name="generic_error_please_retry">Scuze, ceva nu a funționat. Încearcă din nou ...</string>
+    <string name="width">Lățime</string>
+    <string name="setBarcodeWidth">Setează Lățimea Codului de Bare</string>
 </resources>

build.gradle.kts

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.android.application") version "8.10.1" apply false
+    id("com.android.application") version "8.11.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.21" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
 }
 
 allprojects {

docs/RELEASE_STEPS.md

@@ -10,4 +10,4 @@
 7. Upload `app/build/outputs/apk/gplay/release/app-gplay-release.apk` to Google Play Open Testing
 8. Push the version update commit: `git push`
 9. Create a new release on GitHub and attach the `app/build/outputs/apk/foss/release/app-foss-release.apk` and `SHA256SUMS` files
-10. After the release has been approved on Google Play Production, update the metadata there: `bundle exec fastlane supply --version_code <VERSION_CODE>`
+10. When pushing the release to Google Play Production, update the metadata there: `bundle exec fastlane supply --version_code <VERSION_CODE>`

fastlane/metadata/android/ar/changelogs/149.txt

@@ -0,0 +1 @@
+- تحديثات التبعية و الترجمة

fastlane/metadata/android/ar/changelogs/27.txt

@@ -0,0 +1,2 @@
+- تقليل الحد الأدنى لإصدار مجموعة أدوات مطوري البرامج من 17 إلى 15. (طلب سحب رقم 226 (https://github.com/brarcher/loyalty-card-locker/pull/226))
+- إزالة إستخدام مكتبة apache الموروثة, أستخدمت فقط في مرحلة أختبار الوحدة ولم تعد مطلوبة.(طلب سحب رقم 225 (https://github.com/brarcher/loyalty-card-locker/pull/225))

fastlane/metadata/android/ar/changelogs/28.txt

@@ -0,0 +1,5 @@
+- أُضيفت ترجمات
+  - اللغة البولندية (طلب سحب رقم 232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - اللغة الإسبانية (طلب سحب رقم 232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - اللغة السلوفاكية (طلب سحب رقم 232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+- حدثت الترجمات (طلب سحب رقم 239 (https://github.com/brarcher/loyalty-card-locker/pull/239))

fastlane/metadata/android/ar/changelogs/29.txt

@@ -0,0 +1,2 @@
+- إصلاح الترجمة الإسبانية (طلب سحب رقم 224 (https://github.com/brarcher/loyalty-card-locker/pull/244))
+- تحديث الترجمات (طلب سحب رقم 224 (https://github.com/brarcher/loyalty-card-locker/pull/244))

fastlane/metadata/android/ar/changelogs/3.txt

@@ -0,0 +1,14 @@
+- الآن رسمياً ندعم الباركودات التالية ذات أحادية الأبعاد و ثنائية الأبعاد:
+  - AZTEC
+  - CODABAR
+  - CODE_39
+  - CODE_128
+  - DATA_MATRIX
+  - EAN_8
+  - EAN_13
+  - ITF
+  - PDF_417
+  - QR_CODE
+  - UPC_A
+
+- الباركودات المُوَلَّدة بواسطة البرنامج الآن تظهر بشكل أكبر من أجل تسهيل عملية المسح بإستخدام جهاز المسح (القارئ الضوئي)

fastlane/metadata/android/ar/title.txt

@@ -1 +1 @@
-Catima
+كاتيما - محفظة بطاقة الولاء

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

@@ -0,0 +1 @@
+- Aktualizace závislostí a překladů

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

@@ -0,0 +1 @@
+- Übersetzungs- und Abhängigkeitsaktualisierungen

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

@@ -0,0 +1 @@
+- Made it harder to accidentally close edit view

fastlane/metadata/android/fr-FR/changelogs/149.txt

@@ -0,0 +1 @@
+- Mises à jour des dépendances et des traductions

fastlane/metadata/android/it-IT/changelogs/149.txt

@@ -0,0 +1 @@
+- Aggiornamento delle dipendenze e delle traduzioni

fastlane/metadata/android/pt-PT/changelogs/141.txt

@@ -0,0 +1,4 @@
+- Alterar a coluna padrão em ecrãs largas para 4
+- Permitir substituir a contagem de colunas para retrato e paisagem em configurações
+- Manter o filtro de pesquisa do ecrã principal ao girar o ecrã ou abrir um cartão
+- Limitar o comprimento máximo de exibição de nota no ecrã principal

fastlane/metadata/android/pt-PT/changelogs/148.txt

@@ -0,0 +1,4 @@
+- Adicionar capacidade de escolher a largura de código de barras na visualização em ecrã cheio
+- Remover a confusão da função importar da app
+- Várias correções de digitalização
+- Corrigir travar ao carregar um ficheiro de pkpass sem código de barras

fastlane/metadata/android/pt-PT/changelogs/149.txt

@@ -0,0 +1 @@
+- Atualizações de dependências e traduções

fastlane/metadata/android/pt/changelogs/141.txt

@@ -0,0 +1,4 @@
+- Alterar a coluna padrão em ecrãs largas para 4
+- Permitir substituir a contagem de colunas para retrato e paisagem em configurações
+- Manter o filtro de pesquisa do ecrã principal ao girar o ecrã ou abrir um cartão
+- Limitar o comprimento máximo de exibição de nota no ecrã principal

fastlane/metadata/android/pt/changelogs/148.txt

@@ -0,0 +1,4 @@
+- Adicionar capacidade de escolher a largura de código de barras na visualização em ecrã cheio
+- Remover a confusão da função importar da app
+- Várias correções de digitalização
+- Corrigir travar ao carregar um ficheiro de pkpass sem código de barras

fastlane/metadata/android/pt/changelogs/149.txt

@@ -0,0 +1 @@
+- Atualizações de dependências e traduções

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

@@ -0,0 +1 @@
+- Обновления зависимостей и переводов

fastlane/metadata/android/sk/changelogs/149.txt

@@ -0,0 +1 @@
+- Aktualizácie závislostí a prekladov

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

@@ -0,0 +1 @@
+- Оновлення залежностей та перекладів

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

@@ -0,0 +1 @@
+- 更新依赖项和翻译

lint.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <!-- FIXME: Disable the MissingQuantity check until https://github.com/WeblateOrg/weblate/issues/7520 gets fixed -->
-    <issue id="MissingQuantity" severity="ignore" />
-</lint>