From 2f33be6b3c46ee4abb177f4912e2886556c8d548 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 17 Sep 2023 17:20:32 +0200 Subject: [PATCH 1/5] Improve validation If a field is empty when it shouldn't be, show it at the correct UI element and focus --- .../card_locker/LoyaltyCardEditActivity.java | 46 ++++++++++++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index d20e19e1a..b6204fd0f 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -261,7 +261,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements + ", updateLoyaltyCard=" + updateLoyaltyCard); } - @Override public void onSaveInstanceState(@NonNull Bundle savedInstanceState) { super.onSaveInstanceState(savedInstanceState); @@ -367,6 +366,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements public void onTextChanged(CharSequence s, int start, int before, int count) { updateTempState(LoyaltyCardField.store, s.toString()); generateIcon(s.toString()); + + if (s.length() == 0) { + storeFieldEdit.setError(getString(R.string.field_may_not_be_empty)); + } else { + storeFieldEdit.setError(null); + } } }); @@ -488,6 +493,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements @Override public void onTextChanged(CharSequence s, int start, int before, int count) { updateTempState(LoyaltyCardField.cardId, s.toString()); + + if (s.length() == 0) { + cardIdFieldView.setError(getString(R.string.field_may_not_be_empty)); + } else { + cardIdFieldView.setError(null); + } } }); @@ -1471,18 +1482,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements return; } + boolean hasError = false; + if (tempLoyaltyCard.store.isEmpty()) { - Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show(); - return; + storeFieldEdit.setError(getString(R.string.field_may_not_be_empty)); + + // Focus element + tabs.selectTab(tabs.getTabAt(0)); + storeFieldEdit.requestFocus(); + + hasError = true; } if (tempLoyaltyCard.cardId.isEmpty()) { - Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show(); - return; + cardIdFieldView.setError(getString(R.string.field_may_not_be_empty)); + + // Focus element if first error element + if (!hasError) { + tabs.selectTab(tabs.getTabAt(0)); + cardIdFieldView.requestFocus(); + hasError = true; + } } if (!validBalance) { - Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show(); + balanceField.setError(getString(R.string.parsingBalanceFailed, balanceField.getText().toString())); + + // Focus element if first error element + if (!hasError) { + tabs.selectTab(tabs.getTabAt(1)); + balanceField.requestFocus(); + hasError = true; + } + } + + if (hasError) { return; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c33f820f..65007d175 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -333,4 +333,5 @@ Display options Show archived cards View online + Field may not be empty From 00d08d741c5ed234fd96ce9ffab5e7ecf7d6ce09 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 17 Sep 2023 17:21:36 +0200 Subject: [PATCH 2/5] Don't regenerate barcode if value is empty --- .../main/java/protect/card_locker/LoyaltyCardEditActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index b6204fd0f..823340421 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -1652,7 +1652,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId; CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType; - if (cardIdString == null || barcodeFormat == null) { + if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) { barcodeImageLayout.setVisibility(View.GONE); return; } From c3daa1cc86acb2b7302fb49edb0bcf2daaa05b82 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 17 Sep 2023 17:32:29 +0200 Subject: [PATCH 3/5] Remove no longer used strings --- app/src/main/res/values-ar/strings.xml | 2 -- app/src/main/res/values-ast/strings.xml | 2 -- app/src/main/res/values-bg/strings.xml | 2 -- app/src/main/res/values-bn-rIN/strings.xml | 2 -- app/src/main/res/values-bs/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-el-rGR/strings.xml | 2 -- app/src/main/res/values-eo/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-he-rIL/strings.xml | 2 -- app/src/main/res/values-hi/strings.xml | 2 -- app/src/main/res/values-hr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-in-rID/strings.xml | 2 -- app/src/main/res/values-is/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-ko/strings.xml | 2 -- app/src/main/res/values-lt/strings.xml | 2 -- app/src/main/res/values-lv/strings.xml | 2 -- app/src/main/res/values-nb-rNO/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-oc/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- app/src/main/res/values-ro-rRO/strings.xml | 2 -- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 2 -- app/src/main/res/values-sl/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 2 -- app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values-zh-rCN/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values/strings.xml | 2 -- 39 files changed, 77 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f3de62996..471bfa53c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -29,8 +29,6 @@ اضف بطاقة أولا البطاقة(ات) الشخصية المنسوخة صورة %s باركود - لا يوجد اسم مدخل - لا يوجد بطاقة شخصية مدخلة لا يمكن العثور على هذه البطاقة لا يمكن تحليل الرابط المستورد استيراد/تصدير diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 707b92c66..b0fecd1fb 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -9,7 +9,6 @@ Confirmar ¿Quies desaniciar esta tarxeta permanentemente\? Importar/Esportar - Nun s\'introduxo nenguna ID Num se pudo facer la esportación La importación falló Los datos escríbense nel llugar qu\'escueyas. @@ -35,7 +34,6 @@ Nun se pudo facer la importación Nun se pudo atopar esa tarxeta Too - Nun s\'introduxo nengún nome Unviar… Editar la tarxeta D\'acuerdu diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 30086dc53..5c245f0e1 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -37,7 +37,6 @@ Картата не е намерена Номерът е променен. Желаете ли същата стойност да бъде приложена и към щрихкода\? Обновяване на щрихкода\? - Не е въведен номер Добавете карта Пряк път до карта Добавяне на карта @@ -79,7 +78,6 @@ Изтекла: %s Наличност: %s Докоснете бутона +, за да добавите списък. - Не е въведено наименование Списъци Въведете име на списъка Искам да споделя тази карта с вас diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index ffcc52b62..f55e4bb36 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -69,7 +69,6 @@ ...উল্টো ক্রমে ক্রমানুসার কার্ডটি খুঁজে পাওয়া গেল না - স্টোরেজ ত্রুটি নেই আইডি কপি করা হয়েছে কোন কার্ড বার্তা নেই কার্ডের শিরোনাম যোগ করুন @@ -129,7 +128,6 @@ কার্ড শর্টকাট রপ্তানি করা যাচ্ছে না আইডি ক্লিপবোর্ডে নকল করা হল - কোনো আইডি দওয়া হয়নি নিজের ডেটা অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ডিভাইসে সরিয়ে নিতে পারবেন। আমদানি করা গেল না কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন। diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 5ed32cf77..49130296e 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -69,7 +69,6 @@ Rikverc Sortiraj Nisam mogao pronaći tu karticu - Nije uneseno ime Kopiran ID/ovi Dodaj prvo kartu Dodaj Kartu @@ -93,7 +92,6 @@ Izvoz neuspješan Skeniraj barkod Prečica kartice - ID nije unesen Nisam uspio parsirati URI za uvoz Uvoz/Izvoz Izvoz diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index dbb0d382e..97bde63ab 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -16,8 +16,6 @@ Editovat kartu Přidat kartu Naskenovat čárový kód - Nezadáno žádné jméno - Nezadáno ID Import/Export Export Zálohování dat vám umožní přesunout je do jiného zařízení. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 9f26e8354..69bb8d93d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -68,8 +68,6 @@ Dataene skrives til en placering efter eget valg. Kunne ikke analysere import-URI\'en Kunne ikke finde kort - Der er ikke angivet noget kort-ID - Intet navn angivet Slet gruppe\? Alle Denne gruppe indeholder ikke nogen kort diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3a61e339b..b0002553a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,8 +22,6 @@ Barcode scannen Shortcut zu einer Karte Füge zuerst eine Karte hinzu - Kein Name eingegeben - Keine ID eingegeben Diese Karte konnte nicht gefunden werden Import/Export Export diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index cb0e65ca2..3e82e765d 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -18,8 +18,6 @@ Σαρώστε τον γραμμοκώδικα (bardcode) Συντόμευση Κάρτας Προσθέστε μία κάρτα πρώτα - Δεν έχει εισαχθεί όνομα - Δεν έχει εισαχθεί κωδικός Δεν ήταν δυνατό να εντοπιστεί η κάρτα Εισαγωγή/Εξαγωγή Εξαγωγή diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 4f531b0a1..584776094 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -65,8 +65,6 @@ Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato. Ne eblis analizi la importado URI Ne eblis trovi karto - Neniu karto ID eniris - Neniu eniris nomo Aldoni karto unua Karto Mallongirejo Scintigrafio Barcode Card diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bcf9f048d..b0425ae60 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,8 +18,6 @@ Escanear código de barras Atajo de tarjeta Añada una tarjeta primero - No se proporcionó ningún nombre - No se ha introducido ninguna código No se ha podido encontrar esa tarjeta Importar/Exportar Exportar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 3d8c92543..58a672599 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -107,8 +107,6 @@ Tuo/vie Tuonnin URI: n jäsentäminen epäonnistui Tätä korttia ei löytynyt - ID-tunnusta ei annettu - Nimeä ei annettu Kopioidut tunnukset Lisää ensin kortti Kortin pikakuvake diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f3f09215c..ee52a91f0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,8 +18,6 @@ Scanner le code-barres Raccourci de carte Ajoutez d’abord une carte - Aucun nom saisi - Aucun identifiant saisi Impossible de trouver cette carte Importer/Exporter Exporter diff --git a/app/src/main/res/values-he-rIL/strings.xml b/app/src/main/res/values-he-rIL/strings.xml index 561906616..80abdcb4d 100644 --- a/app/src/main/res/values-he-rIL/strings.xml +++ b/app/src/main/res/values-he-rIL/strings.xml @@ -10,7 +10,6 @@ שיתוף העתקת מזהה ללוח הוספת כרטיס - אין מזהה כרטיס הוספה למועדפים הסרה ממועדפים הערות @@ -39,7 +38,6 @@ קיצור דרך תחילה הוסף כרטיס מזהי כרטיס הועתקו - לא הוכנס שם חנות כרטיס לא נמצא ייבוא/ייצוא ייצוא diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d3caab9f5..16fd9be40 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -20,8 +20,6 @@ कार्ड जोड़ें पहले एक कार्ड जोड़ें कॉपी की गई आईडी - कोई नाम दर्ज नहीं - कोई पहचान पत्र (आईडी दर्ज नहीं) की गई वह कार्ड नहीं मिला आयात / निर्यात निर्यात diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c0a184aca..d18f09778 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -28,7 +28,6 @@ Ne postoji crtični kod Odustani Pritisni gumb + plus za dodavanje kartice ili uvezi putem izbornika ⋮. - Ime nije zadano Nije bilo moguće pronaći tu karticu Nije bilo moguće obraditi URI uvoza Uvoz/Izvoz @@ -104,7 +103,6 @@ Siva Istek Slika vrste crtičnog koda %s - ID nije zadan Uvezi iz Loyalty Card Keychain Prednja slika Upiši lozinku diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index bed92d865..da483b3e7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -36,7 +36,6 @@ Kártya hozzáadása Vonalkód leolvasása Kártya parancsikon - Nincs név megadva Az importálási URI nem értelmezhető Importálás/exportálás Exportálás @@ -53,7 +52,6 @@ Kártya törlése Azonosító(k) másolva A(z) %s vonalkód képe - Nincs azonosító megadva A kártya nem található Válassza ki az importálandó ***.zip Stocard export fájlt. \nAz adatainak exportálását a support@stocardapp.com címre írt levélben kérheti. diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index c7d1ecba8..b2a6180fe 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -79,8 +79,6 @@ Salin ID ke papan klip Kirim… Tambah kartu terlebih dahulu - Nama masih kosong - Tidak ada ID yang dimasukkan Tidak dapat menemukan kartu Tidak dapat memparsing impor URI Ekspor diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index fec41d73d..966fa490d 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -26,7 +26,6 @@ Bæta kort fyrstu Flytja mistókst Flutt - Ekkert nafn slegið Gæti ekki fundið kort Get ekki lesið inn URI Flytja diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d5c01a36c..6a2a9b229 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -22,8 +22,6 @@ Scansiona il codice Scorciatoia per la carta Aggiungi prima una carta - Nessun nome inserito - Nessun codice inserito Impossibile trovare quella carta Impossibile analizzare l\'URI di importazione Importa/Esporta diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a31b31ff0..1a91052ef 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -99,8 +99,6 @@ インポート/エクスポート インポートURIを解析できません カードが見つかりません - カード番号が入力されていません - 名前が入力されていません カードを追加 カードのショートカット バーコードをスキャン diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 713df7d3c..f3d38b269 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -55,7 +55,6 @@ 가져오기를 수행할 수 없습니다 가져오기 실패 가져오기 완료 - ID를 입력하지 않음 이름 썸네일 다른 앱 사용 @@ -64,7 +63,6 @@ 위로 이동 종료 아래로 이동 - 이름을 입력하지 않음 즐겨찾기 별 바코드를 표시할 때 화면 밝기 높이기 정말 이 카드를 삭제하시겠습니까\? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c3e6ea339..175deee6a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -15,8 +15,6 @@ Redaguoti lojalumo kortelę Pridėti lojalumo kortelę Nuskaityti brūkšninį kodą - Neįvestas pavadinimas - Neįvestas ID Importuoti/Exportuoti Exportuoti Nepavyko importuoti diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 47c111f99..0bac391bd 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -33,7 +33,6 @@ Skenēt svītrkodu Kartes saīsne Vispirms pievienojiet karti - Vārds nav ievadīts Nevarēja atrast karti Nevarēja parsēt importa URI Imports/Eksports @@ -102,7 +101,6 @@ Neatgriezeniski dzēst šo %d karti\? Neatgriezeniski dzēst šīs %d kartes\? - Numurs nav ievadīts Par %s Derīguma termiņš beidzās: %s Izvēlieties krāsu diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 5aa282f98..0a454f0d3 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -19,8 +19,6 @@ Skann strekkoden Kort-snarvei Legg til et kort først - Navn ikke angitt - Ingen ID innskrevet Fant ikke det kortet Importer/eksporter Eksporter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 17e44013a..537ad3f7c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -23,8 +23,6 @@ Barcode scannen Kaartsnelkoppeling Voeg eerst een kaart toe - Geen naam ingevoerd - Geen id ingevoerd De kaart is niet aangetroffen Kan de import-uri niet verwerken Importeren/Exporteren diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index b18c2d214..6fad0797e 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -12,8 +12,6 @@ Importar/Exportar Analisi impossibla l’URI d’importacion Impossible de trobar aquesta carta - Cap d’identificant pas picat - Cap de nom pas picat ID copiat(s) Apondètz d’en primièr una carta Acorchi de carta diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7cfb059d5..50d84f7f5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -22,8 +22,6 @@ Zeskanuj kod kreskowy Skrót karty Najpierw dodaj kartę - Nie wprowadzono nazwy - Nie wprowadzono identyfikatora Nie można znaleźć tej karty lojalnościowej Nie można przeanalizować identyfikatora importu URI Importuj/Eksportuj diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e541c546a..96c82ac09 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -39,7 +39,6 @@ Identificador do cartão Atalho do cartão Adicione primeiro um cartão - Nenhum nome inserido Não foi possível encontrar esse cartão Não foi possível analisar o URI de importação Importar / exportar @@ -187,7 +186,6 @@ Avalie esta aplicação no Google Play Os dados serão guardados num local à sua escolha. - Nenhum identificador inserido Eliminar %d cartão Eliminar %d cartões diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index eaa22f2a8..f875f7478 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -34,7 +34,6 @@ Importat Importul a eșuat Nu s-a putut efectua importarea - Nu s-a introdus niciun ID Nu s-a putut efectua exportarea Importul… Exportul… @@ -71,7 +70,6 @@ Editarea codului de bare Alegeți data de expirare ID-ul cardului copiat în clipboard - Nici un nume introdus Selectare cod de bare Acest grup nu conține nicio carte Selectați imaginea din galerie diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ff40cfa28..461819bbe 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -23,8 +23,6 @@ Отсканируйте штрих-код Ярлык карты Сначала добавьте карту - Название не указано - Номер не указан Карта не найдена Невозможно разобрать импортируемый URI Импорт/Экспорт diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 49cc20896..7e6d01f2f 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -18,8 +18,6 @@ Skenovať čiarový kód Skratka Najprv pridajte kartu - Nebol zadaný žiadny názov - Nebolo zadané ID Nepodarilo sa nájsť túto kartu Import/Export Export diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 08db4807a..9bfeab6a1 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -18,8 +18,6 @@ Skeniraj črtno kodo Bližnjica do kartice Najprej dodajte kartico - Ime ni bilo vnešeno - ID številka kartice ni bila vnešena Te kartice zvestobe ni bilo mogoče najti Uvozi/izvozi Izvozi diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a7583c1d9..007738006 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -99,8 +99,6 @@ Säkerhetskopiering av din data möjliggör förflyttning av den till en annan enhet. Importera/Exportera Kunde inte hitta det kortet - Inget ID har angivits - Inget namn har angivits Lägg till ett kort först Kort-genväg Lägg till kort diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c47c07bfc..4be02c19a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -135,8 +135,6 @@ İçe/Dışa aktar İçe aktarma URI\'si ayrıştırılamadı Bu kart bulunamadı - Numara girilmedi - Ad girilmedi %s barkod görüntüsü Numara(lar) kopyalandı Numarayı panoya kopyala diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1ad38ab8f..f53ad3793 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -114,8 +114,6 @@ Імпорт/Експорт Неможливо опрацювати імпорт-URI Карту не знайдено - ID не введено - Ім\'я не введено ID скопійовано Спочатку додайте карту Швидкий виклик карти diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6849b70d8..8da8afa18 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -103,8 +103,6 @@ 导入/导出 无法解析导入 URI 找不到卡片 - 未输入卡号 - 未输入卡片名称 已复制卡号 请先添加一张卡片 卡片快捷键 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0750c1183..16d3bbc10 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -84,7 +84,6 @@ 否 找不到可用的條碼 無法找到此卡片 - 尚未輸入 ID 請先新增卡片 排列 Catima @@ -154,7 +153,6 @@ OK 送出… 掃描條碼 - 尚未輸入卡片名稱 備份您的資料以將其轉移至其他裝置中。 自檔案系統中匯入 自檔案系統中選取檔案。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 65007d175..4b798d7c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,8 +50,6 @@ Copied ID(s) Image %s barcode - No name entered - No ID entered Could not find that card Could not parse the import URI Import/Export From 4aa56a55fe4f59732dbe55ba084661b7021201d5 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 17 Sep 2023 17:59:42 +0200 Subject: [PATCH 4/5] Balance validation fixes Remove old string which may sometimes display "does not seem like a valid balance." and default to 0 as balance if field is emptied. --- .../protect/card_locker/LoyaltyCardEditActivity.java | 10 ++++++++-- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn-rIN/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el-rGR/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in-rID/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 32 files changed, 9 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 823340421..9dfc00b54 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -403,6 +403,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements balanceField.setOnFocusChangeListener((v, hasFocus) -> { if (!hasFocus && !onResuming && !onRestoring) { + if (balanceField.getText().toString().isEmpty()) { + updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0)); + } + balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType)); } }); @@ -414,10 +418,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements try { BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType); updateTempState(LoyaltyCardField.balance, balance); + balanceField.setError(null); validBalance = true; } catch (ParseException e) { - validBalance = false; e.printStackTrace(); + balanceField.setError(getString(R.string.balanceParsingFailed)); + validBalance = false; } } }); @@ -1506,7 +1512,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements } if (!validBalance) { - balanceField.setError(getString(R.string.parsingBalanceFailed, balanceField.getText().toString())); + balanceField.setError(getString(R.string.balanceParsingFailed)); // Focus element if first error element if (!hasError) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 471bfa53c..698719453 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -77,7 +77,6 @@ الرصيد العملة نقاط - %s لا يبدو أنه رصيد صالح. استيراد البيانات من سلسلة مفاتيح بطاقة الولاء سياسة الخصوصية diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5c245f0e1..2e2c8ec62 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -27,7 +27,6 @@ Свободен софтуер с авторски права, лицензиран под GPLv3+ Снимка на предната страна Снимка на задната страна - %s не изглежда истинска наличност. Не Да Снимка на задната страна diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index f55e4bb36..e818f08db 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -184,7 +184,6 @@ \nকোন তথ্য একেবারেই সংগ্রহ করা হয় না, যা যে কেউ নিশ্চিত করতে পারবেন কারন আমাদের অ্যাপ মুক্ত সফটওয়্যার। ব্যালান্স পয়েন্ট - %s কোনো বৈধ ব্যালান্স মনে হচ্ছে না। এখান থেকে তথ্য আমদানি করুন আনুগত্য কার্ড কীচেন ব্যক্তিগত তথ্যের গোপনীয়তা নীতি diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 97bde63ab..4ba985013 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -147,7 +147,6 @@ Zásady soukromí Loyalty Card Keychain Importovat data z - %s se nezdá být platným zůstatkem. Body Měna Zůstatek diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b0002553a..2790199d5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -85,7 +85,6 @@ Gruppen: %s Loyalty Card Keychain Daten importieren aus - %s scheint kein gültiges Guthaben zu sein. Punkte Währung Guthaben diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 3e82e765d..cb686141c 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -116,7 +116,6 @@ Αντιγραμμένη/ες ταυτότητα/ες Δεν ήταν δυνατό να διαβαστεί η εικόνα - %s δεν φαίνεται να είναι έγκυρο το υπόλοιπο. Νόμισμα Πολιτική απορρήτου Εισαγωγή δεδομένων από diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b0425ae60..7dae526d1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -140,7 +140,6 @@ Política de privacidad Llavero con tarjeta de fidelización Importar datos de - %s no tendría un saldo válido. Moneda Saldo No se pudo leer la imagen diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 58a672599..a722a544a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -30,7 +30,6 @@ Tietosuojakäytäntö Kanta-asiakaskortin avainnippu Tuo tietoja kohteesta - %s ei vaikuta olevan kelvollinen saldo. Pisteet Valuutta Saldo diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ee52a91f0..2c294f77e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -90,7 +90,6 @@ Politique de confidentialité Loyalty Card Keychain Importer les données depuis - %s ne semble pas être un solde valide. Points Devise Solde diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 16fd9be40..9b1c71794 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -135,7 +135,6 @@ मैन्युअली आई डी दर्ज करें समूह संपादन: %s अंक - %s एक वैध शेष राशि नहीं है. यहाँ से डेटा का आयात करें निजता नीति कैटिमा से आयात करें diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d18f09778..c9097a229 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -143,7 +143,6 @@ Saldo Uvezi podatke iz Privjesak za Karticu Vjernosti - Čini se da %s nije ispravni saldo. Obavijest o politici privatnosti (obavezna za neke trgovine aplikacija): \n \nPODACI SE UOPĆE NE PRIKUPLJAJU, što svatko može potvrditi budući da je naša aplikacija libre softver. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index da483b3e7..10fb92591 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -125,7 +125,6 @@ Egyenleg Pénznem Pontok - A(z) %s nem tűnik valós egyenlegnek. Hűségkártya-kulcstartó Adatvédelmi irányelvek Elfogadás diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index b2a6180fe..d0498d74c 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -138,7 +138,6 @@ Tidak pernah Pindah barcode ke bagian paling depan Poin - %s sepertinya bukan saldo yang valid. Gantungan kunci kartu kesetiaan Kebijakan Privasi Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6a2a9b229..b0c9da6a9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -83,7 +83,6 @@ %d carte %d carte - %s non sembra un saldo corretto. Punti Valuta Saldo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1a91052ef..70c02fa2f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -19,7 +19,6 @@ プライバシーポリシー Loyalty Card Keychain インポート元を選択 - %s は有効な残高ではないようです。 ポイント 通貨 残高 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f3d38b269..b2f9f6cbd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -143,7 +143,6 @@ Weblate에서 카드 선택 그룹 편집 - %s 이 유효한 잔액이 아닌 것 같습니다. 데이터 가져오기 바코드 값 이미지 설정 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 175deee6a..e56602037 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -45,7 +45,6 @@ \nSukurkite jį iš Loyalty Card Keychain meniu Importavimas/Eksportavimas, pirmiausia paspausdami Eksportuoti. Importuoti iš Loyalty Card Keychain Lojalumo kortelės - Panašu, kad %s reikšmė nėra tinkama. Perkelti brūkšninį kodą į ekrano viršų Šviesinti brūkšninio kodo rodinį Nepavyko iššifruoti importo URI diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 0bac391bd..7d4900d58 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -117,7 +117,6 @@ %s punkts %s punkti - %s nešķiet derīga bilance. Loyalty Card Keychain Paziņojums par privātuma politiku (nepieciešams dažiem lietotņu veikaliem): \n diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 0a454f0d3..65e625fb4 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -90,7 +90,6 @@ Utløpsdato Utløpt: %s Flytt strekkoden til toppen av skjermen - %s ser ikke ut til å være en gyldig saldo. Poeng Valuta Saldo diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 537ad3f7c..cb1d6bfa3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -90,7 +90,6 @@ Vervalt op %s Verlopen: %s Barcode verplaatsen naar bovenkant van scherm - %s lijkt geen geldig saldo te zijn. Aantal punten Valuta Saldo diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 50d84f7f5..1c0fe1628 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -130,7 +130,6 @@ Polityka prywatności Brelok dla twoich kart lojalnościowych Importuj dane z - %s nie wydaje się być prawidłową wartością. Punkty Waluta Saldo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 96c82ac09..989030711 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -136,7 +136,6 @@ Saldo Moeda Pontos - %s não parece ser um saldo válido. Loyalty Card Keychain Política de privacidade Aviso de política de privacidade (exigido por algumas lojas de aplicações): diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 461819bbe..ca0fbeaf3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -78,7 +78,6 @@ Срок действия истёк: %s Срок действия истекает: %s Баллы - %s не похож на правильный баланс. Ручной ввод номера Уведомление о политике конфиденциальности (требуется некоторыми магазинами приложений): \n diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 7e6d01f2f..993a66d8b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -190,7 +190,6 @@ Zmenili ste ID. Chcete aktualizovať aj čiarový kód, aby používal rovnakú hodnotu\? Nie Zadajte prosím heslo - %s sa nezdá byť platným zostatkom. Zatiaľ nemáte žiadne vernostné karty. Keď nejaké pridáte, môžete ich priradiť ku skupine tu. Na skenovanie čiarových kódov potrebuje Catima prístup k fotoaparátu. Ťuknite sem a zmeňte nastavenia oprávnení. Importovať karty diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 9bfeab6a1..708bf9cfe 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -142,7 +142,6 @@ Da Prednja stran Zadnja stran - %s ni veljavno stanje. Nastavi sliko sprednje strani Nastavi sliko sprednje strani Fotografije diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 007738006..7ef9c086d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -150,7 +150,6 @@ Copyleftad fri programvara, under GPLv3+-licens Fria tredjepartsresurser: %s Fria tredjepartsbibliotek: %s - %s verkar inte vara ett giltigt saldo. Saldo Saldo: %s Förhindra skärmlåsning diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4be02c19a..d86494f63 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -57,7 +57,6 @@ Gizlilik Politikası Loyalty Card Keychain Verileri şuradan içe aktar - %s geçerli bir bakiye gibi görünmüyor. Puan Para birimi Bakiye diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f53ad3793..521b4e3ee 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -42,7 +42,6 @@ Політика конфіденційності Брелок для картки лояльності Імпортувати дані з - %s здається, не є дійсним залишком. Бали Валюта Баланс diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8da8afa18..6f09f3489 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -39,7 +39,6 @@ 隐私政策 会员卡卡包 数据导入源 - %s似乎不是有效的余额。 积分 货币 余额 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 16d3bbc10..730a75fac 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -177,7 +177,6 @@ 選取您自 Catima 匯出的 catima.zip 檔案以進行匯入。 \n您可透過其他裝置的 Catima 程式中的匯入／匯出選單進行匯出。 點 - %s 似乎不是個可用的餘額數值。 第三方自由函式庫：%s 第三方自由資源：%s 選擇條碼 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b798d7c4..5e607e32d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -179,7 +179,7 @@ Balance Currency Points - %s does not seem to be a valid balance. + Invalid balance Import data from Loyalty Card Keychain Privacy Policy From 12e7aaa6155e74c855c0c90ff3a5e08d461d49e3 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 22 Sep 2023 21:12:04 +0200 Subject: [PATCH 5/5] Trim spaces in store name --- .../protect/card_locker/LoyaltyCardEditActivity.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 9dfc00b54..47529ac86 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -364,10 +364,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() { @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - updateTempState(LoyaltyCardField.store, s.toString()); - generateIcon(s.toString()); + String storeName = s.toString().trim(); + updateTempState(LoyaltyCardField.store, storeName); + generateIcon(storeName); - if (s.length() == 0) { + if (storeName.length() == 0) { storeFieldEdit.setError(getString(R.string.field_may_not_be_empty)); } else { storeFieldEdit.setError(null); @@ -950,7 +951,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements saveButton.setOnClickListener(v -> doSave()); saveButton.bringToFront(); - generateIcon(storeFieldEdit.getText().toString()); + generateIcon(storeFieldEdit.getText().toString().trim()); // It can't be null because we set it in updateTempState but SpotBugs insists it can be // NP_NULL_ON_SOME_PATH: Possible null pointer dereference and @@ -1369,7 +1370,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE); thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK); - generateIcon(storeFieldEdit.getText().toString()); + generateIcon(storeFieldEdit.getText().toString().trim()); } // ColorPickerDialogListener callback