Release Catima 2.16.2

857: Translations update from Hosted Weblate r=TheLastProject a=weblate

Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/).


It also includes following components:

* [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/)



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: 109247019824 <stoyan@gmx.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.16.2 - 106 (2022-03-31)
+
+- Fix some character sequences being shown as a single character
+
 ## v2.16.1 - 105 (2022-03-25)
 
 - Fix gray block appearing on invalid value for barcode

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 105
-        versionName "2.16.1"
+        versionCode 106
+        versionName "2.16.2"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -90,7 +90,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'

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

@@ -73,9 +73,10 @@ class LetterBitmap {
         String firstChar = displayName.substring(0, 1).toUpperCase();
         int firstCharEnd = 2;
         while (firstCharEnd <= displayName.length()) {
-            // test for the longest render-able string
+            // Test for the longest render-able string
+            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
             String test = displayName.substring(0, firstCharEnd);
-            if (PaintCompat.hasGlyph(paint, test)) {
+            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
                 firstChar = test;
             }
             firstCharEnd++;
@@ -124,6 +125,10 @@ class LetterBitmap {
         return colors.getColor(color, Color.BLACK);
     }
 
+    private static boolean isAlphabetical(String string) {
+        return string.matches("[a-zA-Z0-9]*");
+    }
+
     /**
      * Determine the color which the letter tile will use if no default
      * color is provided.

app/src/main/java/protect/card_locker/importexport/FidmeImporter.java

@@ -21,6 +21,7 @@ import java.text.ParseException;
 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.Utils;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -56,7 +57,7 @@ public class FidmeImporter implements Importer {
 
         try {
             for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, record);
+                importLoyaltyCard(context, database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -75,7 +76,7 @@ public class FidmeImporter implements Importer {
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
             throws FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
@@ -117,11 +118,12 @@ public class FidmeImporter implements Importer {
         // TODO: Hook this into our own loyalty card DB if we ever get one
         CatimaBarcode barcodeType = null;
 
-        // No favourite data in the export either
+        // No favourite data or colour in the export either
         int starStatus = 0;
+        int headerColor = Utils.getRandomHeaderColor(context);
 
         // TODO: Front and back image
 
-        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
+        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, null);
     }
 }

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

@@ -7,8 +7,8 @@ solokot
 Katharine Chui
 mondstern
 Oğuz Ersen
-IllusiveMan196
 Altonss
+IllusiveMan196
 Petr Novák
 StoyanDimitrov
 Joel A

fastlane/metadata/android/bg/changelogs/99.txt

@@ -0,0 +1 @@
+- Нов дизайн с Material You

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

@@ -0,0 +1,2 @@
+- Grauer Block bei ungültigem Wert für Barcode behoben
+- Korrekturen beim Stocard-Import

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

@@ -0,0 +1 @@
+- Fix some character sequences being shown as a single character

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

@@ -0,0 +1,2 @@
+- Plusieurs corrections mineures
+- Correction des plantages en langue norvégienne

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

@@ -0,0 +1,2 @@
+- Correction du bloc gris apparaissant sur une valeur invalide pour un code-barres
+- Corrections pour l'importation de Stocard

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

@@ -1,4 +1,4 @@
-- Est désormais officiellement compatible avec ces codes-barres à une et deux dimensions :
+- Est désormais officiellement compatible avec les codes-barres à une et deux dimensions suivants :
   - AZTEC
   - CODABAR
   - CODE_39
@@ -11,4 +11,4 @@
   - QR_CODE
   - UPC_A
 
-- Les codes-barres sont maintenant affichés plus grand, afin d'en faciliter la lecture.
+- Les codes-barres sont maintenant affichés plus grand, afin d'en faciliter la lecture

fastlane/metadata/android/sv-SE/title.txt

@@ -1 +1 @@
-Catima — Kundklubbs plånboken
+Catima — Kundklubbsplånboken

fastlane/metadata/android/tr-TR/changelogs/106.txt

@@ -0,0 +1 @@
+- Bazı karakter dizilerinin tek karakter olarak gösterilmesi düzeltildi