Release Catima 2.34.2

Translations update from Hosted Weblate

.github/workflows/android.yml

@@ -30,39 +30,45 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [ 21, 34 ]
+        flavor: [Foss, Gplay]
     steps:
-    - uses: actions/checkout@v4.2.2
-    - name: Fail on bad translations
-      run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/actions/wrapper-validation@v4
-    - name: set up OpenJDK 17
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-alternatives --auto java
-    - name: Build
-      run: ./gradlew assembleRelease
-    - name: Check lint
-      run: ./gradlew lintRelease
-    - name: Run unit tests
-      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
-    - name: Enable KVM
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
-    - name: Run instrumented tests
-      uses: ReactiveCircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ matrix.api-level }}
-        arch: x86_64
-        script: ./gradlew connectedCheck
-    - name: SpotBugs
-      run: ./gradlew spotbugsRelease
-    - name: Archive test results
-      if: always()
-      uses: actions/upload-artifact@v4.4.3
-      with:
-        name: test-results-api${{ matrix.api-level }}
-        path: app/build/reports
+      - uses: actions/checkout@v4.2.2
+      - name: Fail on bad translations
+        run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
+      - uses: gradle/actions/wrapper-validation@v4
+      - name: set up OpenJDK 17
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openjdk-17-jdk-headless
+          sudo update-alternatives --auto java
+      - name: Build
+        run: ./gradlew assemble${{ matrix.flavor }}Release
+      - name: Check lint
+        run: ./gradlew lint${{ matrix.flavor }}Release
+      - name: Run unit tests
+        run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      - name: Run instrumented tests (API 21)
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 21
+          arch: x86_64
+          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+      - name: Run instrumented tests (API 34)
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 34
+          arch: x86_64
+          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
+      - name: SpotBugs
+        run: ./gradlew spotbugs${{ matrix.flavor }}Release
+      - name: Archive test results
+        if: always()
+        uses: actions/upload-artifact@v4.5.0
+        with:
+          name: test-results-flavor${{ matrix.flavor }}
+          path: app/build/reports

.gitignore

@@ -25,3 +25,6 @@
 /.bundle/
 /vendor/bundle
 /lib/bundler/man/
+
+# Catima-specific
+SHA256SUMS

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -37,12 +37,12 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     # We specifically need the Serif version because of the 200 weight
     case "$(basename "$lang")" in
       bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Yesteryear/Noto Sans Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
       ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
       kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;;
       ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
       zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-      zh-TW) sed -i "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
+      zh-TW) sed -i -e "s/Yesteryear/Noto Sans CJK TC/" -e "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
       *) ;;
     esac
   fi

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v2.34.2 - 144 (2024-12-26)
+
+- Improve archive/starred icon display
+
+## v2.34.1 - 143 (2024-12-12)
+
+- Fix crash when opening invalid pkpass files
+
+## v2.34.0 - 142 (2024-12-10)
+
+- Add Passbook (.pkpass) support
+- Fix import of transparent PDF files
+- Improve display of transparent thumbnails
+
 ## v2.33.0 - 141 (2024-11-19)
 
 - Change default column on wide screens to 4

Gemfile.lock

@@ -10,16 +10,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.998.0)
-    aws-sdk-core (3.211.0)
+    aws-partitions (1.1020.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
+    aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
+    aws-sdk-s3 (1.176.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -68,7 +68,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -108,7 +108,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
@@ -150,11 +150,11 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.5)
+    json (2.9.0)
     jwt (2.9.3)
       base64
     mini_magick (4.13.2)
@@ -164,7 +164,7 @@ GEM
     nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (6.0.1)
@@ -175,7 +175,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.3.9)
-    rouge (2.0.7)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.5)
@@ -199,15 +199,15 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.26.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -218,4 +218,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.5.16
+   2.5.22

app/build.gradle.kts

@@ -4,6 +4,7 @@ import com.github.spotbugs.snom.SpotBugsTask
 plugins {
     id("com.android.application")
     id("com.github.spotbugs")
+    id("org.jetbrains.kotlin.android")
 }
 
 spotbugs {
@@ -21,15 +22,18 @@ android {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
         targetSdk = 34
-        versionCode = 141
-        versionName = "2.33.0"
+        versionCode = 144
+        versionName = "2.34.2"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField("boolean", "showDonate", "true")
+        buildConfigField("boolean", "showRateOnGooglePlay", "false")
     }
 
     buildTypes {
@@ -50,6 +54,21 @@ android {
         viewBinding = true
     }
 
+    flavorDimensions.add("type")
+    productFlavors {
+        create("foss") {
+            dimension = "type"
+            isDefault = true
+        }
+        create("gplay") {
+            dimension = "type"
+
+            // Google doesn't allow donation links
+            buildConfigField("boolean", "showDonate", "false")
+            buildConfigField("boolean", "showRateOnGooglePlay", "true")
+        }
+    }
+
     bundle {
         language {
             enableSplit = false
@@ -62,8 +81,8 @@ android {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -84,25 +103,26 @@ android {
     lint {
         lintConfig = file("lint.xml")
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {
-
     // AndroidX
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.exifinterface:exifinterface:1.3.7")
     implementation("androidx.palette:palette:1.0.0")
     implementation("androidx.preference:preference:1.2.1")
     implementation("com.google.android.material:material:1.12.0")
-    implementation("com.github.yalantis:ucrop:2.2.9")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
-
-    // Splash Screen
-    implementation("androidx.core:core-splashscreen:1.0.1")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 
     // Third-party
     implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
+    implementation("com.github.yalantis:ucrop:2.2.10")
     implementation("com.google.zxing:core:3.5.3")
     implementation("org.apache.commons:commons-csv:1.9.0")
     implementation("com.jaredrummler:colorpicker:1.1.0")
@@ -116,7 +136,7 @@ dependencies {
     val junitVersion = "4.13.2"
     testImplementation("androidx.test:core:$androidXTestVersion")
     testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.14")
+    testImplementation("org.robolectric:robolectric:4.14.1")
 
     androidTestImplementation("androidx.test:core:$androidXTestVersion")
     androidTestImplementation("junit:junit:$junitVersion")

app/src/debug/res/values-fi/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima-vianmääritys</string>
+</resources>

app/src/debug/res/values-lv/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Catima atkļūdošana</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -40,12 +40,24 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content"/>
+                <data android:host="*"/>
+                <data android:mimeType="image/*" />
+                <data android:mimeType="application/pdf" />
+                <data android:mimeType="application/vnd.apple.pkpass" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="application/pdf" />
+                <data android:mimeType="application/vnd.apple.pkpass" />
             </intent-filter>
         </activity>
         <activity

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

@@ -45,11 +45,10 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
         binding.donate.setTag("https://catima.app/donate");
 
-        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
         // Hide Google Play rate button if not on Google Play
-        binding.rate.setVisibility(installedFromGooglePlay ? View.VISIBLE : View.GONE);
+        binding.rate.setVisibility(BuildConfig.showRateOnGooglePlay ? View.VISIBLE : View.GONE);
         // Hide donate button on Google Play (Google Play doesn't allow donation links)
-        binding.donate.setVisibility(installedFromGooglePlay ? View.GONE : View.VISIBLE);
+        binding.donate.setVisibility(BuildConfig.showDonate ? View.VISIBLE : View.GONE);
 
         bindClickListeners();
     }

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

@@ -1,29 +0,0 @@
-package protect.card_locker;
-
-import androidx.annotation.Nullable;
-
-public class BarcodeValues {
-    @Nullable
-    private final CatimaBarcode mFormat;
-    private final String mContent;
-    private String mNote;
-
-    public BarcodeValues(@Nullable CatimaBarcode format, String content) {
-        mFormat = format;
-        mContent = content;
-    }
-
-    public void setNote(String note) {
-        mNote = note;
-    }
-
-    public @Nullable CatimaBarcode format() {
-        return mFormat;
-    }
-
-    public String content() {
-        return mContent;
-    }
-
-    public String note() { return mNote; }
-}

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

@@ -1,6 +0,0 @@
-package protect.card_locker;
-
-public interface BarcodeValuesListDisambiguatorCallback {
-    void onUserChoseBarcode(BarcodeValues barcodeValues);
-    void onUserDismissedSelector();
-}

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

@@ -66,7 +66,7 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
     private void onClickAction(int position) {
         Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
         selected.moveToPosition(position);
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(selected);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(CardShortcutConfigure.this, selected);
 
         Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
 

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

@@ -42,7 +42,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
         Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
         return subscriber -> {
             while (loyaltyCardCursor.moveToNext()) {
-                LoyaltyCard card = LoyaltyCard.fromCursor(loyaltyCardCursor);
+                LoyaltyCard card = LoyaltyCard.fromCursor(this, loyaltyCardCursor);
                 Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, card.id);
@@ -69,7 +69,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
             for (String controlId : controlIds) {
                 Control control;
                 Integer cardId = this.controlIdToCardId(controlId);
-                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                LoyaltyCard card = DBHelper.getLoyaltyCard(this, mDatabase, cardId);
                 if (card != null) {
                     Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -99,7 +99,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
     }
 
     private Bitmap getIcon(Context context, LoyaltyCard loyaltyCard) {
-        Bitmap cardIcon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        Bitmap cardIcon = loyaltyCard.getImageThumbnail(context);
 
         if (cardIcon != null) {
             return cardIcon;

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

@@ -332,10 +332,10 @@ public class DBHelper extends SQLiteOpenHelper {
         Set<String> files = new HashSet<>();
         Cursor cardCursor = getLoyaltyCardCursor(database);
         while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);
             for (ImageLocationType imageLocationType : ImageLocationType.values()) {
                 String name = Utils.getCardImageFileName(card.id, imageLocationType);
-                if (Utils.retrieveCardImageAsFile(context, name).exists()) {
+                if (card.getImageForImageLocationType(context, imageLocationType) != null) {
                     files.add(name);
                 }
             }
@@ -535,14 +535,14 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsUpdated == 1);
     }
 
-    public static LoyaltyCard getLoyaltyCard(SQLiteDatabase database, final int id) {
+    public static LoyaltyCard getLoyaltyCard(Context context, SQLiteDatabase database, final int id) {
         Cursor data = database.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
 
         LoyaltyCard card = null;
 
         if (data.getCount() == 1) {
             data.moveToFirst();
-            card = LoyaltyCard.fromCursor(data);
+            card = LoyaltyCard.fromCursor(context, data);
         }
 
         data.close();

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

@@ -125,7 +125,29 @@ public class ImportURIHelper {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0);
+            return new LoyaltyCard(
+                    -1,
+                    store,
+                    note,
+                    validFrom,
+                    expiry,
+                    balance,
+                    balanceType,
+                    cardId,
+                    barcodeId,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    Utils.getUnixTime(),
+                    100,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
         } catch (NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }

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

@@ -1,9 +1,9 @@
 package protect.card_locker;
 
+import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -11,11 +11,10 @@ import androidx.annotation.Nullable;
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.Objects;
 
-public class LoyaltyCard implements Parcelable {
+public class LoyaltyCard {
     public int id;
     public String store;
     public String note;
@@ -38,6 +37,19 @@ public class LoyaltyCard implements Parcelable {
     public int zoomLevel;
     public int archiveStatus;
 
+    @Nullable
+    private Bitmap imageThumbnail;
+    @Nullable
+    private String imageThumbnailPath;
+    @Nullable
+    private Bitmap imageFront;
+    @Nullable
+    private String imageFrontPath;
+    @Nullable
+    private Bitmap imageBack;
+    @Nullable
+    private String imageBackPath;
+
     public static final String BUNDLE_LOYALTY_CARD_ID = "loyaltyCardId";
     public static final String BUNDLE_LOYALTY_CARD_STORE = "loyaltyCardStore";
     public static final String BUNDLE_LOYALTY_CARD_NOTE = "loyaltyCardNote";
@@ -53,6 +65,13 @@ public class LoyaltyCard implements Parcelable {
     public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
     public static final String BUNDLE_LOYALTY_CARD_ZOOM_LEVEL = "loyaltyCardZoomLevel";
     public static final String BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS = "loyaltyCardArchiveStatus";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL = "loyaltyCardImageThumbnail";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_FRONT = "loyaltyCardImageFront";
+    public static final String BUNDLE_LOYALTY_CARD_IMAGE_BACK = "loyaltyCardImageBack";
+
+    private static final String TEMP_IMAGE_THUMBNAIL_FILE_NAME = "loyaltyCardTempImageThumbnailFileName";
+    private static final String TEMP_IMAGE_FRONT_FILE_NAME = "loyaltyCardTempImageFrontFileName";
+    private static final String TEMP_IMAGE_BACK_FILE_NAME = "loyaltyCardTempImageBackFileName";
 
     /**
      * Create a loyalty card object with default values
@@ -73,6 +92,9 @@ public class LoyaltyCard implements Parcelable {
         setLastUsed(Utils.getUnixTime());
         setZoomLevel(100);
         setArchiveStatus(0);
+        setImageThumbnail(null, null);
+        setImageFront(null, null);
+        setImageBack(null, null);
     }
 
     /**
@@ -98,7 +120,10 @@ public class LoyaltyCard implements Parcelable {
                        @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                        final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
                        @Nullable final Integer headerColor, final int starStatus,
-                       final long lastUsed, final int zoomLevel, final int archiveStatus) {
+                       final long lastUsed, final int zoomLevel, final int archiveStatus,
+                       @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
+                       @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
+                       @Nullable Bitmap imageBack, @Nullable String imageBackPath) {
         setId(id);
         setStore(store);
         setNote(note);
@@ -114,6 +139,63 @@ public class LoyaltyCard implements Parcelable {
         setLastUsed(lastUsed);
         setZoomLevel(zoomLevel);
         setArchiveStatus(archiveStatus);
+        setImageThumbnail(imageThumbnail, imageThumbnailPath);
+        setImageFront(imageFront, imageFrontPath);
+        setImageBack(imageBack, imageBackPath);
+    }
+
+    @Nullable
+    public Bitmap getImageThumbnail(Context context) {
+        if (imageThumbnailPath != null) {
+            if (imageThumbnailPath.equals(TEMP_IMAGE_THUMBNAIL_FILE_NAME)) {
+                imageThumbnail = Utils.loadTempImage(context, imageThumbnailPath);
+            } else {
+                imageThumbnail = Utils.retrieveCardImage(context, imageThumbnailPath);
+            }
+            imageThumbnailPath = null;
+        }
+
+        if (imageThumbnail == null) {
+            return null;
+        }
+
+        return imageThumbnail.copy(imageThumbnail.getConfig(), imageThumbnail.isMutable());
+    }
+
+    @Nullable
+    public Bitmap getImageFront(Context context) {
+        if (imageFrontPath != null) {
+            if (imageFrontPath.equals(TEMP_IMAGE_FRONT_FILE_NAME)) {
+                imageFront = Utils.loadTempImage(context, imageFrontPath);
+            } else {
+                imageFront = Utils.retrieveCardImage(context, imageFrontPath);
+            }
+            imageFrontPath = null;
+        }
+
+        if (imageFront == null) {
+            return null;
+        }
+
+        return imageFront.copy(imageFront.getConfig(), imageFront.isMutable());
+    }
+
+    @Nullable
+    public Bitmap getImageBack(Context context) {
+        if (imageBackPath != null) {
+            if (imageBackPath.equals(TEMP_IMAGE_BACK_FILE_NAME)) {
+                imageBack = Utils.loadTempImage(context, imageBackPath);
+            } else {
+                imageBack = Utils.retrieveCardImage(context, imageBackPath);
+            }
+            imageBackPath = null;
+        }
+
+        if (imageBack == null) {
+            return null;
+        }
+
+        return imageBack.copy(imageBack.getConfig(), imageBack.isMutable());
     }
 
     public void setId(int id) {
@@ -188,59 +270,47 @@ public class LoyaltyCard implements Parcelable {
         this.archiveStatus = archiveStatus;
     }
 
-    protected LoyaltyCard(Parcel in) {
-        setId(in.readInt());
-        setStore(Objects.requireNonNull(in.readString()));
-        setNote(Objects.requireNonNull(in.readString()));
-        long tmpValidFrom = in.readLong();
-        setValidFrom(tmpValidFrom > 0 ? new Date(tmpValidFrom) : null);
-        long tmpExpiry = in.readLong();
-        setExpiry(tmpExpiry > 0 ? new Date(tmpExpiry) : null);
-        setBalance((BigDecimal) in.readValue(BigDecimal.class.getClassLoader()));
-        setBalanceType((Currency) in.readValue(Currency.class.getClassLoader()));
-        setCardId(Objects.requireNonNull(in.readString()));
-        setBarcodeId(in.readString());
-        String tmpBarcodeType = in.readString();
-        setBarcodeType((tmpBarcodeType != null && !tmpBarcodeType.isEmpty()) ? CatimaBarcode.fromName(tmpBarcodeType) : null);
-        int tmpHeaderColor = in.readInt();
-        setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
-        setStarStatus(in.readInt());
-        setLastUsed(in.readLong());
-        setZoomLevel(in.readInt());
-        setArchiveStatus(in.readInt());
+    public void setImageThumbnail(@Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath) {
+        if (imageThumbnail != null && imageThumbnailPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
+
+        this.imageThumbnailPath = imageThumbnailPath;
+        this.imageThumbnail = imageThumbnail != null ? imageThumbnail.copy(imageThumbnail.getConfig(), imageThumbnail.isMutable()) : null;
     }
 
-    @Override
-    public void writeToParcel(Parcel parcel, int flags) {
-        parcel.writeInt(id);
-        parcel.writeString(store);
-        parcel.writeString(note);
-        parcel.writeLong(validFrom != null ? validFrom.getTime() : -1);
-        parcel.writeLong(expiry != null ? expiry.getTime() : -1);
-        parcel.writeValue(balance);
-        parcel.writeValue(balanceType);
-        parcel.writeString(cardId);
-        parcel.writeString(barcodeId);
-        parcel.writeString(barcodeType != null ? barcodeType.name() : "");
-        parcel.writeInt(headerColor != null ? headerColor : -1);
-        parcel.writeInt(starStatus);
-        parcel.writeLong(lastUsed);
-        parcel.writeInt(zoomLevel);
-        parcel.writeInt(archiveStatus);
+    public void setImageFront(@Nullable Bitmap imageFront, @Nullable String imageFrontPath) {
+        if (imageFront != null && imageFrontPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
+
+        this.imageFrontPath = imageFrontPath;
+        this.imageFront = imageFront != null ? imageFront.copy(imageFront.getConfig(), imageFront.isMutable()) : null;
     }
 
-    public static LoyaltyCard fromBundle(Bundle bundle, boolean requireFull) {
-        // Grab default card
-        LoyaltyCard loyaltyCard = new LoyaltyCard();
+    public void setImageBack(@Nullable Bitmap imageBack, @Nullable String imageBackPath) {
+        if (imageBack != null && imageBackPath != null) {
+            throw new IllegalArgumentException("Cannot set both thumbnail and path");
+        }
 
-        // Update from bundle
-        loyaltyCard.updateFromBundle(bundle, requireFull);
-
-        // Return updated version
-        return loyaltyCard;
+        this.imageBackPath = imageBackPath;
+        this.imageBack = imageBack != null ? imageBack.copy(imageBack.getConfig(), imageBack.isMutable()) : null;
     }
 
-    public void updateFromBundle(Bundle bundle, boolean requireFull) {
+    @Nullable
+    public Bitmap getImageForImageLocationType(Context context, ImageLocationType imageLocationType) {
+        if (imageLocationType == ImageLocationType.icon) {
+            return getImageThumbnail(context);
+        } else if (imageLocationType == ImageLocationType.front) {
+            return getImageFront(context);
+        } else if (imageLocationType == ImageLocationType.back) {
+            return getImageBack(context);
+        }
+
+        throw new IllegalArgumentException("Unknown image location type");
+    }
+
+    public void updateFromBundle(@NonNull Bundle bundle, boolean requireFull) {
         if (bundle.containsKey(BUNDLE_LOYALTY_CARD_ID)) {
             setId(bundle.getInt(BUNDLE_LOYALTY_CARD_ID));
         } else if (requireFull) {
@@ -321,41 +391,107 @@ public class LoyaltyCard implements Parcelable {
         } else if (requireFull) {
             throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS);
         }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL)) {
+            setImageThumbnail(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_FRONT)) {
+            setImageFront(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_FRONT);
+        }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_IMAGE_BACK)) {
+            setImageBack(null, bundle.getString(BUNDLE_LOYALTY_CARD_IMAGE_BACK));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_IMAGE_BACK);
+        }
     }
 
-    public Bundle toBundle() {
+    public Bundle toBundle(Context context, List<String> exportLimit) {
+        boolean exportIsLimited = !exportLimit.isEmpty();
+
         Bundle bundle = new Bundle();
 
-        bundle.putInt(BUNDLE_LOYALTY_CARD_ID, id);
-        bundle.putString(BUNDLE_LOYALTY_CARD_STORE, store);
-        bundle.putString(BUNDLE_LOYALTY_CARD_NOTE, note);
-        if (validFrom != null) {
-            bundle.putLong(BUNDLE_LOYALTY_CARD_VALID_FROM, validFrom.getTime());
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ID)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ID, id);
         }
-        if (expiry != null) {
-            bundle.putLong(BUNDLE_LOYALTY_CARD_EXPIRY, expiry.getTime());
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_STORE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_STORE, store);
         }
-        bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE, balance.toString());
-        if (balanceType != null) {
-            bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE_TYPE, balanceType.toString());
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_NOTE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_NOTE, note);
         }
-        bundle.putString(BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
-        bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ID, barcodeId);
-        if (barcodeType != null) {
-            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType.name());
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_VALID_FROM)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_VALID_FROM, validFrom != null ? validFrom.getTime() : -1);
         }
-        if (headerColor != null) {
-            bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor);
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_EXPIRY)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_EXPIRY, expiry != null ? expiry.getTime() : -1);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BALANCE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE, balance.toString());
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BALANCE_TYPE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BALANCE_TYPE, balanceType != null ? balanceType.toString() : null);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_CARD_ID)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ID)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ID, barcodeId);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_STAR_STATUS)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_STAR_STATUS, starStatus);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_LAST_USED)) {
+            bundle.putLong(BUNDLE_LOYALTY_CARD_LAST_USED, lastUsed);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL, zoomLevel);
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS)) {
+            bundle.putInt(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS, archiveStatus);
+        }
+        // There is an (undocumented) size limit to bundles of around 2MB(?), when going over it you will experience a random crash
+        // So, instead of storing the bitmaps directly, we write the bitmap to a temp file and store the path
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL)) {
+            Bitmap thumbnail = getImageThumbnail(context);
+            if (thumbnail != null) {
+                Utils.saveTempImage(context, thumbnail, TEMP_IMAGE_THUMBNAIL_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL, TEMP_IMAGE_THUMBNAIL_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_THUMBNAIL, null);
+            }
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_FRONT)) {
+            Bitmap front = getImageFront(context);
+            if (front != null) {
+                Utils.saveTempImage(context, front, TEMP_IMAGE_FRONT_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT, TEMP_IMAGE_FRONT_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_FRONT, null);
+            }
+        }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_IMAGE_BACK)) {
+            Bitmap back = getImageBack(context);
+            if (back != null) {
+                Utils.saveTempImage(context, back, TEMP_IMAGE_BACK_FILE_NAME, Bitmap.CompressFormat.PNG);
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_BACK, TEMP_IMAGE_BACK_FILE_NAME);
+            } else {
+                bundle.putString(BUNDLE_LOYALTY_CARD_IMAGE_BACK, null);
+            }
         }
-        bundle.putInt(BUNDLE_LOYALTY_CARD_STAR_STATUS, starStatus);
-        bundle.putLong(BUNDLE_LOYALTY_CARD_LAST_USED, lastUsed);
-        bundle.putInt(BUNDLE_LOYALTY_CARD_ZOOM_LEVEL, zoomLevel);
-        bundle.putInt(BUNDLE_LOYALTY_CARD_ARCHIVE_STATUS, archiveStatus);
 
         return bundle;
     }
 
-    public static LoyaltyCard fromCursor(Cursor cursor) {
+    public static LoyaltyCard fromCursor(Context context, Cursor cursor) {
         // id
         int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
         // store
@@ -393,10 +529,33 @@ public class LoyaltyCard implements Parcelable {
         // archiveStatus
         int archiveStatus = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS));
 
-        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, zoomLevel, archiveStatus);
+        return new LoyaltyCard(
+                id,
+                store,
+                note,
+                validFrom,
+                expiry,
+                balance,
+                balanceType,
+                cardId,
+                barcodeId,
+                barcodeType,
+                headerColor,
+                starStatus,
+                lastUsed,
+                zoomLevel,
+                archiveStatus,
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.icon),
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.front),
+                null,
+                Utils.getCardImageFileName(id, ImageLocationType.back)
+        );
     }
 
-    public static boolean isDuplicate(final LoyaltyCard a, final LoyaltyCard b) {
+    public static boolean isDuplicate(Context context, final LoyaltyCard a, final LoyaltyCard b) {
+        // Note: Bitmap comparing is slow, be careful when calling this method
         // Skip lastUsed & zoomLevel
         return a.id == b.id && // non-nullable int
                 a.store.equals(b.store) && // non-nullable String
@@ -411,12 +570,23 @@ public class LoyaltyCard implements Parcelable {
                         b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
                 Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                 a.starStatus == b.starStatus && // non-nullable int
-                a.archiveStatus == b.archiveStatus; // non-nullable int
+                a.archiveStatus == b.archiveStatus && // non-nullable int
+                nullableBitmapsEqual(a.getImageThumbnail(context), b.getImageThumbnail(context)) && // nullable Bitmap
+                nullableBitmapsEqual(a.getImageFront(context), b.getImageFront(context)) && // nullable Bitmap
+                nullableBitmapsEqual(a.getImageBack(context), b.getImageBack(context)); // nullable Bitmap
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public static boolean nullableBitmapsEqual(@Nullable Bitmap a, @Nullable Bitmap b) {
+        if (a == null && b == null) {
+            return true;
+        }
+
+        if (a != null && b != null) {
+            return a.sameAs(b);
+        }
+
+        // One is null and the other isn't, so it's not equal
+        return false;
     }
 
     @NonNull
@@ -425,7 +595,8 @@ public class LoyaltyCard implements Parcelable {
         return String.format(
                 "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
                         + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
-                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  archiveStatus=%s%n}",
+                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  archiveStatus=%s%n"
+                        + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                 this.id,
                 this.store,
                 this.note,
@@ -440,19 +611,13 @@ public class LoyaltyCard implements Parcelable {
                 this.starStatus,
                 this.lastUsed,
                 this.zoomLevel,
-                this.archiveStatus
+                this.archiveStatus,
+                this.imageThumbnail,
+                this.imageThumbnailPath,
+                this.imageFront,
+                this.imageFrontPath,
+                this.imageBack,
+                this.imageBackPath
         );
     }
-
-    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
-        @Override
-        public LoyaltyCard createFromParcel(Parcel in) {
-            return new LoyaltyCard(in);
-        }
-
-        @Override
-        public LoyaltyCard[] newArray(int size) {
-            return new LoyaltyCard[size];
-        }
-    };
 }

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

@@ -80,7 +80,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public LoyaltyCard getCard(int position) {
         mCursor.moveToPosition(position);
-        return LoyaltyCard.fromCursor(mCursor);
+        return LoyaltyCard.fromCursor(mContext, mCursor);
     }
 
     public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
@@ -88,8 +88,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         boolean showDivider = false;
         inputHolder.mDivider.setVisibility(View.GONE);
 
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(inputCursor);
-        Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(mContext, inputCursor);
+        Bitmap icon = loyaltyCard.getImageThumbnail(mContext);
 
         if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
             showDivider = true;
@@ -124,9 +124,9 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         }
 
         inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText, new Settings(mContext).getPreferredColumnCount());
+        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText, new Settings(mContext).getPreferredColumnCount());
 
-        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
+        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0);
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -193,7 +193,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         int i;
         for (i = 0; i < mSelectedItems.size(); i++) {
             mCursor.moveToPosition(mSelectedItems.keyAt(i));
-            result.add(LoyaltyCard.fromCursor(mCursor));
+            result.add(LoyaltyCard.fromCursor(mContext, mCursor));
         }
 
         return result;
@@ -212,13 +212,11 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
-        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
+        public ImageView mCardIcon, mTickIcon;
         public MaterialCardView mRow;
         public ConstraintLayout mStar, mArchived;
         public View mDivider;
 
-        private int mIconBackgroundColor;
-
         protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
             super(loyaltyCardLayoutBinding.getRoot());
             View inputView = loyaltyCardLayoutBinding.getRoot();
@@ -232,10 +230,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mCardIcon = loyaltyCardLayoutBinding.thumbnail;
             mCardText = loyaltyCardLayoutBinding.thumbnailText;
             mStar = loyaltyCardLayoutBinding.star;
-            mStarBackground = loyaltyCardLayoutBinding.starBackground;
-            mStarBorder = loyaltyCardLayoutBinding.starBorder;
             mArchived = loyaltyCardLayoutBinding.archivedIcon;
-            mArchivedBackground = loyaltyCardLayoutBinding.archiveBackground;
             mTickIcon = loyaltyCardLayoutBinding.selectedThumbnail;
             inputView.setOnLongClickListener(view -> {
                 inputListener.onRowClicked(getAdapterPosition());
@@ -297,31 +292,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mNoteField.requestLayout();
         }
 
-        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, boolean colorByTheme) {
-            /* the below code does not work in android 5! hence the change of drawable instead
-            boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
-            Drawable borderDrawable = mStarBorder.getDrawable().mutate();
-            Drawable backgroundDrawable = mStarBackground.getDrawable().mutate();
-            DrawableCompat.setTint(borderDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
-            DrawableCompat.setTint(backgroundDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
-            mStarBorder.setImageDrawable(borderDrawable);
-            mStarBackground.setImageDrawable(backgroundDrawable);
-            */
-            boolean dark = Utils.needsDarkForeground(mIconBackgroundColor);
-            if (colorByTheme) {
-                dark = !mDarkModeEnabled;
-            }
-
-            if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
-                mStarBackground.setImageResource(R.drawable.ic_starred_black);
-                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24_black);
-            } else {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
-                mStarBackground.setImageResource(R.drawable.ic_starred_white);
-                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24);
-            }
-
+        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive) {
             if (enableStar) {
                 mStar.setVisibility(View.VISIBLE);
             } else{
@@ -333,11 +304,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             } else{
                 mArchived.setVisibility(View.GONE);
             }
-
-            mStarBorder.invalidate();
-            mStarBackground.invalidate();
-            mArchivedBackground.invalidate();
-
         }
     }
 }

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

@@ -329,7 +329,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
         binding.iconContainer.setOnClickListener(view -> {
-            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+            if (loyaltyCard.getImageThumbnail(this) != null) {
                 openImageInGallery(ImageType.ICON);
             } else {
                 Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
@@ -660,7 +660,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             window.setAttributes(attributes);
         }
 
-        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
+        loyaltyCard = DBHelper.getLoyaltyCard(this, database, loyaltyCardId);
         if (loyaltyCard == null) {
             Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
             Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
@@ -719,7 +719,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
         binding.fabEdit.setImageDrawable(editButtonIcon);
 
-        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
+        Bitmap icon = loyaltyCard.getImageThumbnail(this);
         Utils.setIconOrTextWithBackground(this, loyaltyCard, icon, binding.iconImage, binding.iconText, 1);
 
         // If the background is very bright, we should use dark icons
@@ -748,12 +748,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.BARCODE);
         }
 
-        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.front);
+        frontImageBitmap = loyaltyCard.getImageFront(this);
         if (frontImageBitmap != null) {
             imageTypes.add(ImageType.IMAGE_FRONT);
         }
 
-        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.back);
+        backImageBitmap = loyaltyCard.getImageBack(this);
         if (backImageBitmap != null) {
             imageTypes.add(ImageType.IMAGE_BACK);
         }

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

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
@@ -34,6 +35,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -200,6 +202,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     protected void onCreate(Bundle inputSavedInstanceState) {
         SplashScreen.installSplashScreen(this);
         super.onCreate(inputSavedInstanceState);
+
+        // Delete old cache files
+        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
+        new Thread(() -> {
+            long twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24);
+
+            File[] tempFiles = getCacheDir().listFiles();
+
+            if (tempFiles == null) {
+                Log.e(TAG, "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup...");
+                return;
+            }
+
+            for (File file : tempFiles) {
+                if (file.lastModified() < twentyFourHoursAgo) {
+                    if (!file.delete()) {
+                        Log.w(TAG, "Failed to delete cache file " + file.getPath());
+                    }
+                };
+            }
+        }).start();
+
         // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
         extractIntentFields(getIntent());
 
@@ -257,12 +281,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 return;
             }
 
-            Intent intent = result.getData();
-            List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
-
-            Bundle inputBundle = intent.getExtras();
-            String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValuesList(barcodeValuesList, group, false);
+            Intent editIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            editIntent.putExtras(result.getData().getExtras());
+            startActivity(editIntent);
         });
 
         mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -422,21 +443,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    private void processBarcodeValuesList(List<BarcodeValues> barcodeValuesList, String group, boolean closeAppOnNoBarcode) {
-        if (barcodeValuesList.isEmpty()) {
-            throw new IllegalArgumentException("barcodesValues may not be empty");
+    private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
+        if (parseResultList.isEmpty()) {
+            throw new IllegalArgumentException("parseResultList may not be empty");
         }
 
-        Utils.makeUserChooseBarcodeFromList(MainActivity.this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+        Utils.makeUserChooseParseResultFromList(MainActivity.this, parseResultList, new ParseResultListDisambiguatorCallback() {
             @Override
-            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
-                CatimaBarcode barcodeType = barcodeValues.format();
-
+            public void onUserChoseParseResult(ParseResult parseResult) {
                 Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, barcodeValues.content());
-                bundle.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-                bundle.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_ID, null);
+                Bundle bundle = parseResult.toLoyaltyCardBundle(MainActivity.this);
                 if (group != null) {
                     bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
                 }
@@ -457,28 +473,48 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         String receivedAction = intent.getAction();
         String receivedType = intent.getType();
 
-        // Check if an image or file was shared to us
-        if (Intent.ACTION_SEND.equals(receivedAction)) {
-            List<BarcodeValues> barcodeValuesList;
+        if (receivedAction == null || receivedType == null) {
+            return;
+        }
 
-            if (receivedType.equals("text/plain")) {
-                barcodeValuesList = Collections.singletonList(new BarcodeValues(null, intent.getStringExtra(Intent.EXTRA_TEXT)));
-            } else if (receivedType.startsWith("image/")) {
-                barcodeValuesList = Utils.retrieveBarcodesFromImage(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+        List<ParseResult> parseResultList;
+
+        // Check for shared text
+        if (receivedAction.equals(Intent.ACTION_SEND) && receivedType.equals("text/plain")) {
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT));
+            parseResultList = Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
+        } else {
+            // Parse whatever file was sent, regardless of opening or sharing
+            Uri data;
+            if (receivedAction.equals(Intent.ACTION_VIEW)) {
+                data = intent.getData();
+            } else if (receivedAction.equals(Intent.ACTION_SEND)) {
+                data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            } else {
+                Log.e(TAG, "Wrong action type to parse intent");
+                return;
+            }
+
+            if (receivedType.startsWith("image/")) {
+                parseResultList = Utils.retrieveBarcodesFromImage(this, data);
             } else if (receivedType.equals("application/pdf")) {
-                barcodeValuesList = Utils.retrieveBarcodesFromPdf(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+                parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
+            } else if (receivedType.equals("application/vnd.apple.pkpass")) {
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
             } else {
                 Log.e(TAG, "Wrong mime-type");
                 return;
             }
-
-            if (barcodeValuesList.isEmpty()) {
-                finish();
-                return;
-            }
-
-            processBarcodeValuesList(barcodeValuesList, null, true);
         }
+
+        // Give up if we should parse but there is nothing to parse
+        if (parseResultList == null || parseResultList.isEmpty()) {
+            finish();
+            return;
+        }
+
+        processParseResultList(parseResultList, null, true);
     }
 
     private void extractIntentFields(Intent intent) {

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

@@ -33,7 +33,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
 
     @Override
     public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(inputCursor);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(mContext, inputCursor);
         Boolean overlayValue = mInGroupOverlay.get(loyaltyCard.id);
         if ((overlayValue != null ? overlayValue : isLoyaltyCardInGroup(loyaltyCard.id))) {
             mAnimationItemsIndex.put(inputCursor.getPosition(), true);

app/src/main/java/protect/card_locker/ParseResult.kt

@@ -0,0 +1,31 @@
+package protect.card_locker
+
+import android.content.Context
+import android.os.Bundle
+
+class ParseResult(
+    val parseResultType: ParseResultType,
+    val loyaltyCard: LoyaltyCard) {
+    var note: String? = null
+
+    fun toLoyaltyCardBundle(context: Context): Bundle {
+        when (parseResultType) {
+            ParseResultType.FULL -> return loyaltyCard.toBundle(context, listOf())
+            ParseResultType.BARCODE_ONLY -> {
+                val defaultLoyaltyCard = LoyaltyCard()
+                defaultLoyaltyCard.setBarcodeId(null)
+                defaultLoyaltyCard.setBarcodeType(loyaltyCard.barcodeType)
+                defaultLoyaltyCard.setCardId(loyaltyCard.cardId)
+
+                return defaultLoyaltyCard.toBundle(
+                    context,
+                    listOf(
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_ID,
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_BARCODE_TYPE,
+                        LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID
+                    )
+                )
+            }
+        }
+    }
+}

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

@@ -0,0 +1,6 @@
+package protect.card_locker;
+
+public interface ParseResultListDisambiguatorCallback {
+    void onUserChoseParseResult(ParseResult parseResult);
+    void onUserDismissedSelector();
+}

app/src/main/java/protect/card_locker/ParseResultType.kt

@@ -0,0 +1,6 @@
+package protect.card_locker
+
+enum class ParseResultType {
+    FULL,
+    BARCODE_ONLY
+}

app/src/main/java/protect/card_locker/PkpassParser.kt

@@ -0,0 +1,437 @@
+package protect.card_locker
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.net.Uri
+import android.util.ArrayMap
+import android.util.Log
+import com.google.zxing.BarcodeFormat
+import net.lingala.zip4j.io.inputstream.ZipInputStream
+import net.lingala.zip4j.model.LocalFileHeader
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.math.BigDecimal
+import java.text.DateFormat
+import java.text.ParseException
+import java.time.ZonedDateTime
+import java.time.format.DateTimeParseException
+import java.util.Currency
+import java.util.Date
+
+class PkpassParser(context: Context, uri: Uri?) {
+    private var mContext = context
+
+    private var translations: ArrayMap<String, Map<String, String>> = ArrayMap()
+
+    private var passContent: JSONObject? = null
+
+    private var store: String? = null
+    private var note: String? = null
+    private var validFrom: Date? = null
+    private var expiry: Date? = null
+    private val balance: BigDecimal = BigDecimal(0)
+    private val balanceType: Currency? = null
+    private var cardId: String? = null
+    private var barcodeId: String? = null
+    private var barcodeType: CatimaBarcode? = null
+    private var headerColor: Int? = null
+    private val starStatus = 0
+    private val lastUsed: Long = 0
+    private val zoomLevel = DBHelper.DEFAULT_ZOOM_LEVEL
+    private var archiveStatus = 0
+
+    var image: Bitmap? = null
+        private set
+    private var logoSize = 0
+
+    init {
+        if (passContent != null) {
+            throw IllegalStateException("Pkpass instance already initialized!")
+        }
+
+        mContext = context
+
+        Log.i(TAG, "Received Pkpass file")
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data")
+            throw IOException(context.getString(R.string.errorReadingFile))
+        }
+
+        try {
+            mContext.contentResolver.openInputStream(uri).use { inputStream ->
+                ZipInputStream(inputStream).use { zipInputStream ->
+                    var localFileHeader: LocalFileHeader
+                    while ((zipInputStream.nextEntry.also { localFileHeader = it }) != null) {
+                        // Ignore directories
+                        if (localFileHeader.isDirectory) continue
+
+                        // We assume there are three options, as per spec:
+                        // language.lproj/pass.strings
+                        // file.extension
+                        // More directories are ignored
+                        val filenameParts = localFileHeader.fileName.split('/')
+                        if (filenameParts.size > 2) {
+                            continue
+                        } else if (filenameParts.size == 2) {
+                            // Doesn't seem like a language directory, ignore
+                            if (!filenameParts[0].endsWith(".lproj")) continue
+
+                            val locale = filenameParts[0].removeSuffix(".lproj")
+
+                            translations[locale] = parseLanguageStrings(ZipUtils.read(zipInputStream))
+                        }
+
+                        // Not a language, parse as normal files
+                        when (localFileHeader.fileName) {
+                            "logo.png" -> loadImageIfBiggerSize(1, zipInputStream)
+                            "logo@2x.png" -> loadImageIfBiggerSize(2, zipInputStream)
+                            "logo@3x.png" -> loadImageIfBiggerSize(3, zipInputStream)
+                            "pass.json" -> passContent = ZipUtils.readJSON(zipInputStream) // Parse this last, so we're sure we have all language info
+                        }
+                    }
+
+                    checkNotNull(passContent) { "File lacks pass.json" }
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            throw IOException(mContext.getString(R.string.errorReadingFile))
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+
+    fun listLocales(): List<String> {
+        return translations.keys.toList()
+    }
+
+    fun toLoyaltyCard(locale: String?): LoyaltyCard {
+        parsePassJSON(checkNotNull(passContent) { "Pkpass instance not yet initialized!" }, locale)
+
+        return LoyaltyCard(
+            -1,
+            store,
+            note,
+            validFrom,
+            expiry,
+            balance,
+            balanceType,
+            cardId,
+            barcodeId,
+            barcodeType,
+            headerColor,
+            starStatus,
+            lastUsed,
+            zoomLevel,
+            archiveStatus,
+            image,
+            null,
+            null,
+            null,
+            null,
+            null
+        )
+    }
+
+    private fun getTranslation(string: String, locale: String?): String {
+        if (locale == null) {
+            return string
+        }
+
+        val localeStrings = translations[locale]
+
+        return localeStrings?.get(string) ?: string
+    }
+
+    private fun loadImageIfBiggerSize(fileLogoSize: Int, zipInputStream: ZipInputStream) {
+        if (logoSize < fileLogoSize) {
+            image = ZipUtils.readImage(zipInputStream)
+            logoSize = fileLogoSize
+        }
+    }
+
+    private fun parseColor(color: String): Int? {
+        // First, try formats supported by Android natively
+        try {
+            return Color.parseColor(color)
+        } catch (ignored: IllegalArgumentException) {}
+
+        // If that didn't work, try parsing it as a rbg(0,0,255) value
+        val red: Int;
+        val green: Int;
+        val blue: Int;
+
+        // Parse rgb(0,0,0) string
+        val rgbInfo = Regex("""^rgb\(\s*(?<red>\d+)\s*,\s*(?<green>\d+)\s*,\s*(?<blue>\d+)\s*\)$""").find(color)
+        if (rgbInfo == null) {
+            return null
+        }
+
+        // Convert to integers
+        try {
+            red = rgbInfo.groups[1]!!.value.toInt()
+            green = rgbInfo.groups[2]!!.value.toInt()
+            blue = rgbInfo.groups[3]!!.value.toInt()
+        } catch (e: NumberFormatException) {
+            return null
+        }
+
+        // Ensure everything is in a valid range as Color.rgb does not do range checks
+        if (red < 0 || red > 255) return null
+        if (green < 0 || green > 255) return null
+        if (blue < 0 || blue > 255) return null
+
+        return Color.rgb(red, green, blue)
+    }
+
+    private fun parseDateTime(dateTime: String): Date {
+        return Date.from(ZonedDateTime.parse(dateTime).toInstant())
+    }
+
+    private fun parseLanguageStrings(data: String): Map<String, String> {
+        val output = ArrayMap<String, String>()
+
+        // Translations look like this:
+        // "key_name" = "Translated value";
+        //
+        // However, "Translated value" may be multiple lines and may contain " (however, it'll be escaped)
+        var translationLine = StringBuilder()
+
+        for (line in data.lines()) {
+            translationLine.append(line)
+
+            // Make sure we don't have a false ending (this is the escaped double quote: \";)
+            if (!line.endsWith("\\\";") and line.endsWith("\";")) {
+                // We reached a translation ending, time to parse it
+
+                // 1. Split into key and value
+                // 2. Remove cruft of each
+                // 3. Clean up escape sequences
+                val keyValue = translationLine.toString().split("=", ignoreCase = false, limit = 2)
+                val key = keyValue[0].trim().removePrefix("\"").removeSuffix("\"")
+                val value = keyValue[1].trim().removePrefix("\"").removeSuffix("\";").replace("\\", "")
+
+                output[key] = value
+
+                translationLine = StringBuilder()
+            } else {
+                translationLine.append("\n")
+            }
+        }
+
+        return output
+    }
+
+    private fun parsePassJSON(jsonObject: JSONObject, locale: String?) {
+        if (jsonObject.getInt("formatVersion") != 1) {
+            throw IllegalArgumentException(mContext.getString(R.string.unsupportedFile))
+        }
+
+        // Prefer logoText for store, it's generally shorter
+        try {
+            store = jsonObject.getString("logoText")
+        } catch (ignored: JSONException) {}
+
+        if (store.isNullOrEmpty()) {
+            store = jsonObject.getString("organizationName")
+        }
+
+        val noteText = StringBuilder()
+        noteText.append(getTranslation(jsonObject.getString("description"), locale))
+
+        try {
+            validFrom = parseDateTime(jsonObject.getString("relevantDate"))
+        } catch (ignored: JSONException) {}
+
+        try {
+            expiry = parseDateTime(jsonObject.getString("expirationDate"))
+        } catch (ignored: JSONException) {}
+
+        try {
+            headerColor = parseColor(jsonObject.getString("backgroundColor"))
+        } catch (ignored: JSONException) {}
+
+        var pkPassHasBarcodes = false
+        var validBarcodeFound = false
+
+        // Create a list of possible barcodes
+        val barcodes = ArrayList<JSONObject>()
+
+        // Append the non-deprecated entries
+        try {
+            val foundInBarcodesField = jsonObject.getJSONArray("barcodes")
+
+            for (i in 0 until foundInBarcodesField.length()) {
+                barcodes.add(foundInBarcodesField.getJSONObject(i))
+            }
+        } catch (ignored: JSONException) {}
+
+        // Append the deprecated entry if it exists
+        try {
+            barcodes.add(jsonObject.getJSONObject("barcode"))
+        } catch (ignored: JSONException) {}
+
+        for (barcode in barcodes) {
+            pkPassHasBarcodes = true
+
+            try {
+                parsePassJSONBarcodeField(barcode)
+
+                validBarcodeFound = true
+                break
+            } catch (ignored: IllegalArgumentException) {}
+        }
+
+        if (pkPassHasBarcodes && !validBarcodeFound) {
+            throw FormatException(mContext.getString(R.string.errorReadingFile))
+        }
+
+        // An used card being "archived" probably is the most sensible way to map "voided"
+        archiveStatus = try {
+            if (jsonObject.getBoolean("voided")) 1 else 0
+        } catch (ignored: JSONException) {
+            0
+        }
+
+        // Append type-specific info to the pass
+        noteText.append("\n\n")
+
+        // Find the relevant pass type and parse it
+        var hasPassData = false
+        for (passType in listOf("boardingPass", "coupon", "eventTicket", "generic")) {
+            try {
+                noteText.append(
+                    parsePassJSONPassFields(
+                        jsonObject.getJSONObject(passType),
+                        locale
+                    )
+                )
+
+                hasPassData = true
+
+                break
+            } catch (ignored: JSONException) {}
+        }
+
+        // Failed to parse anything, error out
+        if (!hasPassData) {
+            throw FormatException(mContext.getString(R.string.errorReadingFile))
+        }
+
+        note = noteText.toString()
+    }
+
+    /* Return success or failure */
+    private fun parsePassJSONBarcodeField(barcodeInfo: JSONObject) {
+        val format = barcodeInfo.getString("format")
+
+        // We only need to check these 4 formats as no other options are valid in the PkPass spec
+        barcodeType = when(format) {
+            "PKBarcodeFormatQR" -> CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE)
+            "PKBarcodeFormatPDF417" -> CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417)
+            "PKBarcodeFormatAztec" -> CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC)
+            "PKBarcodeFormatCode128" -> CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128)
+            else -> throw IllegalArgumentException("No valid barcode type")
+        }
+
+        // FIXME: We probably need to do something with the messageEncoding field
+        try {
+            cardId = barcodeInfo.getString("altText")
+            barcodeId = barcodeInfo.getString("message")
+        } catch (ignored: JSONException) {
+            cardId = barcodeInfo.getString("message")
+            barcodeId = null
+        }
+
+        // Don't set barcodeId if it's the same as cardId
+        if (cardId == barcodeId) {
+            barcodeId = null
+        }
+    }
+
+    private fun parsePassJSONPassFields(fieldsParent: JSONObject, locale: String?): String {
+        // These fields contain a lot of info on where we're supposed to display them, but Catima doesn't really have anything for that
+        // So for now, throw them all into the description field in a logical order
+        val noteContents: MutableList<String> = ArrayList()
+
+        // Collect all the groups of fields that exist
+        for (fieldType in listOf("headerFields", "primaryFields", "secondaryFields", "auxiliaryFields", "backFields")) {
+            val content = StringBuilder()
+
+            try {
+                val fieldArray = fieldsParent.getJSONArray(fieldType)
+                for (i in 0 until fieldArray.length()) {
+                    val entry = fieldArray.getJSONObject(i)
+
+                    content.append(parsePassJSONPassField(entry, locale))
+
+                    // If this is not the last part, add spacing on the end
+                    if (i < (fieldArray.length() - 1)) {
+                        content.append("\n")
+                    }
+                }
+            } catch (ignore: JSONException) {
+            } catch (ignore: ParseException) {
+            }
+
+            if (content.isNotEmpty()) {
+                noteContents.add(content.toString())
+            }
+        }
+
+        // Merge all field groups together, one paragraph for field group
+        val output = StringBuilder()
+
+        for (i in 0 until noteContents.size) {
+            output.append(noteContents[i])
+
+            // If this is not the last part, add newlines to separate
+            if (i < (noteContents.size - 1)) {
+                output.append("\n\n")
+            }
+        }
+
+        return output.toString()
+    }
+
+    private fun parsePassJSONPassField(field: JSONObject, locale: String?): String {
+        // Value may be a localizable string, a date or a number. So let's try to parse it as a date first
+
+        var value = getTranslation(field.getString("value"), locale)
+        try {
+            value = DateFormat.getDateTimeInstance().format(parseDateTime(value))
+        } catch (ignored: DateTimeParseException) {
+            // It's fine if it's not a date
+        }
+
+        // FIXME: Use the Android thing for formatted strings here
+        if (field.has("currencyCode")) {
+            val valueCurrency = Currency.getInstance(field.getString("currencyCode"))
+
+            value = Utils.formatBalance(
+                mContext,
+                Utils.parseBalance(value, valueCurrency),
+                valueCurrency
+            )
+        } else if (field.has("numberStyle")) {
+            if (field.getString("numberStyle") == "PKNumberStylePercent") {
+                // FIXME: Android formatting string
+                value = "${value}%"
+            }
+        }
+
+        val label = getTranslation(field.getString("label"), locale)
+
+        if (label.isNotEmpty()) {
+            return "$label: $value"
+        }
+
+        return value
+    }
+
+    companion object {
+        private const val TAG = "Catima"
+    }
+}

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

@@ -67,6 +67,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
     private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
     private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
+    private static final int PERMISSION_SCAN_ADD_FROM_PKPASS = 102;
 
     private CaptureManager capture;
     private DecoratedBarcodeView barcodeScannerView;
@@ -79,6 +80,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     // can't use the pre-made contract because that launches the file manager for image type instead of gallery
     private ActivityResultLauncher<Intent> photoPickerLauncher;
     private ActivityResultLauncher<Intent> pdfPickerLauncher;
+    private ActivityResultLauncher<Intent> pkpassPickerLauncher;
 
     static final String STATE_SCANNER_ACTIVE = "scannerActive";
     private boolean mScannerActive = true;
@@ -107,6 +109,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
         photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
         pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
+        pkpassPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PKPASS_FILE, result.getResultCode(), result.getData()));
         customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
             setScannerActive(false);
 
@@ -116,12 +119,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
                 getString(R.string.addManually),
                 getString(R.string.addFromImage),
                 getString(R.string.addFromPdfFile),
+                getString(R.string.addFromPkpass)
             };
             Object[] icons = new Object[]{
                 R.drawable.baseline_block_24,
                 R.drawable.ic_edit,
                 R.drawable.baseline_image_24,
                 R.drawable.baseline_picture_as_pdf_24,
+                R.drawable.local_activity_24px
             };
             String[] columns = new String[]{"text", "icon"};
 
@@ -156,7 +161,10 @@ public class ScanActivity extends CatimaAppCompatActivity {
                                 addFromImage();
                                 break;
                             case 3:
-                                addFromPdfFile();
+                                addFromPdf();
+                                break;
+                            case 4:
+                                addFromPkPass();
                                 break;
                             default:
                                 throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
@@ -181,16 +189,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
         barcodeScannerView.decodeSingle(new BarcodeCallback() {
             @Override
             public void barcodeResult(BarcodeResult result) {
-                Intent scanResult = new Intent();
-                Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BARCODE_FORMAT, result.getBarcodeFormat().name());
-                if (addGroup != null) {
-                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-                }
-                scanResult.putExtras(scanResultBundle);
-                ScanActivity.this.setResult(RESULT_OK, scanResult);
-                finish();
+                LoyaltyCard loyaltyCard = new LoyaltyCard();
+                loyaltyCard.setCardId(result.getText());
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(result.getBarcodeFormat()));
+
+                returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
             }
 
             @Override
@@ -294,35 +297,31 @@ public class ScanActivity extends CatimaAppCompatActivity {
         mScannerActive = isActive;
     }
 
-    private void returnResult(String barcodeContents, String barcodeFormat) {
-        Intent manualResult = new Intent();
-        Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BARCODE_CONTENTS, barcodeContents);
-        manualResultBundle.putString(BARCODE_FORMAT, barcodeFormat);
+    private void returnResult(ParseResult parseResult) {
+        Intent result = new Intent();
+        Bundle bundle = parseResult.toLoyaltyCardBundle(ScanActivity.this);
         if (addGroup != null) {
-            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+            bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
         }
-        manualResult.putExtras(manualResultBundle);
-        ScanActivity.this.setResult(RESULT_OK, manualResult);
+        result.putExtras(bundle);
+        ScanActivity.this.setResult(RESULT_OK, result);
         finish();
     }
 
     private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        List<ParseResult> parseResultList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        if (barcodeValuesList.isEmpty()) {
+        if (parseResultList.isEmpty()) {
             setScannerActive(true);
             return;
         }
 
-        Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+        Utils.makeUserChooseParseResultFromList(this, parseResultList, new ParseResultListDisambiguatorCallback() {
             @Override
-            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
-                CatimaBarcode barcodeType = barcodeValues.format();
-
-                returnResult(barcodeValues.content(), barcodeType != null ? barcodeType.name() : null);
+            public void onUserChoseParseResult(ParseResult parseResult) {
+                returnResult(parseResult);
             }
 
             @Override
@@ -369,7 +368,9 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         // Buttons
         builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            returnResult(input.getText().toString(), null);
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(input.getText().toString());
+            returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
         });
         builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
@@ -418,10 +419,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
     }
 
-    public void addFromPdfFile() {
+    public void addFromPdf() {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
     }
 
+    public void addFromPkPass() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS);
+    }
+
     private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
         Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
         photoPickerIntent.setType(mimeType);
@@ -511,12 +516,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
             } else {
                 showCameraPermissionMissingText();
             }
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF || requestCode == PERMISSION_SCAN_ADD_FROM_PKPASS) {
             if (granted) {
                 if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
                     addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
-                } else {
+                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
                     addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                } else {
+                    addFromImageOrFileAfterPermission("application/*", pkpassPickerLauncher, R.string.addFromPkpass, R.string.failedLaunchingFileManager);
                 }
             } else {
                 setScannerActive(true);

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

@@ -33,7 +33,6 @@ class ShortcutHelper {
     private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
     private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
     private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
-    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);
 
     /**
      * Add a card to the app shortcuts, and maintain a list of the most
@@ -87,7 +86,7 @@ class ShortcutHelper {
         for (int index = 0; index < list.size(); index++) {
             ShortcutInfoCompat prevShortcut = list.get(index);
 
-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(database, Integer.parseInt(prevShortcut.getId()));
+            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, Integer.parseInt(prevShortcut.getId()));
 
             // skip outdated cards that no longer exist
             if (loyaltyCard != null) {
@@ -120,7 +119,7 @@ class ShortcutHelper {
     Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
         Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
         Canvas output = new Canvas(ret);
-        output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor));
+        output.drawColor(paddingColor);
         Bitmap resized = Utils.resizeBitmap(in, ADAPTIVE_BITMAP_IMAGE_SIZE);
         output.drawBitmap(resized, (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2f, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2f, null);
         return ret;
@@ -136,11 +135,11 @@ class ShortcutHelper {
         bundle.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
         intent.putExtras(bundle);
 
-        Bitmap iconBitmap = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        Bitmap iconBitmap = loyaltyCard.getImageThumbnail(context);
         if (iconBitmap == null) {
             iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
         } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.getHeaderColor(context, loyaltyCard));
+            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.needsDarkForeground(Utils.getHeaderColor(context, loyaltyCard)) ? Color.BLACK : Color.WHITE);
         }
 
         IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);

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

@@ -9,6 +9,7 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
@@ -78,6 +79,7 @@ import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -95,12 +97,13 @@ public class Utils {
     public static final int BARCODE_SCAN = 3;
     public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
     public static final int BARCODE_IMPORT_FROM_PDF_FILE = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 6;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 7;
-    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 8;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 9;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 10;
-    public static final int CARD_IMAGE_FROM_FILE_ICON = 11;
+    public static final int BARCODE_IMPORT_FROM_PKPASS_FILE = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 7;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 8;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 9;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 10;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 11;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 12;
 
     public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
 
@@ -143,7 +146,7 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
-    static public List<BarcodeValues> retrieveBarcodesFromImage(Context context, Uri uri) {
+    static public List<ParseResult> retrieveBarcodesFromImage(Context context, Uri uri) {
         Log.i(TAG, "Received image file with possible barcode");
 
         if (uri == null) {
@@ -162,7 +165,7 @@ public class Utils {
             return new ArrayList<>();
         }
 
-        List<BarcodeValues> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
+        List<ParseResult> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
 
         if (barcodesFromBitmap.isEmpty()) {
             Log.i(TAG, "No barcode found in image file");
@@ -172,7 +175,39 @@ public class Utils {
         return barcodesFromBitmap;
     }
 
-    static public List<BarcodeValues> retrieveBarcodesFromPdf(Context context, Uri uri) {
+    static public List<ParseResult> retrieveBarcodesFromPkPass(Context context, Uri uri) {
+        Log.i(TAG, "Received Pkpass file with possible barcode");
+        if (uri == null) {
+            Log.e(TAG, "Pkpass did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        PkpassParser pkpassParser;
+        try {
+             pkpassParser = new PkpassParser(context, uri);
+        } catch (Exception e) {
+            Log.e(TAG, "Error reading pkpass file", e);
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<String> locales = pkpassParser.listLocales();
+        if (locales.isEmpty()) {
+            return Collections.singletonList(new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null)));
+        }
+
+        List<ParseResult> parseResultList = new ArrayList<>();
+        for (String locale : locales) {
+            ParseResult parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
+            parseResult.setNote(locale);
+            parseResultList.add(parseResult);
+        }
+
+        return parseResultList;
+    }
+
+    static public List<ParseResult> retrieveBarcodesFromPdf(Context context, Uri uri) {
         Log.i(TAG, "Received PDF file with possible barcode");
         if (uri == null) {
             Log.e(TAG, "Uri did not contain any data");
@@ -182,7 +217,7 @@ public class Utils {
 
         ParcelFileDescriptor parcelFileDescriptor = null;
         PdfRenderer renderer = null;
-        List<BarcodeValues> barcodesFromPdfPages = new ArrayList<>();
+        List<ParseResult> barcodesFromPdfPages = new ArrayList<>();
 
         try {
             parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r");
@@ -194,13 +229,20 @@ public class Utils {
                 for (int i = 0; i < renderer.getPageCount(); i++) {
                     PdfRenderer.Page page = renderer.openPage(i);
                     renderedPage = Bitmap.createBitmap(page.getWidth(), page.getHeight(), Bitmap.Config.ARGB_8888);
+
+                    // Ensure the page has a background
+                    // Fixes some transparent PDF files not being read well
+                    Canvas canvas = new Canvas(renderedPage);
+                    canvas.drawColor(Color.WHITE);
+                    canvas.drawBitmap(renderedPage, 0, 0, null);
+
                     page.render(renderedPage, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
                     page.close();
 
-                    List<BarcodeValues> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
-                    for (BarcodeValues barcodeValues : barcodesFromPage) {
-                        barcodeValues.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
-                        barcodesFromPdfPages.add(barcodeValues);
+                    List<ParseResult> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
+                    for (ParseResult parseResult : barcodesFromPage) {
+                        parseResult.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
+                        barcodesFromPdfPages.add(parseResult);
                     }
                 }
             }
@@ -229,17 +271,17 @@ public class Utils {
     }
 
     /**
-     * Returns the Barcode format and content based on the result of an activity.
-     * It shows toasts to notify the end-user as needed itself and will return an empty
-     * BarcodeValues object if the activity was cancelled or nothing could be found.
+     * Returns the ParseResult based on the result of an activity.
+     * It shows toasts to notify the end-user as needed itself and will return an empty list if the
+     * activity was cancelled or nothing could be found.
      *
      * @param requestCode
      * @param resultCode
      * @param intent
      * @param context
-     * @return BarcodeValues
+     * @return List<ParseResult>
      */
-    static public List<BarcodeValues> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+    static public List<ParseResult> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
 
@@ -255,6 +297,10 @@ public class Utils {
             return retrieveBarcodesFromPdf(context, intent.getData());
         }
 
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_PKPASS_FILE) {
+            return retrieveBarcodesFromPkPass(context, intent.getData());
+        }
+
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
             if (requestCode == Utils.BARCODE_SCAN) {
                 Log.i(TAG, "Received barcode information from camera");
@@ -268,7 +314,15 @@ public class Utils {
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            return Collections.singletonList(new BarcodeValues(format != null ? CatimaBarcode.fromName(format) : null, contents));
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            if (format != null) {
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromName(format));
+            }
+            if (contents != null) {
+                loyaltyCard.setCardId(contents);
+            }
+
+            return Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
         }
 
         throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
@@ -288,7 +342,7 @@ public class Utils {
         return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
     }
 
-    static public List<BarcodeValues> getBarcodesFromBitmap(Bitmap bitmap) {
+    static public List<ParseResult> getBarcodesFromBitmap(Bitmap bitmap) {
         // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
         for (int i = 0; i < 10; i++) {
             try {
@@ -303,7 +357,7 @@ public class Utils {
         return new ArrayList<>();
     }
 
-    static private List<BarcodeValues> getBarcodesFromBitmapReal(Bitmap bitmap) {
+    static private List<ParseResult> getBarcodesFromBitmapReal(Bitmap bitmap) {
         // In order to decode it, the Bitmap must first be converted into a pixel array...
         int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
         bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
@@ -312,7 +366,7 @@ public class Utils {
         LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
         BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
 
-        List<BarcodeValues> barcodeValuesList = new ArrayList<>();
+        List<ParseResult> parseResultList = new ArrayList<>();
         try {
             MultiFormatReader multiFormatReader = new MultiFormatReader();
             MultipleBarcodeReader multipleBarcodeReader = new GenericMultipleBarcodeReader(multiFormatReader);
@@ -323,37 +377,42 @@ public class Utils {
                 Log.i(TAG, "Read barcode id: " + barcodeResult.getText());
                 Log.i(TAG, "Read format: " + barcodeResult.getBarcodeFormat().name());
 
-                barcodeValuesList.add(new BarcodeValues(CatimaBarcode.fromBarcode(barcodeResult.getBarcodeFormat()), barcodeResult.getText()));
+                LoyaltyCard loyaltyCard = new LoyaltyCard();
+                loyaltyCard.setCardId(barcodeResult.getText());
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(barcodeResult.getBarcodeFormat()));
+                parseResultList.add(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
             }
 
-            return barcodeValuesList;
+            return parseResultList;
         } catch (NotFoundException e) {
-            return barcodeValuesList;
+            return parseResultList;
         }
     }
 
-    static public void makeUserChooseBarcodeFromList(Context context, List<BarcodeValues> barcodeValuesList, BarcodeValuesListDisambiguatorCallback callback) {
+    static public void makeUserChooseParseResultFromList(Context context, List<ParseResult> parseResultList, ParseResultListDisambiguatorCallback callback) {
         // If there is only one choice, consider it chosen
-        if (barcodeValuesList.size() == 1) {
-            callback.onUserChoseBarcode(barcodeValuesList.get(0));
+        if (parseResultList.size() == 1) {
+            callback.onUserChoseParseResult(parseResultList.get(0));
             return;
         }
 
         // Ask user to choose a barcode
         // TODO: This should contain an image of the barcode in question to help users understand the choice they're making
-        CharSequence[] barcodeDescriptions = new CharSequence[barcodeValuesList.size()];
-        for (int i = 0; i < barcodeValuesList.size(); i++) {
-            BarcodeValues barcodeValues = barcodeValuesList.get(i);
-            CatimaBarcode catimaBarcode = barcodeValues.format();
+        CharSequence[] barcodeDescriptions = new CharSequence[parseResultList.size()];
+        for (int i = 0; i < parseResultList.size(); i++) {
+            ParseResult parseResult = parseResultList.get(i);
+            CatimaBarcode catimaBarcode = parseResult.getLoyaltyCard().barcodeType;
 
-            String barcodeContent = barcodeValues.content();
+            String barcodeContent = parseResult.getLoyaltyCard().cardId;
             // Shorten overly long barcodes
             if (barcodeContent.length() > 22) {
                 barcodeContent = barcodeContent.substring(0, 20) + "…";
             }
 
-            if (barcodeValues.note() != null) {
-                barcodeDescriptions[i] = String.format("%s: %s (%s)", barcodeValues.note(), catimaBarcode != null ? catimaBarcode.prettyName() : context.getString(R.string.noBarcode), barcodeContent);
+            String parseResultNote = parseResult.getNote();
+
+            if (parseResultNote != null) {
+                barcodeDescriptions[i] = String.format("%s: %s (%s)", parseResultNote, catimaBarcode != null ? catimaBarcode.prettyName() : context.getString(R.string.noBarcode), barcodeContent);
             } else {
                 barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode != null ? catimaBarcode.prettyName() : context.getString(R.string.noBarcode), barcodeContent);
             }
@@ -363,7 +422,7 @@ public class Utils {
         builder.setTitle(context.getString(R.string.multipleBarcodesFoundPleaseChooseOne));
         builder.setItems(
                 barcodeDescriptions,
-                (dialogInterface, i) -> callback.onUserChoseBarcode(barcodeValuesList.get(i))
+                (dialogInterface, i) -> callback.onUserChoseParseResult(parseResultList.get(i))
         );
         builder.setOnCancelListener(dialogInterface -> callback.onUserDismissedSelector());
         builder.show();
@@ -783,7 +842,7 @@ public class Utils {
         }
     }
 
-    public static Bitmap loadImage(String path) {
+    public static @Nullable Bitmap loadImage(String path) {
         try {
             return BitmapFactory.decodeStream(new FileInputStream(path));
         } catch (IOException e) {
@@ -792,7 +851,7 @@ public class Utils {
         }
     }
 
-    public static Bitmap loadTempImage(Context context, String name) {
+    public static @Nullable Bitmap loadTempImage(Context context, String name) {
         return loadImage(context.getCacheDir() + "/" + name);
     }
 
@@ -869,7 +928,7 @@ public class Utils {
         return typedValue.data;
     }
 
-    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
+    public static int getHeaderColorFromImage(@Nullable Bitmap image, int fallback) {
         if (image == null) {
             return fallback;
         }
@@ -937,11 +996,16 @@ public class Utils {
     public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage, int columnCount) {
         int headerColor = getHeaderColor(context, loyaltyCard);
         backgroundOrIcon.setImageBitmap(icon);
-        backgroundOrIcon.setBackgroundColor(headerColor);
 
         if (icon != null) {
+            // Use header colour to decide if this image will need a white or black background
+            backgroundOrIcon.setBackgroundColor(needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+
             textWhenNoImage.setVisibility(View.GONE);
         } else {
+            // Use header colour as background colour
+            backgroundOrIcon.setBackgroundColor(headerColor);
+
             // Manually calculate how many lines will be needed
             // This is necessary because Android's auto sizing will split over lines way before reaching the minimum font size and store names split over multiple lines are harder to scan with a quick glance so we should try to prevent it
             // Because we have to write the text before we can actually know the exact laid out size (trying to delay this causes bugs where the autosize fails) we have to take some... weird shortcuts
@@ -968,21 +1032,6 @@ public class Utils {
         return headerColor;
     }
 
-    public static boolean installedFromGooglePlay(Context context) {
-        try {
-            String packageName = context.getPackageName();
-            String installer;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                installer = context.getPackageManager().getInstallSourceInfo(packageName).getInstallingPackageName();
-            } else {
-                installer = context.getPackageManager().getInstallerPackageName(packageName);
-            }
-            return installer.equals("com.android.vending");
-        } catch (Throwable ignored) {
-            return false;
-        }
-    }
-
     public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
         return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
     }

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

@@ -23,7 +23,7 @@ public class ZipUtils {
         return new JSONObject(read(zipInputStream));
     }
 
-    private static String read(ZipInputStream zipInputStream) throws IOException {
+    public static String read(ZipInputStream zipInputStream) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
         int c;

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

@@ -49,7 +49,7 @@ public class CatimaExporter implements Exporter {
         // Generate CSV
         ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
         OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
-        writeCSV(database, catimaOutputStreamWriter);
+        writeCSV(context, database, catimaOutputStreamWriter);
 
         // Add CSV to zip file
         ZipParameters csvZipParameters = createZipParameters("catima.csv", password);
@@ -64,12 +64,12 @@ public class CatimaExporter implements Exporter {
         Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
         while (cardCursor.moveToNext()) {
             // For each card
-            LoyaltyCard card = LoyaltyCard.fromCursor(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);
 
             // For each image
             for (ImageLocationType imageLocationType : ImageLocationType.values()) {
                 // If it exists, add to the .zip file
-                Bitmap image = Utils.retrieveCardImage(context, card.id, imageLocationType);
+                Bitmap image = card.getImageForImageLocationType(context, imageLocationType);
                 if (image != null) {
                     ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType), password);
                     zipOutputStream.putNextEntry(imageZipParameters);
@@ -95,7 +95,7 @@ public class CatimaExporter implements Exporter {
         return zipParameters;
     }
 
-    private void writeCSV(SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
+    private void writeCSV(Context context, SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
         CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
 
         // Print the version
@@ -142,7 +142,7 @@ public class CatimaExporter implements Exporter {
         Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
 
         while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cardCursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);
 
             printer.printRecord(card.id,
                     card.store,
@@ -176,7 +176,7 @@ public class CatimaExporter implements Exporter {
         Cursor cardCursor2 = DBHelper.getLoyaltyCardCursor(database);
 
         while (cardCursor2.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cardCursor2);
+            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor2);
 
             for (Group group : DBHelper.getLoyaltyCardGroups(database, card.id)) {
                 printer.printRecord(card.id, group._id);

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

@@ -124,7 +124,7 @@ public class CatimaImporter implements Importer {
         Set<String> existingImages = DBHelper.imageFiles(context, database);
 
         for (LoyaltyCard card : data.cards) {
-            LoyaltyCard existing = DBHelper.getLoyaltyCard(database, card.id);
+            LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
             if (existing == null) {
                 DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
                         card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
@@ -152,7 +152,7 @@ public class CatimaImporter implements Importer {
     }
 
     public boolean isDuplicate(Context context, final LoyaltyCard existing, final LoyaltyCard card, final Set<String> existingImages, final Map<String, String> imageChecksums) throws IOException {
-        if (!LoyaltyCard.isDuplicate(existing, card)) {
+        if (!LoyaltyCard.isDuplicate(context, existing, card)) {
             return false;
         }
         for (ImageLocationType imageLocationType : ImageLocationType.values()) {
@@ -490,7 +490,29 @@ public class CatimaImporter implements Importer {
             // We catch this exception so we can still import old backups
         }
 
-        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
+        return new LoyaltyCard(
+                id,
+                store,
+                note,
+                validFrom,
+                expiry,
+                balance,
+                balanceType,
+                cardId,
+                barcodeId,
+                barcodeType,
+                headerColor,
+                starStatus,
+                lastUsed,
+                DBHelper.DEFAULT_ZOOM_LEVEL,
+                archiveStatus,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
     }
 
     /**

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

@@ -149,7 +149,29 @@ public class FidmeImporter implements Importer {
         // TODO: Front and back image
 
         // use -1 for the ID, it will be ignored when inserting the card into the DB
-        return new LoyaltyCard(-1, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, Utils.getUnixTime(), DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
+        return new LoyaltyCard(
+                -1,
+                store,
+                note,
+                null,
+                null,
+                BigDecimal.valueOf(0),
+                null,
+                cardId,
+                null,
+                barcodeType,
+                headerColor,
+                starStatus,
+                Utils.getUnixTime(),
+                DBHelper.DEFAULT_ZOOM_LEVEL,
+                archiveStatus,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
     }
 
     public void saveAndDeduplicate(SQLiteDatabase database, final ImportedData data) {

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

@@ -354,7 +354,29 @@ public class StocardImporter implements Importer {
 
             long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();
 
-            LoyaltyCard card = new LoyaltyCard(tempID, store, note, null, null, BigDecimal.valueOf(0), null, record.cardId, null, barcodeType, headerColor, 0, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, 0);
+            LoyaltyCard card = new LoyaltyCard(
+                    tempID,
+                    store,
+                    note,
+                    null,
+                    null,
+                    BigDecimal.valueOf(0),
+                    null,
+                    record.cardId,
+                    null,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    lastUsed,
+                    DBHelper.DEFAULT_ZOOM_LEVEL,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
             importedData.cards.add(card);
 
             Map<ImageLocationType, Bitmap> images = new HashMap<>();

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

@@ -151,7 +151,29 @@ public class VoucherVaultImporter implements Importer {
             }
 
             // use -1 for the ID, it will be ignored when inserting the card into the DB
-            importedData.cards.add(new LoyaltyCard(-1, store, "", null, expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(), DBHelper.DEFAULT_ZOOM_LEVEL, 0));
+            importedData.cards.add(new LoyaltyCard(
+                    -1,
+                    store,
+                    "",
+                    null,
+                    expiry,
+                    balance,
+                    balanceType,
+                    cardId,
+                    null,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    Utils.getUnixTime(),
+                    DBHelper.DEFAULT_ZOOM_LEVEL,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            ));
         }
 
         return importedData;

app/src/main/java/protect/card_locker/viewmodels/LoyaltyCardEditActivityViewModel.kt

@@ -0,0 +1,27 @@
+package protect.card_locker.viewmodels
+
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import protect.card_locker.LoyaltyCard
+import protect.card_locker.LoyaltyCardField
+import protect.card_locker.async.TaskHandler
+
+class LoyaltyCardEditActivityViewModel : ViewModel() {
+    var initialized: Boolean = false
+    var hasChanged: Boolean = false
+
+    var taskHandler: TaskHandler = TaskHandler();
+
+    var addGroup: String? = null
+    var openSetIconMenu: Boolean = false
+    var loyaltyCardId: Int = 0
+    var updateLoyaltyCard: Boolean = false
+    var duplicateFromLoyaltyCardId: Boolean = false
+    var importLoyaltyCardUri: Uri? = null
+
+    var tabIndex: Int = 0
+    var requestedImageType: Int = 0
+    var tempLoyaltyCardField: LoyaltyCardField? = null
+
+    var loyaltyCard: LoyaltyCard = LoyaltyCard()
+}

app/src/main/res/drawable/ic_baseline_archive_24_black.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@android:color/black">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
-</vector>

app/src/main/res/drawable/ic_starred_black.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>

app/src/main/res/drawable/ic_starred_white.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>

app/src/main/res/drawable/ic_unstarred_black.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>

app/src/main/res/drawable/ic_unstarred_white.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>

app/src/main/res/drawable/local_activity_24px.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M368,640L480,556L590,640L548,504L660,416L524,416L480,280L436,416L300,416L410,504L368,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,585Q80,574 87,566Q94,558 105,556Q129,548 144.5,527Q160,506 160,480Q160,454 144.5,433Q129,412 105,404Q94,402 87,394Q80,386 80,375L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,375Q880,386 873,394Q866,402 855,404Q831,412 815.5,433Q800,454 800,480Q800,506 815.5,527Q831,548 855,556Q866,558 873,566Q880,574 880,585L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,618Q763,596 741.5,559.5Q720,523 720,480Q720,437 741.5,400.5Q763,364 800,342L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,342Q197,364 218.5,400.5Q240,437 240,480Q240,523 218.5,559.5Q197,596 160,618L160,720Q160,720 160,720Q160,720 160,720ZM480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

app/src/main/res/drawable/loyalty_card_icon_archived.xml

@@ -2,9 +2,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@android:color/white">
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+      android:fillColor="#D3D3D3"
+      android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"
+      android:strokeWidth="0.25"
+      android:strokeColor="#777777"/>
 </vector>

app/src/main/res/drawable/loyalty_card_icon_starred.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#D3D3D3"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"
+        android:strokeWidth="0.25"
+        android:strokeColor="#777777"/>
+</vector>

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

@@ -15,8 +15,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/textView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_baseline_archive_24" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textView"

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

@@ -72,29 +72,15 @@
                     android:layout_width="@dimen/cardThumbnailSize"
                     android:layout_height="@dimen/cardThumbnailSize"
                     android:layout_gravity="end"
-                    android:alpha="0.5"
+                    android:alpha="0.8"
                     android:contentDescription="@string/starred"
                     android:elevation="4dp"
+                    android:rotationX="2"
                     android:visibility="visible"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_starred_white"
-                    tools:ignore="ImageContrastCheck" />
-
-                <ImageView
-                    android:importantForAccessibility="no"
-                    android:id="@+id/star_border"
-                    android:layout_width="@dimen/cardThumbnailSize"
-                    android:layout_height="@dimen/cardThumbnailSize"
-                    android:layout_gravity="end"
-                    android:alpha="0.5"
-                    android:contentDescription="@string/starImage"
-                    android:elevation="4dp"
-                    android:visibility="visible"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_unstarred_black"
-                    tools:ignore="ImageContrastCheck" />
+                    app:srcCompat="@drawable/loyalty_card_icon_starred"
+                    tools:ignore="ImageContrastCheck"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -110,18 +96,18 @@
 
                 <ImageView
                     android:id="@+id/archive_background"
-                    android:layout_width="41dp"
-                    android:layout_height="44dp"
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
                     android:layout_gravity="end"
-                    android:alpha="0.5"
+                    android:alpha="0.8"
                     android:contentDescription="@string/archived"
                     android:elevation="4dp"
                     android:rotationX="2"
                     android:visibility="visible"
-                    app:srcCompat="@drawable/ic_baseline_archive_24"
-                    tools:ignore="ImageContrastCheck,MissingConstraints"
-                    tools:layout_editor_absoluteX="0dp"
-                    tools:layout_editor_absoluteY="-1dp" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/loyalty_card_icon_archived"
+                    tools:ignore="ImageContrastCheck" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -16,56 +16,62 @@ Altonss
 Michael Moroni
 Eric
 GM
-Petr Novák
 laralem
+Petr Novák
 Joel A
 Taco
 pfaffenrodt
-Scrambled777
 Aayush Gupta
-HudobniVolk
+Scrambled777
+Priit Jõerüüt
+Максим Горпиніч
+B o d o
 Giovanni Donisi
+HudobniVolk
 Nyatsuki
 Jiri Grönroos
-Priit Jõerüüt
 Samantaz Fox
-Cliff Heraldo
-Sergio Paredes
-Ankit Tiwari
-Arno-github
-Milo Ivir
 Balázs Meskó
+Milo Ivir
+Arno-github
+Ankit Tiwari
+Sergio Paredes
+Cliff Heraldo
 Jose Delvani
-B o d o
 mdvhimself
 Milan Šalka
 ikanakova
-Максим Горпиніч
 huuhaa
 Skrripy
+Kachelkaiser
 Projjal Moitra
 Quentin PAGÈS
+josé m
 ngocanhtve
 Silvério Santos
-Marnick L'Eau
 waffshappen
+Marnick L'Eau
+Robin
 Ziad OUALHADJ
 Robin Liu
-Kachelkaiser
 Denis Shilin
+Edgars Andersons
+Renko
 しいたけ
 Alexander Ivanov
 Miha Frangež
 Viet Nguyen Hoang
+தமிழ் நேரம்
 stavpup
 ehrt74
 Virginie
-Tim Trek
+Vasilis
 MisterCosta96
 arshbeerSingh
+Augustin LAVILLE
 Freddo espresso
 Govind S Nair
 Kim Seohyun
-Renko
+Tim Trek
 rudy3
 Michael Gangolf

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

@@ -50,11 +50,11 @@
     <string name="settings">اعدادات</string>
     <string name="settings_light_theme">فاتح</string>
     <string name="settings_dark_theme">داكن</string>
-    <string name="settings_card_orientation">اتجاه الباركود</string>
+    <string name="settings_card_orientation">اتجاه الشاشة</string>
     <string name="settings_portrait_orientation">الوضع الرأسي</string>
     <string name="settings_landscape_orientation">الوضع الأفقي</string>
     <string name="settings_theme">مظهر</string>
-    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
+    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الشاشة</string>
     <string name="importSuccessful">تم استيراد البيانات</string>
     <string name="exportSuccessful">تم تصدير البيانات</string>
     <string name="enter_group_name">أدخل اسم المجموعة</string>
@@ -277,7 +277,7 @@
     <string name="action_display_options">خيارات العرض</string>
     <string name="settings_oled_dark_summary">يقلل من استخدام البطارية على شاشات OLED</string>
     <string name="icon_header_click_text">اضغط لفترة طويلة لتحرير الصورة المصغرة</string>
-    <string name="settings_category_title_cards">البطاقات</string>
+    <string name="settings_category_title_cards">البطاقات الظاهرة</string>
     <string name="show_note">إظهار الملاحظة</string>
     <string name="switchToBackImage">التبديل إلى الصورة الخلفية</string>
     <string name="switchToFrontImage">التبديل إلى الصورة الأمامية</string>
@@ -316,4 +316,20 @@
     <string name="exportCancelled">تم الغاء الاستخراج</string>
     <string name="useFrontImage">استخدام صورة أمامية</string>
     <string name="useBackImage">استخدم صورة خلفية</string>
+    <string name="addFromPkpass">اختر ملف الدفتر(.pkpass)</string>
+    <string name="unsupportedFile">هذا الملف غير مدعوم</string>
+    <string name="generic_error_please_retry">نعتذر، حدث خطأ ما، حاول مرة أخرى...</string>
+    <string name="settings_use_volume_keys_navigation">تبديل البطاقات باستخدام أزرار الصوت</string>
+    <string name="settings_use_volume_keys_navigation_summary">تبديل البطاقات الظاهرة باستخدام أزرار الصوت</string>
+    <string name="settings_category_title_cards_overview">نظرة عامة على البطاقات</string>
+    <string name="settings_column_count_portrait">الأعمدة في الوضع الرأسي</string>
+    <string name="settings_column_count_landscape">الأعمدة في الوضع الأفقي</string>
+    <string name="settings_automatic_column_count">تلقائي</string>
+    <string name="settings_column_count_1">١</string>
+    <string name="settings_column_count_2">٢</string>
+    <string name="settings_column_count_3">٣</string>
+    <string name="settings_column_count_4">٤</string>
+    <string name="settings_column_count_5">٥</string>
+    <string name="settings_column_count_6">٦</string>
+    <string name="settings_column_count_7">٧</string>
 </resources>

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

@@ -305,4 +305,7 @@
     <string name="settings_column_count_landscape">Колони в пейзажен изглед</string>
     <string name="settings_column_count_portrait">Колони в портретен изглед</string>
     <string name="settings_category_title_cards_overview">Списък с карти</string>
+    <string name="generic_error_please_retry">Съжаляваме, нещо се обърка, опитайте отново…</string>
+    <string name="addFromPkpass">Изберете файл на Passbook (.pkpass)</string>
+    <string name="unsupportedFile">Този вид файлове не се поддържат</string>
 </resources>

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

@@ -14,4 +14,5 @@
     <string name="welcome">Benvingut a Catima</string>
     <string name="noGiftCards">Cliqueu el botó + més per afegir una targeta, o importeu-ne des del ⋮ menú.</string>
     <string name="photos">Fotos</string>
+    <string name="app_name">Catima</string>
 </resources>

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

@@ -300,4 +300,18 @@
     <string name="useFrontImage">Použijte přední obrázek</string>
     <string name="settings_use_volume_keys_navigation_summary">Pomocí tlačítek hlasitosti můžete změnit, která karta se zobrazí</string>
     <string name="settings_use_volume_keys_navigation">Přepínat karty pomocí tlačítek hlasitosti</string>
+    <string name="generic_error_please_retry">Je nám líto, něco se pokazilo, zkuste to prosím znovu...</string>
+    <string name="settings_column_count_portrait">Sloupce v režimu na výšku</string>
+    <string name="settings_automatic_column_count">Automatický</string>
+    <string name="addFromPkpass">Vyberte soubor Passbook (.pkpass)</string>
+    <string name="unsupportedFile">Tento soubor není podporován</string>
+    <string name="settings_category_title_cards_overview">Přehled karet</string>
+    <string name="settings_column_count_landscape">Sloupce v režimu na šířku</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
 </resources>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="scanCardBarcode">Scanne kortets stregkode</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="scanCardBarcode">Scan stregkode</string>
     <string name="addCardTitle">Tilføj kort</string>
     <string name="editCardTitle">Rediger kort</string>
     <string name="sendLabel">Afsend…</string>
@@ -24,8 +24,8 @@
     <string name="cardId">Kort ID</string>
     <string name="note">Bemærk</string>
     <string name="storeName">Navn</string>
-    <string name="noMatchingGiftCards">Jeg fandt ikke noget. Prøv at ændre din søgning.</string>
-    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer først nogle kort fra ⋮-menuen.</string>
+    <string name="noMatchingGiftCards">Ingen resultater. Prøv at ændre din søgning.</string>
+    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer kort fra ⋮ menuen.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> valgt kort</item>
         <item quantity="other"><xliff:g>%d</xliff:g> valgte kort</item>
@@ -34,13 +34,13 @@
     <string name="action_search">Søg</string>
     <string name="importExport">Import/eksport</string>
     <string name="exportName">Eksport</string>
-    <string name="importExportHelp">Hvis du sikkerhedskopierer dine kort, kan du flytte dem til en anden enhed.</string>
+    <string name="importExportHelp">Sikkerhedskopiering af dit data, giver dig mulighed for at flytte dem til en anden enhed.</string>
     <string name="importSuccessfulTitle">Importeret</string>
     <string name="importFailedTitle">Import mislykkedes</string>
-    <string name="importFailed">Kunne ikke importere kort</string>
+    <string name="importFailed">Kunne ikke udføre importering</string>
     <string name="exportSuccessfulTitle">Eksporteret</string>
     <string name="exportFailedTitle">Eksport mislykkedes</string>
-    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="exportFailed">Kunne ikke udføre eksportering</string>
     <string name="importing">Importere…</string>
     <string name="exporting">Eksportere…</string>
     <string name="settings_dark_theme">Mørk</string>
@@ -63,7 +63,7 @@
     <string name="importOptionFilesystemTitle">Import fra filsystem</string>
     <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
     <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
-    <string name="noCardExistsError">Kunne ikke finde kort</string>
+    <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 indeholder ikke nogen kort</string>
@@ -88,4 +88,16 @@
         <item quantity="other">Slet disse <xliff:g>%d</xliff:g> kort permanent\?</item>
     </plurals>
     <string name="app_name">Catima</string>
+    <string name="cameraPermissionRequired">Behov for kamera adgang krævet for denne funktion…</string>
+    <string name="storageReadPermissionRequired">Behov for lager adgang krævet for denne funktion…</string>
+    <string name="permissionReadCardsLabel">Læs Catima Kort</string>
+    <string name="permissionReadCardsDescription">læs dine Catima kort og alle deres detaljer, også noter og billeder</string>
+    <string name="cameraPermissionDeniedTitle">Kunne ikke få adgang til kamera</string>
+    <string name="noCameraPermissionDirectToSystemSetting">For at scanne stregkoder, har Catima behov for at få adgang til dit kamera. Klik her for at ændre dine tilladelser i indstillinger.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os og hjælpere</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os og hjælpere</string>
+    <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
+    <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>
 </resources>

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

@@ -302,4 +302,7 @@
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
+    <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>
 </resources>

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

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

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

@@ -311,4 +311,7 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
+    <string name="generic_error_please_retry">Lo sentimos, algo salió mal, por favor inténtelo de nuevo...</string>
+    <string name="unsupportedFile">Este archivo no es compatible</string>
+    <string name="addFromPkpass">Seleccione un archivo Passbook (.pkpass)</string>
 </resources>

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

@@ -300,4 +300,7 @@
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_7">7</string>
+    <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>
 </resources>

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

@@ -311,4 +311,7 @@
     <string name="settings_automatic_column_count">Automatique</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
+    <string name="addFromPkpass">Sélectionner un fichier Cartes / Passbook (.pkpass)</string>
+    <string name="unsupportedFile">Ce fichier n\'est pas supporté</string>
+    <string name="generic_error_please_retry">Désolé, un problème est survenu, veuillez réessayer...</string>
 </resources>

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

@@ -299,4 +299,7 @@
     <string name="settings_column_count_7">7</string>
     <string name="addFromPdfFile">Elixe un ficheiro PDF</string>
     <string name="errorReadingFile">Non se puido ler o ficheiro</string>
+    <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>
 </resources>

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

@@ -9,7 +9,7 @@
     </plurals>
     <string name="noCardsMessage">Először adjon hozzá egy kártyát</string>
     <string name="noGiftCardsGroup">Hozzon létre kártyákat, és rendelje hozzá a megfelelő csoporthoz.</string>
-    <string name="noMatchingGiftCards">Nincs találaat. Próbálja módosítani a keresést.</string>
+    <string name="noMatchingGiftCards">Nincs találat. Próbálja módosítani a keresést.</string>
     <string name="storeName">Név</string>
     <string name="note">Feljegyzés</string>
     <string name="cardId">Kártyaazonosító</string>
@@ -24,7 +24,7 @@
     <string name="confirm">Jóváhagyás</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one"><xliff:g>%d</xliff:g> kártya törlése</item>
-        <item quantity="other">Törölje az <xliff:g>%d</xliff:g> kártyákat</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kártya törlése</item>
     </plurals>
     <string name="deleteConfirmation">Véglegesen törli a kártyát\?</string>
     <string name="ok">Rendben</string>
@@ -298,4 +298,14 @@
     <string name="settings_column_count_landscape">Oszlopok fekvő módban</string>
     <string name="settings_automatic_column_count">Automatikus</string>
     <string name="settings_column_count_portrait">Oszlopok álló módban</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="addFromPkpass">Válassz egy Passbook fájlt (.pkpass)</string>
+    <string name="unsupportedFile">Ez a fájl nem támogatott</string>
+    <string name="generic_error_please_retry">Sajnálom, valami rosszul ment, próbálkozz újra...</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_7">7</string>
 </resources>

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

@@ -288,4 +288,18 @@
     <string name="useBackImage">Gunakan gambar belakang</string>
     <string name="settings_use_volume_keys_navigation">Ganti kartu menggunakan tombol volume</string>
     <string name="settings_use_volume_keys_navigation_summary">Gunakan tombol volume untuk mengubah kartu mana yang ditampilkan</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_category_title_cards_overview">Ikhtisar kartu</string>
+    <string name="settings_column_count_portrait">Kolom dalam mode potret</string>
+    <string name="settings_column_count_landscape">Kolom dalam mode lanskap</string>
+    <string name="settings_automatic_column_count">Otomatis</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="addFromPkpass">Pilih file Buku Tabungan (.pkpass)</string>
+    <string name="unsupportedFile">File ini tidak didukung</string>
+    <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
 </resources>

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

@@ -311,4 +311,7 @@
     <string name="settings_column_count_3">3</string>
     <string name="settings_column_count_5">5</string>
     <string name="settings_category_title_cards_overview">Panoramica delle carte</string>
+    <string name="unsupportedFile">Questo file non è supportato</string>
+    <string name="generic_error_please_retry">Siamo spiacenti, qualcosa è andato storto, riprova...</string>
+    <string name="addFromPkpass">Seleziona un file Passbook (.pkpass)</string>
 </resources>

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

@@ -60,7 +60,7 @@
     <string name="leaveWithoutSaveTitle">종료</string>
     <string name="moveDown">아래로 이동</string>
     <string name="starImage">즐겨찾기 별</string>
-    <string name="settings_display_barcode_max_brightness">바코드를 표시할 때 화면 밝기 높이기</string>
+    <string name="settings_display_barcode_max_brightness">화면 밝게하기</string>
     <string name="deleteConfirmation">정말 이 카드를 삭제하시겠습니까\?</string>
     <string name="deleteTitle">카드 삭제</string>
     <plurals name="deleteCardsTitle">
@@ -216,7 +216,7 @@
     <string name="importCards">카드 가져오기</string>
     <string name="updateBalanceTitle">지출하거나 수령한 금액은 얼마입니까?</string>
     <string name="newBalanceSentence">새 잔액: <xliff:g>%s</xliff:g></string>
-    <string name="settings_card_orientation">바코드 방향</string>
+    <string name="settings_card_orientation">화면 방향</string>
     <string name="settings_follow_system_orientation">기기 설정 따르기</string>
     <string name="settings_portrait_orientation">세로</string>
     <string name="settings_landscape_orientation">가로</string>
@@ -257,7 +257,7 @@
     <string name="settings_category_title_general">일반</string>
     <string name="action_display_options">디스플레이 옵션</string>
     <string name="settings_display_barcode_max_brightness_summary">스캐너가 작동하는 데 필요합니다</string>
-    <string name="settings_category_title_cards">카드</string>
+    <string name="settings_category_title_cards">카드 보기</string>
     <string name="show_archived_cards">보관된 카드 표시</string>
     <string name="settings_category_title_privacy">프라이버시</string>
     <string name="card_id_must_not_be_empty">카드 ID는 비어 있으면 안됩니다</string>
@@ -286,4 +286,20 @@
     <string name="exportCancelled">내보내기 취소됨</string>
     <string name="useFrontImage">전면 이미지 사용</string>
     <string name="useBackImage">후면 이미지 사용</string>
+    <string name="addFromPkpass">Passbook 파일 선택하기 (.pkpass)</string>
+    <string name="generic_error_please_retry">죄송합니다, 문제가 발생했습니다. 다시 시도해 주세요...</string>
+    <string name="settings_use_volume_keys_navigation">볼륨 버튼을 사용하여 카드 전환하기</string>
+    <string name="unsupportedFile">이 파일은 지원되지 않습니다</string>
+    <string name="settings_use_volume_keys_navigation_summary">볼륨 버튼을 사용하여 표시되는 카드를 변경합니다</string>
+    <string name="settings_category_title_cards_overview">카드 개요</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_column_count_portrait">세로 모드의 열</string>
+    <string name="settings_column_count_landscape">가로 모드의 열</string>
+    <string name="settings_automatic_column_count">자동</string>
+    <string name="settings_column_count_1">1</string>
 </resources>

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

@@ -2,27 +2,27 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Meklēt</string>
     <string name="action_add">Pievienot</string>
-    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet no ⋮ izvēlnes.</string>
-    <string name="noMatchingGiftCards">Nav rezultātu. Mēģiniet mainīt meklējamo tekstu.</string>
+    <string name="noGiftCards">Klikšķināt pogu \"+\", lai pievienotu karti, vai ievietot no ⋮izvēlnes.</string>
+    <string name="noMatchingGiftCards">Nekas netika atrasts. Jāmēģina mainīt savu vaicājumu.</string>
     <string name="storeName">Nosaukums</string>
     <string name="note">Piezīme</string>
-    <string name="barcodeType">Svītrkoda tips</string>
+    <string name="barcodeType">Svītrkoda veids</string>
     <string name="noBarcode">Nav svītrkoda</string>
     <string name="star">Pievienot izlasei</string>
     <string name="unstar">Noņemt no izlases</string>
     <string name="cancel">Atcelt</string>
     <string name="save">Saglabāt</string>
-    <string name="edit">Rediģēt</string>
+    <string name="edit">Labot</string>
     <string name="delete">Dzēst</string>
-    <string name="moveBarcodeToTopOfScreen">Pārvietojiet svītrkodu uz ekrāna augšdaļu</string>
+    <string name="moveBarcodeToTopOfScreen">Pārvietot svītrkodu uz ekrāna augšdaļu</string>
     <string name="errorReadingImage">Nevarēja nolasīt attēlu</string>
-    <string name="balance">Bilance</string>
+    <string name="balance">Atlikums</string>
     <string name="noBarcodeFound">Svītrkods netika atrasts</string>
     <string name="currency">Valūta</string>
     <string name="points">Punkti</string>
-    <string name="chooseImportType">Importēt datus no</string>
+    <string name="chooseImportType">Ievietot datus no</string>
     <string name="sendLabel">Nosūtīt…</string>
-    <string name="editCardTitle">Rediģēt karti</string>
+    <string name="editCardTitle">Labot karti</string>
     <string name="share">Kopīgot</string>
     <string name="confirm">Apstiprināt</string>
     <string name="deleteTitle">Dzēst karti</string>
@@ -31,30 +31,30 @@
     <string name="addCardTitle">Pievienot karti</string>
     <string name="scanCardBarcode">Skenēt svītrkodu</string>
     <string name="cardShortcut">Kartes saīsne</string>
-    <string name="noCardsMessage">Vispirms pievienojiet karti</string>
+    <string name="noCardsMessage">Vispirms jāpievieno karte</string>
     <string name="noCardExistsError">Nevarēja atrast karti</string>
-    <string name="failedParsingImportUriError">Nevarēja parsēt importa URI</string>
-    <string name="importExport">Imports/Eksports</string>
-    <string name="exportName">Eksports</string>
-    <string name="importExportHelp">Dublējot Jūsu datus, tos var pārnest uz citu ierīci.</string>
-    <string name="importSuccessfulTitle">Importēts</string>
-    <string name="importFailedTitle">Imports neizdevās</string>
-    <string name="importFailed">Karšu importu nevarēja veikt</string>
-    <string name="exportSuccessfulTitle">Eksportēts</string>
-    <string name="exportFailedTitle">Eksports neizdevās</string>
-    <string name="exportFailed">Kartes neizdevās eksportēt</string>
-    <string name="importing">Importē…</string>
-    <string name="exporting">Eksportē…</string>
-    <string name="exportOptionExplanation">Dati tiks saglabāti Jūsu izvēlētajā vietā.</string>
-    <string name="importOptionFilesystemTitle">Imports no failu sistēmas</string>
-    <string name="importOptionFilesystemExplanation">Izvēlieties konkrētu failu no failu sistēmas.</string>
-    <string name="importOptionFilesystemButton">No failu sistēmas</string>
-    <string name="importOptionApplicationTitle">Izmantojot citu lietotni</string>
-    <string name="importOptionApplicationExplanation">Izmantojiet jebkuru lietotni vai savu iecienītāko failu pārvaldnieku, lai atvērtu failu.</string>
-    <string name="importOptionApplicationButton">Ar citu lietotni</string>
+    <string name="failedParsingImportUriError">Nevarēja apstrādāt ievietošanas URI</string>
+    <string name="importExport">Ievietot/izgūt</string>
+    <string name="exportName">Izgūt</string>
+    <string name="importExportHelp">Datu rezerves kopijas izveidošana ļauj tos pārnest uz citu ierīci.</string>
+    <string name="importSuccessfulTitle">Ievietots</string>
+    <string name="importFailedTitle">Ievietošana neizdevās</string>
+    <string name="importFailed">Nevarēja veikt ievietošanu</string>
+    <string name="exportSuccessfulTitle">Izgūts</string>
+    <string name="exportFailedTitle">Izguve neizdevās</string>
+    <string name="exportFailed">Nevarēja veikt izguvi</string>
+    <string name="importing">Ievieto…</string>
+    <string name="exporting">Izgūst…</string>
+    <string name="exportOptionExplanation">Dati tiks saglabāti izvēlētajā atrašanās vietā.</string>
+    <string name="importOptionFilesystemTitle">Ievietot no datņu sistēmas</string>
+    <string name="importOptionFilesystemExplanation">Izvēlēties noteiktu datni datņu sistēmā.</string>
+    <string name="importOptionFilesystemButton">No datņu sistēmas</string>
+    <string name="importOptionApplicationTitle">Izmantot citu lietotni</string>
+    <string name="importOptionApplicationExplanation">Izmantot jebkuru lietotni vai savu iecienītāko datņu pārvaldnieku, lai atvērtu datni.</string>
+    <string name="importOptionApplicationButton">Izmantot citu lietotni</string>
     <string name="about">Par</string>
     <string name="app_license">Copyleft brīva un atvērta programmatūra, licencēta GPLv3+</string>
-    <string name="selectBarcodeTitle">Izvēlieties svītrkodu</string>
+    <string name="selectBarcodeTitle">Atlasīt svītrkodu</string>
     <string name="thumbnailDescription">Sīktēls</string>
     <string name="starImage">Izlases zvaigzne</string>
     <string name="settings">Iestatījumi</string>
@@ -62,35 +62,35 @@
     <string name="settings_system_theme">Sistēmas</string>
     <string name="settings_light_theme">Gaiša</string>
     <string name="settings_dark_theme">Tumša</string>
-    <string name="settings_display_barcode_max_brightness">Izgaismot svītrkoda skatu</string>
+    <string name="settings_display_barcode_max_brightness">Izgaismot ekrānu</string>
     <string name="settings_keep_screen_on">Turēt ekrānu ieslēgtu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Neļaut ekrānam aizslēgties</string>
-    <string name="intent_import_card_from_url_share_text">Es vēlos ar Jums kopīgot karti</string>
-    <string name="importSuccessful">Dati importēti</string>
-    <string name="exportSuccessful">Dati eksportēti</string>
-    <string name="noGroups">Spiediet uz \"+\" plus pogas, lai pievienotu grupas karšu kategorizēšanai.</string>
-    <string name="noGroupCards">Šī grupa ir tukša</string>
+    <string name="intent_import_card_from_url_share_text">Es vēlos ar Tevi kopīgot karti</string>
+    <string name="importSuccessful">Dati ievietoti</string>
+    <string name="exportSuccessful">Dati izgūti</string>
+    <string name="noGroups">Klikšķināt pogu \"+\", lai pievienotu kopas karšu apkopošanai.</string>
+    <string name="noGroupCards">Šī kopa ir tukša</string>
     <string name="all">Visas</string>
-    <string name="deleteConfirmationGroup">Dzēst grupu\?</string>
-    <string name="failedOpeningFileManager">Vispirms instalējiet failu pārvaldnieku.</string>
+    <string name="deleteConfirmationGroup">Izdzēst kopu?</string>
+    <string name="failedOpeningFileManager">Vispirms jāuzstāda datņu pārvaldnieks.</string>
     <string name="moveUp">Pārvietot uz augšu</string>
     <string name="moveDown">Pārvietot uz leju</string>
     <string name="leaveWithoutSaveTitle">Iziet</string>
     <string name="leaveWithoutSaveConfirmation">Iziet nesaglabājot\?</string>
-    <string name="addFromImage">Izvēlēties attēlu no galerijas</string>
+    <string name="addFromImage">Atlasīt attēlu no galerijas</string>
     <string name="card">Karte</string>
     <string name="expiryDate">Derīguma termiņš</string>
     <string name="never">Nekad</string>
-    <string name="chooseExpiryDate">Izvēlieties derīguma termiņu</string>
-    <string name="failedToRetrieveImageFile">Neizdevās ielādēt attēla failu</string>
+    <string name="chooseExpiryDate">Izvēlēties beigu datumu</string>
+    <string name="failedToRetrieveImageFile">Neizdevās iegūt attēla datni</string>
     <string name="barcodeLongPressMessage">Galerijas lietotnē var atvērt tikai attēlus</string>
     <string name="sort_by_expiry">Derīguma termiņš</string>
     <string name="reverse">...apgrieztā secībā</string>
     <string name="credits">Pateicības</string>
-    <string name="shortcutSelectCard">Izvēlieties karti</string>
+    <string name="shortcutSelectCard">Atlasīt karti</string>
     <string name="duplicateCard">Dublēt</string>
     <string name="archive">Arhivēt</string>
-    <string name="translate_platform">vietnē Weblate</string>
+    <string name="translate_platform">Weblate</string>
     <string name="starred">Izlase</string>
     <string name="cardId">Kartes numurs</string>
     <plurals name="deleteCardsConfirmation">
@@ -100,7 +100,7 @@
     </plurals>
     <string name="about_title_fmt">Par <xliff:g id="app_name">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Derīguma termiņš beidzās: <xliff:g>%s</xliff:g></string>
-    <string name="selectColor">Izvēlieties krāsu</string>
+    <string name="selectColor">Atlasīt krāsu</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_pink_theme">Rozā</string>
     <string name="settings_magenta_theme">Purpura</string>
@@ -108,32 +108,30 @@
     <string name="settings_green_theme">Zaļa</string>
     <string name="sort_by_name">Nosaukums</string>
     <string name="on_google_play">pakalpojumā Google Play</string>
-    <string name="report_error">Ziņojiet par kļūdu</string>
+    <string name="report_error">Ziņot par kļūdu</string>
     <plurals name="balancePoints">
         <item quantity="zero"><xliff:g>%s</xliff:g> punkti</item>
         <item quantity="one"><xliff:g>%s</xliff:g> punkts</item>
         <item quantity="other"><xliff:g>%s</xliff:g> punkti</item>
     </plurals>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="importCatimaMessage">Izvēlieties jūstu <i>catima.zip</i> failu importam.
-\nFailu var izveidot eksportējot datus no Catima lietotnes citā ierīce, sadaļā \"Imports/Eksports\".</string>
-    <string name="importLoyaltyCardKeychainMessage">Importam izvēlieties Jūsu <i>LoyaltyCardKeychain.csv</i> eksporta failu no Loyalty Card Keychain.
-\nFailu var izveidot \"Imports/Eksports\" izvēlnē Loyalty Card Keychain lietotnē, spiežot \"Eksportēt\".</string>
+    <string name="importCatimaMessage">Jāatlasa sava <i>catima.zip</i> izguves datne no Catima, lai ievietotu. \nTo var izveidot citā ierīcē esošas Catima lietotnes sadaļā \"Ievietot/izgūt\" spiežot \"Izgūt\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Jāatlasa sava <i>LoyaltyCardKeychain.csv</i> izguves datne no Loyalty Card Keychain, lai ievietotu. \nTo var izveidot Loyalty Card Keychain sadaļā \"Import/Export\" spiežot \"Export\".</string>
     <string name="removeImage">Noņemt attēlu</string>
-    <string name="exportPasswordHint">Ievadiet paroli</string>
-    <string name="on_github">vietnē GitHub</string>
+    <string name="exportPasswordHint">Ievadīt paroli</string>
+    <string name="on_github">GitHub</string>
     <string name="settings_locale">Valoda</string>
-    <string name="failedGeneratingShareURL">Nevarēja izveidot koplietojamu URL. Lūdzu, ziņojiet par šo kļūdu.</string>
+    <string name="failedGeneratingShareURL">Nevarēja izveidot kopīgojamu URL. Lūgums ziņot par šo.</string>
     <string name="turn_flashlight_off">Izslēgt zibspuldzi</string>
     <string name="app_contributors">To padarīja iespējamu: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="version_history">Versiju vēsture</string>
     <string name="sort_by">Kārtot pēc</string>
-    <string name="help_translate_this_app">Palīdziet tulkot šo lietotni</string>
+    <string name="help_translate_this_app">Palīdzi tulkot šo lietotni</string>
     <string name="and_data_usage">un datu lietojums</string>
     <string name="license">Licence</string>
     <string name="source_repository">Pirmkods</string>
-    <string name="rate_this_app">Novērtējiet šo lietotni</string>
-    <string name="noGiftCardsGroup">Izveidojiet kartes, un pēc tam šeit pievienojiet tās grupai.</string>
+    <string name="rate_this_app">Novērtēt šo lietotni</string>
+    <string name="noGiftCardsGroup">Izveido kādas kartes, tad šeit pievieno tās kopai.</string>
     <string name="options">Parametri</string>
     <plurals name="groupCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> kartes</item>
@@ -150,11 +148,11 @@
     <string name="yes">Jā</string>
     <string name="no">Nē</string>
     <string name="settings_system_locale">Sistēmas</string>
-    <string name="include_if_asking_support">Ja vēlaties lūgt atbalstu, lūdzu iekļaujiet sekojošo informāciju:</string>
+    <string name="include_if_asking_support">Ja vēlies lūgt atbalstu, jāiekļauj sekojošā informācija:</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> svītrkoda attēls</string>
     <string name="privacy_policy">Privātuma politika</string>
-    <string name="accept">Apstiprināt</string>
-    <string name="editGroup">Grupas rediģēšana: <xliff:g>%s</xliff:g></string>
+    <string name="accept">Pieņemt</string>
+    <string name="editGroup">Kopas labošana: <xliff:g>%s</xliff:g></string>
     <string name="settings_brown_theme">Brūna</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autortiesības © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">Balstīta uz Loyalty Card Keychain
@@ -162,56 +160,53 @@
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_libraries">Brīvas trešo pušu programmatūras bibliotēkas: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Brīvi trešo pušu resursi: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="settings_card_orientation">Svītrkoda orientācija</string>
+    <string name="settings_card_orientation">Ekrāna novietojums</string>
     <string name="settings_follow_system_orientation">Pēc sistēmas</string>
     <string name="settings_portrait_orientation">Portreta</string>
     <string name="settings_landscape_orientation">Ainavas</string>
     <string name="settings_lock_on_opening_orientation">Ievērot to orientāciju, kādā karte atvērta</string>
-    <string name="enter_group_name">Ievadiet grupas nosaukumu</string>
-    <string name="groups">Grupas</string>
-    <string name="group_edit">Rediģēt grupu</string>
-    <string name="group_name_already_in_use">Jau ir grupa ar šādu nosaukumu</string>
-    <string name="group_name_is_empty">Grupas nosaukums nevar būt tukšs</string>
-    <string name="group_updated">Grupa atjaunināta</string>
-    <string name="addManually">Ievadīt numuru manuāli</string>
-    <string name="groupsList">Grupas: <xliff:g>%s</xliff:g></string>
+    <string name="enter_group_name">Ievadīt kopas nosaukumu</string>
+    <string name="groups">Kopas</string>
+    <string name="group_edit">Labot kopu</string>
+    <string name="group_name_already_in_use">Kopas nosaukums jau tiek izmantots</string>
+    <string name="group_name_is_empty">Kopas nosaukums nedrīkst būt tukšs</string>
+    <string name="group_updated">Kopa atjaunināta</string>
+    <string name="addManually">Pašrocīgi ievadīt svītrkodu</string>
+    <string name="groupsList">Kopas: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Derīguma termiņš: <xliff:g>%s</xliff:g></string>
-    <string name="balanceSentence">Bilance: <xliff:g>%s</xliff:g></string>
-    <string name="editBarcode">Rediģēt svītrkodu</string>
-    <string name="importCatima">Importēt no Catima</string>
-    <string name="importFidme">Importēt no FidMe</string>
-    <string name="importFidmeMessage">Importam izvēlieties Jūsu <i>fidme-export-request-xxxxxx.zip</i> FidMe eksportēto failu, un pēc tam manuāli precizējiet svītrkodu tipus.
-\nFailu var izveidot Jūsu FidMe profilā, ejot uz \"Data Protection\" un spiežot \"Extract my data\".</string>
-    <string name="importLoyaltyCardKeychain">Importēt no Loyalty Card Keychain</string>
-    <string name="importStocard">Importēt no Stocard</string>
-    <string name="importStocardMessage">Importam izvēlieties Jūsu <i>***.zip</i> eksporta failu no Stocard.
-\nFailu var iegūt sūtot e-pastu uz support@stocardapp.com ar pieprasījumu eksportēt Jūsu datus.</string>
-    <string name="importVoucherVault">Importēt no Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Importam izvēlieties Jūsu <i>vouchervault.json</i> failu no Voucher Vault.
-\nFailu var izveidot spiežot \"Eksportēt\" Voucher Vault lietotnē.</string>
+    <string name="balanceSentence">Atlikums: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">Labot svītrkodu</string>
+    <string name="importCatima">Ievietot no Catima</string>
+    <string name="importFidme">Ievietot no FidMe</string>
+    <string name="importFidmeMessage">Jāatlasa sava <i>fidme-export-request-xxxxxx.zip</i> izguves datne no FidMe, lai ievietotu, un pēc tam pašrocīgi jāatlasa svītrkodu veidi. \nTo var izveidot savā FidMe profila sadaļā \"Data Protection\" spiežot \"Extract my data\".</string>
+    <string name="importLoyaltyCardKeychain">Ievietot no Loyalty Card Keychain</string>
+    <string name="importStocard">Ievietot no Stocard</string>
+    <string name="importStocardMessage">Jāatlasa sava <i>***.zip</i> izguves datne no Stocard, lai ievietotu. \nTo var iegūt, ja nosūta lūgumu izgūt savus datus uz e-pasta adresi support@stocardapp.com.</string>
+    <string name="importVoucherVault">Ievietot no Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Jāatlasa sava <i>vouchervaldt.json</i> izguves datne no Voucher Vault, lai ievietotu. \nTo var izveidot spiežot \"Export\" Voucher Vault.</string>
     <string name="barcodeId">Svītrkoda vērtība</string>
     <string name="sameAsCardId">Tāpat kā numurs</string>
-    <string name="setBarcodeId">Norādiet svītrkoda vērtību</string>
-    <string name="unsupportedBarcodeType">Šo svītrkoda tipu pagaidām nav iespējams attēlot. Iespējams, nākotnē tas tiks atbalstīts vēlākā lietotnes versijā.</string>
-    <string name="wrongValueForBarcodeType">Šī vērtība nav derīga izvēlētajam svītrkoda tipam</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Vēlos koplietot kartes</string>
+    <string name="setBarcodeId">Ievadīt svītrkoda vērtību</string>
+    <string name="unsupportedBarcodeType">Šo svītrkoda veidu pagaidām nav iespējams attēlot. Tas nākotnē varbūt tiks atbalstīts jaunākā lietotnes versijā.</string>
+    <string name="wrongValueForBarcodeType">Šī vērtība nav derīga atlasītajam svītrkoda veidam</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Vēlos ar Tevi kopīgot dažas kartes</string>
     <string name="frontImageDescription">Priekšas attēls</string>
     <string name="backImageDescription">Aizmugures attēls</string>
     <string name="photos">Foto</string>
     <string name="setFrontImage">Iestatīt priekšas attēlu</string>
     <string name="setBackImage">Iestatīt aizmugures attēlu</string>
     <string name="takePhoto">Fotografēt</string>
-    <string name="passwordRequired">Ievadiet paroli</string>
-    <string name="exportPassword">Iestatiet paroli, lai aizsargātu eksporta failu (nav obligāti)</string>
+    <string name="passwordRequired">Lūgums ievadīt paroli</string>
+    <string name="exportPassword">Iestatīt paroli, lai aizsargātu savu izguves datni (izvēles)</string>
     <string name="turn_flashlight_on">Ieslēgt zibspuldzi</string>
     <string name="settings_oled_dark">Tīri melns fons tumšajai tēmai</string>
-    <string name="setIcon">Iestatīt ikonu</string>
+    <string name="setIcon">Iestatīt sīktēlu</string>
     <string name="settings_theme_color">Tēmas krāsa</string>
     <string name="settings_violet_theme">Violeta</string>
     <string name="settings_blue_theme">Zila</string>
     <string name="sort">Kārtot</string>
     <string name="showMoreInfo">Rādīt informāciju</string>
-    <string name="sort_by_most_recently_used">Nesen lietotās</string>
+    <string name="sort_by_most_recently_used">Visnesenāk izmantotās</string>
     <string name="unarchive">Atarhivēt</string>
     <string name="archived">Karte arhivēta</string>
     <string name="unarchived">Karte atarhivēta</string>
@@ -223,16 +218,95 @@
         <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> arhivēta)</item>
         <item quantity="other"><xliff:g>%1$d</xliff:g> cards (<xliff:g id="archivedCount">%2$d</xliff:g> arhivētas)</item>
     </plurals>
-    <string name="failedToOpenUrl">Vispirms nepieciešams uzstādīt interneta pārlūku</string>
-    <string name="welcome">Laipni lūgti Catima</string>
-    <string name="cameraPermissionRequired">Ir nepieciešama pieeja kamerai lai veiktu šo darbību</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Lai skanētu svītrkods, Catima ir nepieciešama pieeja jūsu kamerai. Nospied šeit lai nomainītu atļaujas iestatījumus.</string>
-    <string name="cameraPermissionDeniedTitle">Nevar pievienieties kamerai</string>
-    <string name="updateBalance">Atjaunināta bilance</string>
-    <string name="updateBalanceTitle">Cik daudz Tu iztērēji?</string>
-    <string name="updateBalanceHint">Ievadi summu</string>
-    <string name="currentBalanceSentence">Šābrīža bilance: <xliff:g>%s</xliff:g></string>
-    <string name="newBalanceSentence">Jauna bilance: <xliff:g>%s</xliff:g></string>
+    <string name="failedToOpenUrl">Vispirms nepieciešams uzstādīt pārlūku</string>
+    <string name="welcome">Laipni lūdzam Catima</string>
+    <string name="cameraPermissionRequired">Šai darbībai ir nepieciešama atļauja piekļūt kamerai…</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Lai nolasītu svītrkodus, Catima būs nepieciešama piekļuve kamerai. Piesist šeit, lai mainītu savus atļauju iestatījumus.</string>
+    <string name="cameraPermissionDeniedTitle">Nevarēja piekļūt kamerai</string>
+    <string name="updateBalance">Atjaunināt atlikumu</string>
+    <string name="updateBalanceTitle">Cik daudz iztērēji vai saņēmi?</string>
+    <string name="updateBalanceHint">Ievadīt summu</string>
+    <string name="currentBalanceSentence">Pašreizējais atlikums: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Jaunais atlikums: <xliff:g>%s</xliff:g></string>
     <string name="storageReadPermissionRequired">Atļauja lasīt noliktavu ir nepieciešama šai darbībai…</string>
-    <string name="importCards">Importēt kartes</string>
+    <string name="importCards">Ievietot kartes</string>
+    <string name="settings_oled_dark_summary">Samazina akumulatora lietojumu OLED ekrāniem</string>
+    <string name="icon_header_click_text">Ilgi piespiest, lai labotu sīktēlu</string>
+    <string name="anyDate">Jebkurš datums</string>
+    <string name="height">Augstums:</string>
+    <string name="openBackImageInGalleryApp">Atvērt aizmugures attēlu galerijas lietotnē</string>
+    <string name="donate">Ziedot</string>
+    <string name="field_must_not_be_empty">Lauks nedrīkst būt tukšs</string>
+    <string name="card_id_must_not_be_empty">Kartes identifikators nedrīkst būt tukšs</string>
+    <string name="add_a_card_in_a_different_way">Pievienot karti citā veidā</string>
+    <string name="add_manually_warning_message">Dažiem veikaliem svītrkoda vērtība atšķiras no numura, kas ir rakstīts uz kartes. Šī iemesla dēļ pašrocīgi ievadīts svītrkods ne vienmēr var darboties. Ir ļoti ieteicams nolasīt svītrkodu ar kameru. Vai joprojām turpināt?</string>
+    <string name="noCameraFoundGuideText">Šķiet, ka ierīcei nav kameras. Ja tā tomēr ir, jāmēģina pārsāknēt ierīci. Pretējā gadījumā jāizmanto zemāk esošā poga \"Vairāk iespēju\", lai pievienot svītrkodu citā veidā.</string>
+    <string name="settings_allow_content_provider_read_title">Ļaut citām lietotnēm piekļūt maniem datiem</string>
+    <string name="settings_allow_content_provider_read_summary">Lietotnēm joprojām būs jāpieprasa atļauja, lai nodrošinātu piekļuvi</string>
+    <string name="openFrontImageInGalleryApp">Atvērt priekšas attēlu galerijas lietotnē</string>
+    <string name="show_note">Rādīt piezīmi</string>
+    <string name="show_balance">Rādīt atlikumu</string>
+    <string name="settings_category_title_privacy">Privātums</string>
+    <string name="show_archived_cards">Rādīt arhivētās kartes</string>
+    <string name="view_online">Skatīt tiešsaistē</string>
+    <string name="action_display_options">Attēlošanas iespējas</string>
+    <string name="validFromSentence">Derīga no: <xliff:g>%s</xliff:g></string>
+    <string name="switchToBackImage">Pārslēgties uz aizmugures attēlu</string>
+    <string name="switchToBarcode">Pārslēgties uz svītrkodu</string>
+    <string name="add_manually_warning_title">Nolasīšana ir ieteicama</string>
+    <string name="settings_display_barcode_max_brightness_summary">Nepieciešams, lai darbotos atsevišķi nolasītāji</string>
+    <string name="importCancelled">Ievietošana atcelta</string>
+    <string name="permissionReadCardsLabel">Lasīt Catima kartes</string>
+    <string name="permissionReadCardsDescription">lasīt Catima kartes un to informāciju, tajā skaitā piezīmes un attēlus</string>
+    <string name="settings_use_volume_keys_navigation_summary">Izmantot skaļuma pogas, lai mainītu, kura karte tiek attēlota</string>
+    <string name="chooseValidFromDate">Izvēlēties \"Derīga no\" datumu</string>
+    <string name="settings_category_title_cards_overview">Karšu pārskats</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_automatic_column_count">Automātiski</string>
+    <plurals name="selectedCardCount">
+        <item quantity="zero">atlasītas <xliff:g>%d</xliff:g></item>
+        <item quantity="one">atlasīta <xliff:g>%d</xliff:g></item>
+        <item quantity="other">atlasītas <xliff:g>%d</xliff:g></item>
+    </plurals>
+    <string name="app_copyright_short">Autortiesības © Sylvia van Os un līdzdalībnieki</string>
+    <string name="settings_category_title_cards">Kartes skats</string>
+    <string name="settings_category_title_general">Vispārīgi</string>
+    <string name="errorReadingFile">Nevarēja nolasīt datni</string>
+    <string name="failedLaunchingFileManager">Nevarēja atrast atbalstītu datņu pārvaldnieku</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">Kuru no atrastajiem svītrkodiem izmantot?</string>
+    <string name="pageWithNumber"><xliff:g>%d</xliff:g>. lapa</string>
+    <string name="spend">Tērēt</string>
+    <string name="receive">Saņemt</string>
+    <string name="amountParsingFailed">Nederīga summa</string>
+    <string name="settings_follow_sensor_orientation">Vienmēr pagriezt (neņem vērā sistēmas iestatījumus)</string>
+    <string name="validFromDate">Derīga no</string>
+    <string name="setBarcodeHeight">Iestatīt svītrkoda augstumu</string>
+    <string name="switchToFrontImage">Pārslēgties uz priekšas attēlu</string>
+    <string name="show_validity">Rādīt derīgumu</string>
+    <string name="app_name">Catima</string>
+    <string name="settings_keep_screen_on_summary">Atspējo ekrāna noildzi kartes skatīšanas laikā</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Atspējo ekrāna aizslēgšanu kartes skatīšanas laikā</string>
+    <string name="useFrontImage">Izmantot priekšas attēlu</string>
+    <string name="useBackImage">Izmantot aizmugures attēlu</string>
+    <string name="settings_use_volume_keys_navigation">Pārslēgt kartes ar skaļuma pogām</string>
+    <string name="balanceParsingFailed">Nederīgs atlikums</string>
+    <string name="show_name_below_image_thumbnail">Rādīt vārdu zem sīktēla</string>
+    <string name="action_more_options">Vairāk iespēju</string>
+    <string name="addWithoutBarcode">Pievienot karti bez svītrkoda</string>
+    <string name="enter_card_id">Ievadīt uz kartes esošu identifikatoru vai tekstu</string>
+    <string name="manually_enter_barcode_instructions">Jāievada uz kartes esošs identifikators vai teksts un jāspiež uz svītrkoda, kas izskatās kā tas, kas ir uz kartes.</string>
+    <string name="continue_">Turpināt</string>
+    <string name="addFromPdfFile">Atlasīt PDF datni</string>
+    <string name="exportCancelled">Izguve atcelta</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_column_count_portrait">Kolonnas stateniskā novietojumā</string>
+    <string name="settings_column_count_landscape">Kolonnas guleniskā novietojumā</string>
+    <string name="unsupportedFile">Šī datne netiek atbalstīta</string>
+    <string name="addFromPkpass">Atlasīt Passbook datni (.pkpass)</string>
+    <string name="generic_error_please_retry">Atvainojamies, kaut kas nogāja greizi. Lūgums mēģināt vēlreiz...</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -44,7 +44,7 @@
     <string name="selectBarcodeTitle">Velg strekkode</string>
     <string name="thumbnailDescription">Miniatyrbilde</string>
     <string name="settings">Innstillinger</string>
-    <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
+    <string name="settings_display_barcode_max_brightness">Gjør skjermen lysere</string>
     <string name="exportSuccessful">Data eksportert</string>
     <string name="importSuccessful">Data importert</string>
     <string name="intent_import_card_from_url_share_text">Jeg ønsker å dele et kort med deg</string>
@@ -100,7 +100,7 @@
     <string name="importCatima">Importer fra Catima</string>
     <string name="errorReadingImage">Kunne ikke lese bildet</string>
     <string name="noBarcodeFound">Fant ingen strekkode</string>
-    <string name="addFromImage">Velg bilde fra galleri</string>
+    <string name="addFromImage">Velg et bilde fra galleriet</string>
     <string name="unsupportedBarcodeType">Denne strekkodetypen kan ikke vises for øyeblikket. Støtte kan bli lagt til i en senere versjon av programmet.</string>
     <string name="setBarcodeId">Sett strekkodeverdi</string>
     <string name="sameAsCardId">Samme som ID</string>
@@ -203,7 +203,7 @@
     </plurals>
     <string name="settings_oled_dark">Svart bakgrunn for mørk drakt</string>
     <string name="include_if_asking_support">Inkluder følgende info hvis du vil ha hjelp:</string>
-    <string name="settings_card_orientation">Strekkoderetning</string>
+    <string name="settings_card_orientation">Skjermorientering</string>
     <string name="settings_landscape_orientation">Liggende</string>
     <string name="settings_lock_on_opening_orientation">Lås til sideretning brukt ved åpning av kort</string>
     <string name="duplicateCard">Dupliser</string>
@@ -228,7 +228,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Catima trenger kameratilgang for å skanne strekkoder. Trykk her for å endre tilgangsinnstillingene.</string>
     <string name="importCards">Importer kort</string>
     <string name="currentBalanceSentence">Nåværende saldo: <xliff:g>%s</xliff:g></string>
-    <string name="updateBalanceTitle">Hvor mye brukte du?</string>
+    <string name="updateBalanceTitle">Hvor mye brukte eller fikk du?</string>
     <string name="updateBalanceHint">Skriv inn beløp</string>
     <string name="newBalanceSentence">Ny saldo: <xliff:g>%s</xliff:g></string>
     <string name="updateBalance">Oppdater saldo</string>
@@ -258,7 +258,7 @@
     <string name="settings_keep_screen_on_summary">Skrur av skjermtidsavbrudd under visning av et kort</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">Skrur av skjermlås under visning av et kort</string>
     <string name="settings_allow_content_provider_read_title">Tillat andre programmer tilgang til min data</string>
-    <string name="settings_category_title_cards">Kort</string>
+    <string name="settings_category_title_cards">Kortvisning</string>
     <string name="settings_category_title_general">Generelt</string>
     <string name="settings_category_title_privacy">Personvern</string>
     <string name="settings_oled_dark_summary">Reduserer batteribruk for OLED-skjermer</string>
@@ -279,17 +279,33 @@
     <string name="continue_">Fortsett</string>
     <string name="amountParsingFailed">Ugyldig beløp</string>
     <string name="spend">Utgifter</string>
-    <string name="receive">Inntekt</string>
+    <string name="receive">Motta</string>
     <string name="settings_follow_sensor_orientation">Alltid roter (ignorerer systeminnstilling)</string>
-    <string name="add_manually_warning_message">I noen butikker er strekkoden forskjellig fra nummeret på kortet. Som følge av dette kan det hende at å skrive inn strekkoden ikke virker. Det anbefales å skanne strekkoden med kameraet istedenfor. Fortsett?</string>
+    <string name="add_manually_warning_message">I noen butikker er strekkoden forskjellig fra nummeret på kortet. Som følge av dette kan det hende at å skrive inn strekkoden ikke virker. Det anbefales å skanne strekkoden med kameraet istedenfor. Vil du fortsette?</string>
     <string name="pageWithNumber">Side <xliff:g>%d</xliff:g></string>
     <string name="addFromPdfFile">Velg en PDF-fil</string>
     <string name="errorReadingFile">Kunne ikke lese filen</string>
-    <string name="failedLaunchingFileManager">Fant ikke støttet filbehandler</string>
+    <string name="failedLaunchingFileManager">Kunne ikke finne filbehandler som støttes</string>
     <string name="multipleBarcodesFoundPleaseChooseOne">Hvilken av de oppdagede strekkodene vil du bruke?</string>
     <string name="noCameraFoundGuideText">Finner ikke kamera på enheten din. Hvis dette ikke stemmer kan du prøve en omstart av den. Ellers kan du legge til strekkoder med «Mer»-knappen nedenfor.</string>
     <string name="importCancelled">Import avbrutt</string>
     <string name="exportCancelled">Eksport avbrutt</string>
-    <string name="useFrontImage">Bruk frontbilde</string>
+    <string name="useFrontImage">Bruk forsidebilde</string>
     <string name="useBackImage">Bruk baksidebilde</string>
+    <string name="settings_use_volume_keys_navigation">Bytt kort ved å bruke volumknappene</string>
+    <string name="settings_use_volume_keys_navigation_summary">Bruk volumknappene for å velge hvilket kort som skal vises</string>
+    <string name="settings_category_title_cards_overview">Kortoversikt</string>
+    <string name="settings_column_count_portrait">Kolonner i portrettmodus</string>
+    <string name="settings_column_count_landscape">Kolonner i landskapsmodus</string>
+    <string name="settings_automatic_column_count">Automatisk</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="addFromPkpass">Velg en Passbook-fil (.pkpass)</string>
+    <string name="unsupportedFile">Denne filen støttes ikke</string>
+    <string name="generic_error_please_retry">Beklager, men noe gikk galt. Prøv igjen…</string>
 </resources>

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

@@ -305,4 +305,7 @@
     <string name="settings_column_count_1">1</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
+    <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>
 </resources>

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

@@ -306,4 +306,18 @@
     <string name="useFrontImage">Użyj obrazu z przodu</string>
     <string name="settings_use_volume_keys_navigation">Przełączaj karty przy użyciu przycisków głośności</string>
     <string name="settings_use_volume_keys_navigation_summary">Użyj przycisków głośności do przełączania kart</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_category_title_cards_overview">Przegląd kart</string>
+    <string name="settings_column_count_portrait">Kolumny w trybie portretu</string>
+    <string name="settings_column_count_landscape">Kolumny w trybie pejzażu</string>
+    <string name="settings_automatic_column_count">Automatycznie</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="addFromPkpass">Wybierz plik Passbook (.pkpass)</string>
+    <string name="unsupportedFile">Ten plik nie jest obsługiwany</string>
+    <string name="generic_error_please_retry">Coś poszło nie tak, spróbuj ponownie później...</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -311,4 +311,7 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
+    <string name="unsupportedFile">Este arquivo não é suportado</string>
+    <string name="addFromPkpass">Selecionar um arquivo do gerenciador de senhas (.pkpass)</string>
+    <string name="generic_error_please_retry">Desculpe, alguma coisa deu errado, por favor tente novamente...</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -12,7 +12,7 @@
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="noGiftCards">Clique no botão + para adicionar um cartão ou importe-o no menu ⋮.</string>
-    <string name="noBarcode">sem código de barras</string>
+    <string name="noBarcode">Sem código de barras</string>
     <string name="unstar">Retirar dos favoritos</string>
     <string name="importOptionFilesystemButton">Do sistema de ficheiros</string>
     <string name="importOptionApplicationTitle">Usar outra aplicação</string>
@@ -36,10 +36,10 @@
     <string name="delete">Eliminar</string>
     <string name="cardId">Identificador do cartão</string>
     <string name="cardShortcut">Atalho do cartão</string>
-    <string name="noCardsMessage">Adicione primeiro um cartão</string>
+    <string name="noCardsMessage">Adicione um cartão primeiro</string>
     <string name="noCardExistsError">Não foi possível encontrar esse cartão</string>
     <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
-    <string name="importExport">Importar / exportar</string>
+    <string name="importExport">Importar / Exportar</string>
     <string name="exportName">Exportar</string>
     <string name="importSuccessful">Dados importados</string>
     <string name="noGroups">Clique no botão + para adicionar grupos para categorização.</string>
@@ -110,7 +110,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
     </plurals>
     <string name="importOptionFilesystemTitle">Importar do sistema de ficheiros</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019-<xliff:g>%d</xliff:g> Sylvia van Os e colaboradores</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019-<xliff:g>%d</xliff:g> Sylvia van Os e contribuidores</string>
     <string name="app_copyright_old">Baseado no Loyalty Card Keychain
 \ndireitos de autor © 2016–2020 Branden Archer</string>
     <string name="about_title_fmt">Sobre o <xliff:g id="app_name">%s</xliff:g></string>
@@ -230,7 +230,7 @@
     <string name="welcome">Bem-vindo ao Catima</string>
     <string name="failedToRetrieveImageFile">Falha ao recuperar o ficheiro de imagem</string>
     <string name="barcodeLongPressMessage">Só podem ser abertas imagens na aplicação da galeria</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Para digitalizar código de barras, o Catima tem de aceder à câmara. Clique aqui para mudar as configurações de permissão.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Para digitalizar códigos de barras, o Catima tem de aceder à câmara. Clique aqui para mudar as configurações de permissão.</string>
     <string name="cameraPermissionDeniedTitle">Não foi possível aceder à câmara</string>
     <string name="importCards">Importar cartões</string>
     <string name="currentBalanceSentence">Saldo atual: <xliff:g>%s</xliff:g></string>
@@ -254,7 +254,7 @@
     <string name="donate">Doar</string>
     <string name="show_validity">Mostrar validade</string>
     <string name="show_balance">Mostrar saldo</string>
-    <string name="permissionReadCardsLabel">Ler Cartas Catima</string>
+    <string name="permissionReadCardsLabel">Ler Cartões Catima</string>
     <string name="permissionReadCardsDescription">leia seus cartões do Catima e todos os seus detalhes, incluindo notas e imagens</string>
     <string name="show_note">Mostrar nota</string>
     <string name="show_name_below_image_thumbnail">Mostrar nome abaixo da miniatura do ícone</string>
@@ -277,7 +277,7 @@
     <string name="enter_card_id">Digite o número ID ou o texto em seu cartão</string>
     <string name="action_display_options">Opções de visualização</string>
     <string name="addWithoutBarcode">Adicione um cartão sem código de barras</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os e colaboradores</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os e contribuidores</string>
     <string name="field_must_not_be_empty">O campo não pode estar vazio</string>
     <string name="show_archived_cards">Mostrar cartões arquivados</string>
     <string name="app_name">Catima</string>
@@ -311,4 +311,7 @@
     <string name="settings_column_count_3">3</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_7">7</string>
+    <string name="addFromPkpass">Selecionar um ficheiro Passbook (.pkpass)</string>
+    <string name="unsupportedFile">Este ficheiro não é suportado</string>
+    <string name="generic_error_please_retry">Lamento, ocorreu um erro, tente novamente...</string>
 </resources>

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

@@ -300,4 +300,12 @@
     <string name="useFrontImage">Utilizează imaginea din față</string>
     <string name="settings_use_volume_keys_navigation">Schimbă cardurile folosind butoanele de volum</string>
     <string name="settings_use_volume_keys_navigation_summary">Folosiți butoanele de volum pentru a schimba ce card este afișat</string>
+    <string name="settings_automatic_column_count">Automat</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
 </resources>

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

@@ -34,9 +34,9 @@
     <string name="exportFailed">Невозможно выполнить экспорт</string>
     <string name="importing">Импорт…</string>
     <string name="exporting">Экспорт…</string>
-    <string name="exportOptionExplanation">Данные будут записаны в выбранное место.</string>
-    <string name="importOptionFilesystemTitle">Импорт из файловой системы</string>
-    <string name="importOptionFilesystemExplanation">Выберете файл на файловой системе.</string>
+    <string name="exportOptionExplanation">Данные будут сохранены в выбранное место.</string>
+    <string name="importOptionFilesystemTitle">Импорт из файла</string>
+    <string name="importOptionFilesystemExplanation">Выберете файл в файловой системе.</string>
     <string name="importOptionFilesystemButton">Выбрать файл</string>
     <string name="importOptionApplicationTitle">Использование другого приложения</string>
     <string name="importOptionApplicationExplanation">Используйте любое приложение или ваш любимый файловый менеджер, чтобы открыть файл.</string>
@@ -87,7 +87,7 @@
     <string name="editBarcode">Изменить штрих-код</string>
     <string name="card">Карта</string>
     <string name="groupsList">Группы: <xliff:g>%s</xliff:g></string>
-    <string name="moveDown">Переместить ниже</string>
+    <string name="moveDown">Перейти вниз</string>
     <string name="moveUp">Переместить выше</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Не давать блокировать экран</string>
     <string name="settings_keep_screen_on">Не отключать экран</string>
@@ -294,7 +294,7 @@
     <string name="spend">Потрачено</string>
     <string name="receive">Получено</string>
     <string name="amountParsingFailed">Недопустимая сумма</string>
-    <string name="addFromPdfFile">Выберите PDF-файл</string>
+    <string name="addFromPdfFile">Выбрать файл PDF</string>
     <string name="errorReadingFile">Невозможно прочитать файл</string>
     <string name="pageWithNumber">Страница <xliff:g>%d</xliff:g></string>
     <string name="failedLaunchingFileManager">Не найден поддерживаемый файловый менеджер</string>
@@ -317,4 +317,7 @@
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_5">5</string>
     <string name="settings_column_count_6">6</string>
+    <string name="unsupportedFile">Данный файл не поддерживается</string>
+    <string name="addFromPkpass">Выбрать файл Passbook (.pkpass)</string>
+    <string name="generic_error_please_retry">Извините, что-то пошло не так, попробуйте ещё раз…</string>
 </resources>

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

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">கேடிமா</string>
+    <string name="action_search">தேடல்</string>
+    <string name="action_add">கூட்டு</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> தேர்ந்தெடுக்கப்பட்டது</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> தேர்ந்தெடுக்கப்பட்டன</item>
+    </plurals>
+    <string name="noGiftCards">ஒரு அட்டையைச் சேர்க்க + பிளச் பொத்தானைக் சொடுக்கு செய்க அல்லது ⋮ மெனுவிலிருந்து இறக்குமதி செய்யுங்கள்.</string>
+    <string name="noGiftCardsGroup">சில அட்டைகளை உருவாக்கி, பின்னர் அவற்றை இங்கே குழுவிற்கு ஒதுக்குங்கள்.</string>
+    <string name="storeName">பெயர்</string>
+    <string name="note">குறிப்பு</string>
+    <string name="cardId">அட்டை ஐடி</string>
+    <string name="barcodeType">பார்கோடு வகை</string>
+    <string name="noBarcode">பார்கோடு இல்லை</string>
+    <string name="star">பிடித்தவைகளில் சேர்க்கவும்</string>
+    <string name="delete">நீக்கு</string>
+    <string name="confirm">உறுதிப்படுத்தவும்</string>
+    <string name="deleteConfirmation">இந்த அட்டையை நிரந்தரமாக நீக்கவா?</string>
+    <string name="ok">சரி</string>
+    <string name="share">பங்கு</string>
+    <string name="sendLabel">அனுப்பு…</string>
+    <string name="editCardTitle">அட்டையைத் திருத்து</string>
+    <string name="addCardTitle">அட்டை சேர்க்கவும்</string>
+    <string name="scanCardBarcode">ச்கேன் பார்கோடு</string>
+    <string name="cardShortcut">அட்டை குறுக்குவழி</string>
+    <string name="noCardExistsError">அந்த அட்டையை கண்டுபிடிக்க முடியவில்லை</string>
+    <string name="failedParsingImportUriError">இறக்குமதி யூரியை அலச முடியவில்லை</string>
+    <string name="importExport">இறக்குமதி/ஏற்றுமதி</string>
+    <string name="exportName">ஏற்றுமதி</string>
+    <string name="importFailedTitle">இறக்குமதி தோல்வியடைந்தது</string>
+    <string name="importFailed">இறக்குமதியை செய்ய முடியவில்லை</string>
+    <string name="exportSuccessfulTitle">ஏற்றுமதி</string>
+    <string name="exportFailedTitle">ஏற்றுமதி தோல்வியடைந்தது</string>
+    <string name="exportFailed">ஏற்றுமதி செய்ய முடியவில்லை</string>
+    <string name="importing">இறக்குமதி…</string>
+    <string name="exporting">ஏற்றுமதி செய்கிறது…</string>
+    <string name="storageReadPermissionRequired">இந்த செயலுக்கு தேவையான சேமிப்பிடத்தைப் படிக்க அனுமதி…</string>
+    <string name="cameraPermissionRequired">இந்த செயலுக்கு தேவையான கேமராவை அணுக அனுமதி…</string>
+    <string name="intent_import_card_from_url_share_text">நான் உங்களுடன் ஒரு அட்டையைப் பகிர விரும்புகிறேன்</string>
+    <string name="importSuccessful">இறக்குமதி செய்யப்பட்ட தரவு</string>
+    <string name="exportSuccessful">தரவு ஏற்றுமதி செய்யப்பட்டது</string>
+    <string name="enter_group_name">குழு பெயரை உள்ளிடவும்</string>
+    <string name="groups">குழுக்கள்</string>
+    <string name="group_edit">குழு திருத்து</string>
+    <string name="group_name_already_in_use">குழு பெயர் ஏற்கனவே பயன்பாட்டில் உள்ளது</string>
+    <string name="group_name_is_empty">குழு பெயர் காலியாக இருக்கக்கூடாது</string>
+    <string name="group_updated">குழு புதுப்பிக்கப்பட்டது</string>
+    <string name="all">அனைத்தும்</string>
+    <string name="deleteConfirmationGroup">குழுவை நீக்கவா?</string>
+    <string name="failedOpeningFileManager">முதலில் கோப்பு மேலாளரை நிறுவவும்.</string>
+    <string name="leaveWithoutSaveTitle">வெளியேறு</string>
+    <string name="leaveWithoutSaveConfirmation">சேமிக்காமல் விடலாமா?</string>
+    <string name="addManually">பார்கோடு கைமுறையாக உள்ளிடவும்</string>
+    <string name="addFromImage">கேலரியில் இருந்து ஒரு படத்தைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="noBarcodeFound">பார்கோடு எதுவும் கிடைக்கவில்லை</string>
+    <string name="errorReadingImage">படத்தைப் படிக்க முடியவில்லை</string>
+    <string name="balance">இருப்பு</string>
+    <string name="currency">நாணயம்</string>
+    <string name="importFidme">FIDME இலிருந்து இறக்குமதி</string>
+    <string name="barcodeId">பார்கோடு மதிப்பு</string>
+    <string name="backImageDescription">பின் படம்</string>
+    <string name="photos">புகைப்படங்கள்</string>
+    <string name="setFrontImage">முன் படத்தை அமைக்கவும்</string>
+    <string name="setBackImage">படத்தை அமைக்கவும்</string>
+    <string name="removeImage">படத்தை அகற்று</string>
+    <string name="takePhoto">புகைப்படம் எடுக்கவும்</string>
+    <string name="settings_oled_dark_summary">OLED காட்சிகளில் பேட்டரி பயன்பாட்டைக் குறைக்கிறது</string>
+    <string name="settings_system_locale">மண்டலம்</string>
+    <string name="selectColor">வண்ணத்தைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="setIcon">சிறு உருவத்தை அமைக்கவும்</string>
+    <string name="settings_blue_theme">நீலம்</string>
+    <string name="settings_green_theme">பச்சை</string>
+    <string name="sort">வரிசைப்படுத்து</string>
+    <string name="showMoreInfo">தகவலைக் காட்டு</string>
+    <string name="nextCard">அடுத்தது</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="spend">செலவு</string>
+    <string name="unsupportedFile">இந்த கோப்பு ஆதரிக்கப்படவில்லை</string>
+    <string name="generic_error_please_retry">மன்னிக்கவும், ஏதோ தவறு நடந்தது, தயவுசெய்து மீண்டும் முயற்சிக்கவும் ...</string>
+    <string name="noMatchingGiftCards">முடிவுகள் இல்லை. உங்கள் தேடலை மாற்ற முயற்சிக்கவும்.</string>
+    <string name="edit">தொகு</string>
+    <string name="deleteTitle">அட்டையை நீக்கு</string>
+    <string name="unstar">பிடித்தவைகளிலிருந்து அகற்று</string>
+    <string name="cancel">ரத்துசெய்</string>
+    <string name="save">சேமி</string>
+    <string name="noCardsMessage">முதலில் ஒரு அட்டையைச் சேர்க்கவும்</string>
+    <string name="importExportHelp">உங்கள் தரவை காப்புப் பிரதி எடுப்பது அதை மற்றொரு சாதனத்திற்கு நகர்த்த அனுமதிக்கிறது.</string>
+    <string name="importSuccessfulTitle">இறக்குமதி செய்யப்பட்டது</string>
+    <string name="permissionReadCardsLabel">கேடிமா அட்டைகளைப் படியுங்கள்</string>
+    <string name="permissionReadCardsDescription">உங்கள் கேடிமா அட்டைகள் மற்றும் குறிப்புகள் மற்றும் படங்கள் உட்பட அதன் அனைத்து விவரங்களையும் படியுங்கள்</string>
+    <string name="exportOptionExplanation">தரவு உங்கள் விருப்பப்படி இடத்திற்கு எழுதப்படும்.</string>
+    <string name="importOptionFilesystemTitle">கோப்பு முறைமையிலிருந்து இறக்குமதி</string>
+    <string name="importOptionFilesystemExplanation">கோப்பு முறைமையிலிருந்து ஒரு குறிப்பிட்ட கோப்பைத் தேர்வுசெய்க.</string>
+    <string name="importOptionFilesystemButton">கோப்பு முறைமையிலிருந்து</string>
+    <string name="cameraPermissionDeniedTitle">கேமராவை அணுக முடியவில்லை</string>
+    <string name="noCameraPermissionDirectToSystemSetting">பார்கோடுகளை ச்கேன் செய்ய, கேடிமாவுக்கு உங்கள் கேமராவுக்கு அணுகல் தேவைப்படும். உங்கள் இசைவு அமைப்புகளை மாற்ற இங்கே தட்டவும்.</string>
+    <string name="importOptionApplicationTitle">மற்றொரு பயன்பாட்டைப் பயன்படுத்தவும்</string>
+    <string name="importOptionApplicationExplanation">கோப்பைத் திறக்க எந்த பயன்பாடு அல்லது உங்களுக்கு பிடித்த கோப்பு மேலாளரைப் பயன்படுத்தவும்.</string>
+    <string name="about">பற்றி</string>
+    <string name="importOptionApplicationButton">மற்றொரு பயன்பாட்டைப் பயன்படுத்தவும்</string>
+    <string name="app_copyright_short">பதிப்புரிமை © சில்வியா வான் ஓஎச் மற்றும் பங்களிப்பாளர்கள்</string>
+    <string name="app_copyright_old">விசுவாச அட்டை கீச்சின் அடிப்படையில்\n பதிப்புரிமை © 2016–2020 பிராண்டன் ஆர்ச்சர்</string>
+    <string name="app_license">நகலெடுக்கப்பட்ட லிப்ரே மென்பொருள், உரிமம் பெற்ற GPLV3+</string>
+    <string name="selectBarcodeTitle">பார்கோடு தேர்ந்தெடுக்கவும்</string>
+    <string name="thumbnailDescription">சிறுபடம்</string>
+    <string name="starImage">பிடித்த விண்மீன்</string>
+    <string name="settings">அமைப்புகள்</string>
+    <string name="settings_theme">கருப்பொருள்</string>
+    <string name="settings_system_theme">மண்டலம்</string>
+    <string name="settings_light_theme">ஒளி</string>
+    <string name="settings_dark_theme">இருண்ட</string>
+    <string name="settings_card_orientation">திரை நோக்குநிலை</string>
+    <string name="settings_follow_system_orientation">அமைப்பைப் பின்தொடரவும்</string>
+    <string name="settings_keep_screen_on">திரையை தொடர்ந்து வைத்திருங்கள்</string>
+    <string name="settings_follow_sensor_orientation">எப்போதும் சுழற்றுங்கள் (கணினி அமைப்புகளை புறக்கணிக்கிறது)</string>
+    <string name="settings_keep_screen_on_summary">ஒரு அட்டையைப் பார்க்கும்போது திரை நேரத்தை முடக்குகிறது</string>
+    <string name="settings_portrait_orientation">உருவப்படம்</string>
+    <string name="settings_landscape_orientation">நிலப்பரப்பு</string>
+    <string name="settings_lock_on_opening_orientation">அட்டையைத் திறக்கும்போது பயன்படுத்தப்படும் நோக்குநிலைக்கு பூட்டு</string>
+    <string name="settings_display_barcode_max_brightness">திரை ஒளி</string>
+    <string name="settings_display_barcode_max_brightness_summary">சில ச்கேனர்கள் வேலை செய்ய தேவை</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">திரை பூட்டைத் தடுக்கவும்</string>
+    <string name="settings_allow_content_provider_read_title">எனது தரவை அணுக மற்ற பயன்பாடுகளை அனுமதிக்கவும்</string>
+    <string name="settings_allow_content_provider_read_summary">பயன்பாடுகள் இன்னும் அணுகல் வழங்க இசைவு கோர வேண்டும்</string>
+    <string name="settings_use_volume_keys_navigation">தொகுதி பொத்தான்களைப் பயன்படுத்தி அட்டைகளை மாற்றவும்</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">அட்டையைப் பார்க்கும்போது திரை லாக் முடக்குகிறது</string>
+    <string name="noGroups">வகைப்படுத்தலுக்கான குழுக்களைச் சேர்க்க + பிளச் பொத்தானைக் சொடுக்கு செய்க.</string>
+    <string name="settings_use_volume_keys_navigation_summary">எந்த அட்டை காட்டப்படும் என்பதை மாற்ற தொகுதி பொத்தான்களைப் பயன்படுத்தவும்</string>
+    <string name="noGroupCards">இந்த குழு காலியாக உள்ளது</string>
+    <string name="moveUp">மேல்நோக்கி நகர்த்தவும்</string>
+    <string name="moveDown">கீழ்நோக்கி நகர்த்தவும்</string>
+    <string name="card">அட்டை</string>
+    <string name="editBarcode">பார்கோடு திருத்து</string>
+    <string name="expiryDate">காலாவதி தேதி</string>
+    <string name="never">ஒருபோதும்</string>
+    <string name="chooseExpiryDate">காலாவதி தேதியைத் தேர்வுசெய்க</string>
+    <string name="moveBarcodeToTopOfScreen">பார்கோடு திரையின் மேற்பகுதிக்கு நகர்த்தவும்</string>
+    <string name="points">பிரிவகம்</string>
+    <string name="balanceParsingFailed">தவறான இருப்பு</string>
+    <string name="chooseImportType">இருந்து தரவை இறக்குமதி செய்யுங்கள்</string>
+    <string name="app_loyalty_card_keychain">விசுவாச அட்டை கீச்சின்</string>
+    <string name="privacy_policy">தனியுரிமைக் கொள்கை</string>
+    <string name="accept">ஏற்றுக்கொள்</string>
+    <string name="importCatima">கேடிமாவிலிருந்து இறக்குமதி</string>
+    <string name="importCatimaMessage">உங்கள் <i> catima.zip </i> இறக்குமதி செய்ய கேடிமாவிலிருந்து ஏற்றுமதி செய்யுங்கள்.\n முதலில் அங்கு ஏற்றுமதியை அழுத்துவதன் மூலம் மற்றொரு கேடிமா பயன்பாட்டின் இறக்குமதி/ஏற்றுமதி மெனுவிலிருந்து அதை உருவாக்கவும்.</string>
+    <string name="importLoyaltyCardKeychain">விசுவாச அட்டை கீச்சினிலிருந்து இறக்குமதி செய்யுங்கள்</string>
+    <string name="importFidmeMessage">உங்கள் <i> fidme-export-request-xxxxxx.zip </i> இறக்குமதி செய்ய FIDME இலிருந்து ஏற்றுமதி செய்து, பின்னர் பார்கோடு வகைகளை கைமுறையாகத் தேர்ந்தெடுக்கவும்.\n தரவு பாதுகாப்பைத் தேர்ந்தெடுப்பதன் மூலம் உங்கள் FIDME சுயவிவரத்திலிருந்து அதை உருவாக்கவும், பின்னர் எனது தரவைப் பிரித்தெடுக்கவும் அழுத்தவும்.</string>
+    <string name="importStocardMessage">உங்கள் <i> ***. சிப் </i> இறக்குமதி செய்ய ஏற்றுமதி.\n உங்கள் தரவை ஏற்றுமதி செய்யக் கேட்கும் support@stocardapp.com என்ற மின்னஞ்சல் மூலம் அதைப் பெறுங்கள்.</string>
+    <string name="importVoucherVault">வவுச்சர் பெட்டகத்திலிருந்து இறக்குமதி</string>
+    <string name="importStocard">ச்டார்ட் இருந்து இறக்குமதி</string>
+    <string name="sameAsCardId">ஐடி அதே</string>
+    <string name="setBarcodeId">பார்கோடு மதிப்பை அமைக்கவும்</string>
+    <string name="unsupportedBarcodeType">இந்த பார்கோடு வகையை இன்னும் காட்ட முடியாது. பயன்பாட்டின் பின்னர் பதிப்பில் இது ஆதரிக்கப்படலாம்.</string>
+    <string name="wrongValueForBarcodeType">தேர்ந்தெடுக்கப்பட்ட பார்கோடு வகைக்கு மதிப்பு செல்லுபடியாகாது</string>
+    <string name="intent_import_card_from_url_share_multiple_text">சில அட்டைகளை உங்களுடன் பகிர்ந்து கொள்ள விரும்புகிறேன்</string>
+    <string name="importVoucherVaultMessage">உங்கள் <i> vouchervault.json </i> வவுச்சர் பெட்டகத்திலிருந்து இறக்குமதி செய்ய ஏற்றுமதி என்பதைத் தேர்ந்தெடுக்கவும்.\n முதலில் வவுச்சர் வால்ட்டில் ஏற்றுமதியை அழுத்துவதன் மூலம் அதை உருவாக்கவும்.</string>
+    <string name="frontImageDescription">முன் படம்</string>
+    <string name="updateBarcodeQuestionTitle">பார்கோடு மதிப்பைப் புதுப்பிக்கவா?</string>
+    <string name="updateBarcodeQuestionText">நீங்கள் ஐடியை மாற்றினீர்கள். அதே மதிப்பைப் பயன்படுத்த பார்கோடு புதுப்பிக்க விரும்புகிறீர்களா?</string>
+    <string name="yes">ஆம்</string>
+    <string name="no">இல்லை</string>
+    <string name="passwordRequired">கடவுச்சொல்லை உள்ளிடவும்</string>
+    <string name="exportPassword">உங்கள் ஏற்றுமதியைப் பாதுகாக்க கடவுச்சொல்லை அமைக்கவும் (விரும்பினால்)</string>
+    <string name="exportPasswordHint">கடவுச்சொல்லை உள்ளிடவும்</string>
+    <string name="failedGeneratingShareURL">பகிரக்கூடிய முகவரி ஐ உருவாக்க முடியவில்லை. இதை புகாரளிக்கவும்.</string>
+    <string name="turn_flashlight_on">ஒளிரும் விளக்கை இயக்கவும்</string>
+    <string name="turn_flashlight_off">ஒளிரும் விளக்கை அணைக்கவும்</string>
+    <string name="settings_locale">மொழி</string>
+    <string name="settings_oled_dark">இருண்ட கருப்பொருளுக்கு தூய கருப்பு பின்னணி</string>
+    <string name="settings_theme_color">கருப்பொருள் நிறம்</string>
+    <string name="settings_catima_theme">கேடிமா</string>
+    <string name="settings_pink_theme">இளஞ்சிவப்பு</string>
+    <string name="settings_magenta_theme">மெசந்தா</string>
+    <string name="settings_violet_theme">கத்தரி</string>
+    <string name="settings_sky_blue_theme">வானம் நீலம்</string>
+    <string name="sort_by_name">பெயர்</string>
+    <string name="sort_by_most_recently_used">மிக அண்மைக் காலத்தில் பயன்படுத்தப்பட்டது</string>
+    <string name="sort_by_expiry">காலாவதியாகும்</string>
+    <string name="reverse">… தலைகீழ் வரிசையில்</string>
+    <string name="settings_brown_theme">பழுப்பு</string>
+    <string name="updateBalance">இருப்பு புதுப்பிக்கவும்</string>
+    <string name="failedToRetrieveImageFile">படக் கோப்பை மீட்டெடுப்பதில் தோல்வி</string>
+    <string name="sort_by">வரிசைப்படுத்தவும்</string>
+    <string name="barcodeLongPressMessage">கேலரி பயன்பாட்டில் படங்களை மட்டுமே திறக்க முடியும்</string>
+    <string name="version_history">பதிப்பு வரலாறு</string>
+    <string name="credits">வரவு</string>
+    <string name="on_google_play">கூகிள் பிளேயில்</string>
+    <string name="help_translate_this_app">இந்த பயன்பாட்டை மொழிபெயர்க்க உதவுங்கள்</string>
+    <string name="license">உரிமம்</string>
+    <string name="source_repository">மூல களஞ்சியம்</string>
+    <string name="on_github">கிட்அப்பில்</string>
+    <string name="and_data_usage">மற்றும் தரவு பயன்பாடு</string>
+    <string name="rate_this_app">இந்த பயன்பாட்டை மதிப்பிடுங்கள்</string>
+    <string name="report_error">பிழையைப் புகாரளிக்கவும்</string>
+    <string name="translate_platform">வெப்லேட்டில்</string>
+    <string name="shortcutSelectCard">ஒரு அட்டையைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="duplicateCard">நகல்</string>
+    <string name="archive">காப்பகம்</string>
+    <string name="options">விருப்பங்கள்</string>
+    <string name="starred">நடித்தார்</string>
+    <string name="include_if_asking_support">நீங்கள் ஆதரவைக் கோர விரும்பினால், பின்வரும் தகவலைச் சேர்க்கவும்:</string>
+    <string name="unarchive">அன்கான்</string>
+    <string name="archived">அட்டை காப்பகப்படுத்தப்பட்டது</string>
+    <string name="unarchived">அட்டை பதிக்கப்படாதது</string>
+    <string name="failedLaunchingPhotoPicker">உதவி கேலரி பயன்பாட்டைக் கண்டுபிடிக்க முடியவில்லை</string>
+    <string name="previousCard">முந்தைய</string>
+    <string name="failedToOpenUrl">முதலில் ஒரு வலை உலாவியை நிறுவவும்</string>
+    <string name="welcome">கேடிமாவுக்கு வருக</string>
+    <string name="importCards">அட்டைகளை இறக்குமதி செய்யுங்கள்</string>
+    <string name="updateBalanceTitle">நீங்கள் எவ்வளவு செலவு செய்தீர்கள் அல்லது பெற்றீர்கள்?</string>
+    <string name="updateBalanceHint">தொகையை உள்ளிடவும்</string>
+    <string name="validFromDate">இருந்து செல்லுபடியாகும்</string>
+    <string name="anyDate">எந்த தேதி</string>
+    <string name="chooseValidFromDate">தேதியிலிருந்து செல்லுபடியாகும் என்பதைத் தேர்வுசெய்க</string>
+    <string name="height">உயரம்:</string>
+    <string name="switchToFrontImage">முன் படத்திற்கு மாறவும்</string>
+    <string name="switchToBackImage">பின் படத்திற்கு மாறவும்</string>
+    <string name="switchToBarcode">பார்கோடு மாறவும்</string>
+    <string name="openFrontImageInGalleryApp">கேலரி பயன்பாட்டில் முன் படத்தைத் திறக்கவும்</string>
+    <string name="openBackImageInGalleryApp">கேலரி பயன்பாட்டில் படத்தைத் திறக்கவும்</string>
+    <string name="setBarcodeHeight">பார்கோடு உயரத்தை அமைக்கவும்</string>
+    <string name="donate">நன்கொடை</string>
+    <string name="icon_header_click_text">சிறுபடத்தைத் திருத்த நீண்ட அழுத்தவும்</string>
+    <string name="show_name_below_image_thumbnail">பட சிறுபடத்திற்கு கீழே உள்ள பெயரைக் காட்டு</string>
+    <string name="show_note">குறிப்பைக் காட்டு</string>
+    <string name="show_balance">சமநிலையைக் காட்டு</string>
+    <string name="show_validity">செல்லுபடியைக் காட்டு</string>
+    <string name="settings_category_title_cards">அட்டை பார்வை</string>
+    <string name="settings_category_title_cards_overview">அட்டைகள் கண்ணோட்டம்</string>
+    <string name="settings_column_count_portrait">உருவப்படம் பயன்முறையில் நெடுவரிசைகள்</string>
+    <string name="settings_column_count_landscape">நிலப்பரப்பு பயன்முறையில் நெடுவரிசைகள்</string>
+    <string name="settings_automatic_column_count">தானியங்கி</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_category_title_general">பொது</string>
+    <string name="settings_category_title_privacy">தனியுரிமை</string>
+    <string name="show_archived_cards">காப்பகப்படுத்தப்பட்ட அட்டைகளைக் காட்டு</string>
+    <string name="view_online">ஆன்லைனில் காண்க</string>
+    <string name="action_more_options">மேலும் விருப்பங்கள்</string>
+    <string name="addWithoutBarcode">பார்கோடு இல்லாத அட்டையைச் சேர்க்கவும்</string>
+    <string name="action_display_options">காட்சி விருப்பங்கள்</string>
+    <string name="enter_card_id">உங்கள் அட்டையில் அடையாள எண் அல்லது உரையை உள்ளிடவும்</string>
+    <string name="card_id_must_not_be_empty">அட்டை ஐடி காலியாக இருக்கக்கூடாது</string>
+    <string name="add_a_card_in_a_different_way">ஒரு அட்டையை வேறு வழியில் சேர்க்கவும்</string>
+    <string name="field_must_not_be_empty">புலம் காலியாக இருக்கக்கூடாது</string>
+    <string name="manually_enter_barcode_instructions">உங்கள் அட்டையில் அடையாள எண் அல்லது உரையை உள்ளிட்டு, உங்கள் அட்டையில் உள்ளதைப் போல தோற்றமளிக்கும் பார்கோடு அழுத்தவும்.</string>
+    <string name="add_manually_warning_title">ச்கேனிங் பரிந்துரைக்கப்படுகிறது</string>
+    <string name="continue_">தொடரவும்</string>
+    <string name="receive">பெறுங்கள்</string>
+    <string name="amountParsingFailed">தவறான தொகை</string>
+    <string name="add_manually_warning_message">சில கடைகளுக்கு, பார்கோடு மதிப்பு அட்டையில் எழுதப்பட்ட எண்ணிலிருந்து வேறுபடுகிறது. இதன் காரணமாக, ஒரு பார்கோடு கைமுறையாக நுழைவது எப்போதும் வேலை செய்யாது. அதற்கு பதிலாக உங்கள் கேமராவுடன் பார்கோடு ச்கேன் செய்ய கடுமையாக பரிந்துரைக்கப்படுகிறது. நீங்கள் இன்னும் தொடர விரும்புகிறீர்களா?</string>
+    <string name="addFromPdfFile">PDF கோப்பைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="errorReadingFile">கோப்பைப் படிக்க முடியவில்லை</string>
+    <string name="failedLaunchingFileManager">உதவி கோப்பு மேலாளரைக் கண்டுபிடிக்க முடியவில்லை</string>
+    <string name="multipleBarcodesFoundPleaseChooseOne">கண்டுபிடிக்கப்பட்ட பார்கோடுகளில் எது நீங்கள் பயன்படுத்த விரும்புகிறீர்கள்?</string>
+    <string name="noCameraFoundGuideText">உங்கள் சாதனத்தில் கேமரா இருப்பதாகத் தெரியவில்லை. அவ்வாறு செய்தால், சாதனத்தை மறுதொடக்கம் செய்ய முயற்சிக்கவும். இல்லையெனில், பார்கோடு மற்றொரு வழியில் சேர்க்க கீழே உள்ள கூடுதல் விருப்பங்கள் பொத்தானைப் பயன்படுத்தவும்.</string>
+    <string name="importCancelled">இறக்குமதி ரத்து செய்யப்பட்டது</string>
+    <string name="exportCancelled">ஏற்றுமதி ரத்து செய்யப்பட்டது</string>
+    <string name="useBackImage">பின் படத்தைப் பயன்படுத்தவும்</string>
+    <string name="addFromPkpass">பாச் புக் கோப்பைத் தேர்ந்தெடுக்கவும் (.pkpass)</string>
+    <string name="useFrontImage">முன் படத்தைப் பயன்படுத்தவும்</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g> அட்டை நீக்கு</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> அட்டைகளை நீக்கு</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">இந்த <xliff:g>%d</xliff:g> அட்டையை நிரந்தரமாக நீக்கவா?</item>
+        <item quantity="other">இந்த <xliff:g>%d</xliff:g> அட்டைகளை நிரந்தரமாக நீக்கவா?</item>
+    </plurals>
+    <string name="editGroup">திருத்துதல் குழு: <xliff:g>%s</xliff:g></string>
+    <string name="debug_version_fmt">பதிப்பு: <xliff:g id="version">%s</xliff:g></string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> அட்டை</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> அட்டைகள்</item>
+    </plurals>
+    <string name="expiryStateSentenceExpired">காலாவதியானது: <xliff:g>%s</xliff:g></string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> புள்ளி</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> புள்ளிகள்</item>
+    </plurals>
+    <string name="importLoyaltyCardKeychainMessage">இறக்குமதி செய்ய உங்கள் <i>LoyaltyCardKeychain.csv</i> விசுவாச அட்டை சாவிக்கொத்திலிருந்து ஏற்றுமதி செய். \nமுதலில் அங்கு ஏற்றுமதியை அழுத்துவதன் மூலம் விசுவாச அட்டை சாவிக்கொத்தில் இறக்குமதி/ஏற்றுமதி பட்டியலிலிருந்து அதை உருவாக்கு.</string>
+    <string name="validFromSentence">இதிலிருந்து செல்லுபடியாகும்: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">புதிய இருப்பு: <xliff:g>%s</xliff:g></string>
+    <string name="pageWithNumber">பக்கம் <xliff:g>%d</xliff:g></string>
+    <string name="currentBalanceSentence">தற்போதைய இருப்பு: <xliff:g>%s</xliff:g></string>
+    <string name="app_contributors">வழங்கியவர்: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="about_title_fmt">படம் <xliff:g>%s</xliff:g> பட்டைகுறியீடு</string>
+    <string name="barcodeImageDescriptionWithType">படம் <xliff:g>%s</xliff:g> பட்டை குறியீடு</string>
+    <string name="app_libraries">விடுதலை மூன்றாம் தரப்பு நூலகங்கள்: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="expiryStateSentence">காலாவதியாகிறது: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">இருப்பு: <xliff:g>%s</xliff:g></string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> அட்டை (<xliff:g id="archivedCount">%2$d</xliff:g> காப்பகப்படுத்தப்பட்டது)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> அட்டைகள் (<xliff:g id="archivedCount">%2$d</xliff:g> காப்பகப்படுத்தப்பட்டது)</item>
+    </plurals>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">பதிப்புரிமை © 2019–<xliff:g>%d</xliff:g> சில்வியா வான் ஓஎச் மற்றும் பங்களிப்பாளர்கள்</string>
+    <string name="app_resources">விடுதலை மூன்றாம் தரப்பு வளங்கள்: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="groupsList">குழுக்கள்: <xliff:g>%s</xliff:g></string>
+</resources>

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

@@ -305,4 +305,7 @@
     <string name="settings_column_count_7">7</string>
     <string name="settings_automatic_column_count">Otomatik</string>
     <string name="settings_column_count_portrait">Portre modundaki sutunlar</string>
+    <string name="unsupportedFile">Bu dosya desteklenmiyor</string>
+    <string name="generic_error_please_retry">Üzgünüz, bir şeyler ters gitti, lütfen tekrar deneyin...</string>
+    <string name="addFromPkpass">Bir Passbook dosyası seçin (.pkpass)</string>
 </resources>

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

@@ -285,7 +285,7 @@
     <string name="enter_card_id">Введіть ID або текст на вашій картці</string>
     <string name="addWithoutBarcode">Додати картку без штрих-коду</string>
     <string name="field_must_not_be_empty">Поле вводу не повинно бути порожнім</string>
-    <string name="app_name">Catima</string>
+    <string name="app_name">Катіма</string>
     <string name="settings_follow_sensor_orientation">Завжди обертати (ігнорувати системні налаштування)</string>
     <string name="add_manually_warning_message">У деяких магазинах значення штрихкоду відрізняється від номера, записаного на картці. Через це введення штрихкоду вручну може не завжди спрацювати. Наполегливо рекомендуємо відсканувати штрихкод за допомогою камери. Ви все ще хочете продовжити?</string>
     <string name="continue_">Продовжити</string>
@@ -316,4 +316,7 @@
     <string name="settings_column_count_portrait">Стовпці в портретному режимі</string>
     <string name="settings_column_count_landscape">Стовпці в ландшафтному режимі</string>
     <string name="settings_column_count_1">1</string>
+    <string name="unsupportedFile">Цей файл не підтримується</string>
+    <string name="generic_error_please_retry">Вибачте, щось пішло не так, спробуйте ще раз...</string>
+    <string name="addFromPkpass">Виберіть файл Passbook (.pkpass)</string>
 </resources>

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

@@ -70,7 +70,7 @@
     <string name="settings_system_theme">Hệ thống</string>
     <string name="failedToOpenUrl">Trước tiên, hãy cài đặt trình duyệt web</string>
     <string name="setBackImage">Đặt ảnh mặt sau</string>
-    <string name="settings_display_barcode_max_brightness">Tăng sáng cho chế độ xem mã vạch</string>
+    <string name="settings_display_barcode_max_brightness">Tăng sáng màn hình</string>
     <string name="chooseExpiryDate">Chọn ngày hết hạn</string>
     <string name="permissionReadCardsDescription">đọc thẻ Catima của bạn và mọi thông tin trong đó, bao gồm cả ghi chú và ảnh</string>
     <string name="anyDate">Bất cứ ngày nào</string>
@@ -101,7 +101,7 @@
     <string name="importCards">Nhập thẻ</string>
     <string name="icon_header_click_text">Nhấn đè để sửa ảnh con</string>
     <string name="importFailedTitle">Nhập dữ liệu hỏng</string>
-    <string name="settings_category_title_cards">Thẻ</string>
+    <string name="settings_category_title_cards">Xem thẻ</string>
     <string name="setBarcodeId">Đặt giá trị mã vạch</string>
     <string name="ok">Đồng ý</string>
     <string name="unarchive">Bỏ lưu trữ</string>
@@ -219,7 +219,7 @@
     <string name="show_archived_cards">Hiện thẻ lưu trữ</string>
     <string name="selectBarcodeTitle">Chọn Mã Vạch</string>
     <string name="importSuccessful">Nhập dữ liệu xong</string>
-    <string name="settings_card_orientation">Hướng đặt mã vạch</string>
+    <string name="settings_card_orientation">Hướng màn hình</string>
     <string name="app_libraries">Thư viện mở từ bên thứ 3: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="updateBalanceTitle">Bạn đã chi tiêu hoặc nhận được bao nhiêu?</string>
     <string name="editCardTitle">Sửa Thẻ</string>
@@ -286,4 +286,17 @@
     <string name="useBackImage">Sử dụng hình ảnh phía sau</string>
     <string name="importCancelled">Đã huỷ nhập</string>
     <string name="exportCancelled">Đã hủy xuất</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_use_volume_keys_navigation">Thay đổi thẻ bằng cách sử dụng phím âm lượng</string>
+    <string name="settings_use_volume_keys_navigation_summary">Sử dụng phím âm lượng để thay đổi thẻ được hiển thị</string>
+    <string name="settings_category_title_cards_overview">Tổng quan thẻ</string>
+    <string name="settings_column_count_portrait">Cột trong chế độ dọc</string>
+    <string name="settings_column_count_landscape">Cột trong chế độ ngang</string>
+    <string name="settings_automatic_column_count">Tự động</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -299,4 +299,7 @@
     <string name="settings_column_count_7">7</string>
     <string name="settings_column_count_6">6</string>
     <string name="settings_column_count_landscape">横屏模式下的列数</string>
+    <string name="addFromPkpass">选择 Passbook 文件（.pkpass）</string>
+    <string name="unsupportedFile">此文件不受支持</string>
+    <string name="generic_error_please_retry">抱歉，某个东西出错了，请再试…</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -246,7 +246,7 @@
     <string name="setBarcodeHeight">設定條碼高度</string>
     <string name="app_copyright_short">著作權所有© Sylvia van Os與其他貢獻者</string>
     <string name="permissionReadCardsLabel">讀取Catima卡片</string>
-    <string name="app_name">Catima</string>
+    <string name="app_name">卡提碼</string>
     <string name="permissionReadCardsDescription">讀取Catima卡片及卡片資訊，包含註記與圖片</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">觀看卡片時避免螢幕鎖定</string>
     <string name="settings_allow_content_provider_read_summary">其他程式仍然需要取得權限</string>
@@ -287,4 +287,18 @@
     <string name="useBackImage">使用背面圖片</string>
     <string name="settings_use_volume_keys_navigation_summary">使用音量按鈕來切換顯示的卡片</string>
     <string name="settings_use_volume_keys_navigation">使用音量按鈕切換卡片</string>
+    <string name="settings_column_count_5">5</string>
+    <string name="settings_column_count_6">6</string>
+    <string name="settings_column_count_7">7</string>
+    <string name="settings_automatic_column_count">自動</string>
+    <string name="settings_column_count_1">1</string>
+    <string name="settings_column_count_2">2</string>
+    <string name="settings_column_count_3">3</string>
+    <string name="settings_column_count_4">4</string>
+    <string name="settings_category_title_cards_overview">卡片概覽</string>
+    <string name="settings_column_count_portrait">縱向模式下的列數</string>
+    <string name="settings_column_count_landscape">横向模式下的列數</string>
+    <string name="addFromPkpass">選擇 Passbook 檔案 (.pkpass)</string>
+    <string name="unsupportedFile">不支援此檔案</string>
+    <string name="generic_error_please_retry">抱歉，似乎出了點錯誤，請您再試一次...</string>
 </resources>

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

@@ -148,6 +148,7 @@
         <item>sl</item>
         <item>sr</item>
         <item>sv</item>
+        <item>ta</item>
         <!-- <item>ti</item> -->
         <item>tr</item>
         <item>uk</item>

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

@@ -360,4 +360,7 @@
     <string name="exportCancelled">Export cancelled</string>
     <string name="useFrontImage">Use front image</string>
     <string name="useBackImage">Use back image</string>
+    <string name="addFromPkpass">Select a Passbook file (.pkpass)</string>
+    <string name="unsupportedFile">This file is not supported</string>
+    <string name="generic_error_please_retry">Sorry, something went wrong, please try again...</string>
 </resources>

app/src/main/res/xml/locales_config.xml

@@ -40,6 +40,7 @@
     <locale android:name="sl" />
     <locale android:name="sr" />
     <locale android:name="sv" />
+    <locale android:name="ta" />
     <locale android:name="tr" />
     <locale android:name="uk" />
     <locale android:name="vi" />

app/src/test/java/protect/card_locker/DatabaseTest.java

@@ -46,7 +46,7 @@ public class DatabaseTest {
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1);
         assertNotNull(loyaltyCard);
         assertEquals("store", loyaltyCard.store);
         assertEquals("note", loyaltyCard.note);
@@ -64,7 +64,7 @@ public class DatabaseTest {
         result = DBHelper.deleteLoyaltyCard(mDatabase, mActivity, 1);
         assertTrue(result);
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        assertNull(DBHelper.getLoyaltyCard(mDatabase, 1));
+        assertNull(DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1));
     }
 
     @Test
@@ -78,7 +78,7 @@ public class DatabaseTest {
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1);
         assertNotNull(loyaltyCard);
         assertEquals("store1", loyaltyCard.store);
         assertEquals("note1", loyaltyCard.note);
@@ -105,7 +105,7 @@ public class DatabaseTest {
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1);
         assertNotNull(loyaltyCard);
         assertEquals("store", loyaltyCard.store);
         assertEquals("note", loyaltyCard.note);
@@ -138,7 +138,7 @@ public class DatabaseTest {
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1);
         assertNotNull(loyaltyCard);
         assertEquals("", loyaltyCard.store);
         assertEquals("", loyaltyCard.note);
@@ -480,7 +480,7 @@ public class DatabaseTest {
         dbHelper.onUpgrade(database, DBHelper.ORIGINAL_DATABASE_VERSION, DBHelper.DATABASE_VERSION);
 
         // Determine that the entries are queryable and the fields are correct
-        LoyaltyCard card = DBHelper.getLoyaltyCard(database, newCardId);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), database, newCardId);
         assertEquals("store", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
@@ -496,7 +496,7 @@ public class DatabaseTest {
         assertEquals(100, card.zoomLevel);
 
         // Determine that the entries are queryable and the fields are correct
-        LoyaltyCard card2 = DBHelper.getLoyaltyCard(database, newCardId2);
+        LoyaltyCard card2 = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), database, newCardId2);
         assertEquals("store", card2.store);
         assertEquals("", card2.note);
         assertEquals(null, card2.validFrom);
@@ -523,7 +523,7 @@ public class DatabaseTest {
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(mActivity.getApplicationContext(), mDatabase, 1);
         assertNotNull(loyaltyCard);
         assertEquals("store", loyaltyCard.store);
         assertEquals("note", loyaltyCard.note);

app/src/test/java/protect/card_locker/ImportExportTest.java

@@ -94,7 +94,7 @@ public class ImportExportTest {
         boolean result = (id != -1);
         assertTrue(result);
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, (int) id);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, (int) id);
         assertEquals("No Expiry", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
@@ -111,7 +111,7 @@ public class ImportExportTest {
         result = (id != -1);
         assertTrue(result);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, (int) id);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, (int) id);
         assertEquals("Past", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
@@ -128,7 +128,7 @@ public class ImportExportTest {
         result = (id != -1);
         assertTrue(result);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, (int) id);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, (int) id);
         assertEquals("Today", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
@@ -148,7 +148,7 @@ public class ImportExportTest {
         result = (id != -1);
         assertTrue(result);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, (int) id);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, (int) id);
         assertEquals("Future", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
@@ -174,7 +174,7 @@ public class ImportExportTest {
         int index = 1;
 
         while (cursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
 
             String expectedStore = String.format("store, \"%4d", index);
             String expectedNote = String.format("note, \"%4d", index);
@@ -200,7 +200,7 @@ public class ImportExportTest {
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
 
         while (cursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
 
             // ID goes up for duplicates (b/c the cursor orders by store), down for originals
             int index = card.id > numCards ? card.id - numCards : numCards - card.id + 1;
@@ -236,7 +236,7 @@ public class ImportExportTest {
 
         while (index < 10) {
             cursor.moveToNext();
-            LoyaltyCard card = LoyaltyCard.fromCursor(cursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
 
             String expectedStore = String.format("store, \"%4d", index);
             String expectedNote = String.format("note, \"%4d", index);
@@ -258,7 +258,7 @@ public class ImportExportTest {
 
         index = 1;
         while (cursor.moveToNext() && index < 5) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(cursor);
+            LoyaltyCard card = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
 
             String expectedStore = String.format("store, \"%4d", index);
             String expectedNote = String.format("note, \"%4d", index);
@@ -649,7 +649,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -675,7 +675,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -713,7 +713,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -739,7 +739,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -765,7 +765,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -798,7 +798,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("store", card.store);
         assertEquals("note", card.note);
@@ -831,7 +831,7 @@ public class ImportExportTest {
 
         // Create card 1
         int loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 1", "Note 1", new Date(1601510400), new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), 1, 0, null,0);
-        loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
+        loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardId));
         DBHelper.insertGroup(mDatabase, "One");
         List<Group> groups = Arrays.asList(DBHelper.getGroup(mDatabase, "One"));
         DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, groups);
@@ -845,7 +845,7 @@ public class ImportExportTest {
 
         // Create card 2
         loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, 2, 1, null,0);
-        loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
+        loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardId));
 
         // Export everything
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -863,7 +863,7 @@ public class ImportExportTest {
         for (Integer loyaltyCardID : loyaltyCardHashMap.keySet()) {
             LoyaltyCard loyaltyCard = loyaltyCardHashMap.get(loyaltyCardID);
 
-            LoyaltyCard dbLoyaltyCard = DBHelper.getLoyaltyCard(mDatabase, loyaltyCardID);
+            LoyaltyCard dbLoyaltyCard = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardID);
 
             assertEquals(loyaltyCard.id, dbLoyaltyCard.id);
             assertEquals(loyaltyCard.store, dbLoyaltyCard.store);
@@ -950,7 +950,7 @@ public class ImportExportTest {
         assertEquals(Arrays.asList(8, 6), DBHelper.getGroupCardIds(mDatabase, "Fashion"));
 
         // Check all cards
-        LoyaltyCard card1 = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card1 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("Card 1", card1.store);
         assertEquals("Note 1", card1.note);
@@ -967,7 +967,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card1.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card1.id, ImageLocationType.icon));
 
-        LoyaltyCard card8 = DBHelper.getLoyaltyCard(mDatabase, 8);
+        LoyaltyCard card8 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 8);
 
         assertEquals("Clothes Store", card8.store);
         assertEquals("Note about store", card8.note);
@@ -984,7 +984,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card8.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card8.id, ImageLocationType.icon));
 
-        LoyaltyCard card2 = DBHelper.getLoyaltyCard(mDatabase, 2);
+        LoyaltyCard card2 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
 
         assertEquals("Department Store", card2.store);
         assertEquals("", card2.note);
@@ -1001,7 +1001,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card2.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card2.id, ImageLocationType.icon));
 
-        LoyaltyCard card3 = DBHelper.getLoyaltyCard(mDatabase, 3);
+        LoyaltyCard card3 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
 
         assertEquals("Grocery Store", card3.store);
         assertEquals("Multiline note about grocery store\n\nwith blank line", card3.note);
@@ -1018,7 +1018,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card3.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card3.id, ImageLocationType.icon));
 
-        LoyaltyCard card4 = DBHelper.getLoyaltyCard(mDatabase, 4);
+        LoyaltyCard card4 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 4);
 
         assertEquals("Pharmacy", card4.store);
         assertEquals("", card4.note);
@@ -1035,7 +1035,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card4.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card4.id, ImageLocationType.icon));
 
-        LoyaltyCard card5 = DBHelper.getLoyaltyCard(mDatabase, 5);
+        LoyaltyCard card5 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 5);
 
         assertEquals("Restaurant", card5.store);
         assertEquals("Note about restaurant here", card5.note);
@@ -1052,7 +1052,7 @@ public class ImportExportTest {
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card5.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card5.id, ImageLocationType.icon));
 
-        LoyaltyCard card6 = DBHelper.getLoyaltyCard(mDatabase, 6);
+        LoyaltyCard card6 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 6);
 
         assertEquals("Shoe Store", card6.store);
         assertEquals("", card6.note);
@@ -1081,7 +1081,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("Hema", card.store);
         assertEquals("2021-03-24 18:35:08 UTC", card.note);
@@ -1094,7 +1094,7 @@ public class ImportExportTest {
         assertEquals(null, card.barcodeType);
         assertEquals(0, card.starStatus);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 2);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
 
         assertEquals("test", card.store);
         assertEquals("Test\n2021-03-24 18:34:19 UTC", card.note);
@@ -1107,7 +1107,7 @@ public class ImportExportTest {
         assertEquals(null, card.barcodeType);
         assertEquals(0, card.starStatus);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 3);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
 
         assertEquals("Albert Heijn", card.store);
         assertEquals("Bonus Kaart\n2021-03-24 16:47:47 UTC\nFirst Last", card.note);
@@ -1138,7 +1138,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("Air Miles", card.store);
         assertEquals("szjsbs", card.note);
@@ -1156,7 +1156,7 @@ public class ImportExportTest {
         assertTrue(BitmapFactory.decodeStream(getClass().getResourceAsStream("stocard-back.jpg")).sameAs(Utils.retrieveCardImage(activity.getApplicationContext(), 1, ImageLocationType.back)));
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 1, ImageLocationType.icon));
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 2);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
 
         assertEquals("GAMMA", card.store);
         assertEquals("", card.note);
@@ -1174,7 +1174,7 @@ public class ImportExportTest {
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 2, ImageLocationType.back));
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 2, ImageLocationType.icon));
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 3);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
 
         assertEquals("jö", card.store);
         assertEquals("", card.note);
@@ -1205,7 +1205,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(4, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("Foo", card.store);
         assertEquals("", card.note);
@@ -1223,7 +1223,7 @@ public class ImportExportTest {
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 1, ImageLocationType.back));
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 1, ImageLocationType.icon));
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 2);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
 
         assertEquals("Air Miles", card.store);
         assertEquals("szjsbs\nMiles", card.note);
@@ -1241,7 +1241,7 @@ public class ImportExportTest {
         assertTrue(BitmapFactory.decodeStream(getClass().getResourceAsStream("stocard-back.jpg")).sameAs(Utils.retrieveCardImage(activity.getApplicationContext(), 2, ImageLocationType.back)));
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 2, ImageLocationType.icon));
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 3);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
 
         assertEquals("GAMMA", card.store);
         assertEquals("", card.note);
@@ -1259,7 +1259,7 @@ public class ImportExportTest {
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 3, ImageLocationType.back));
         assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 3, ImageLocationType.icon));
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 4);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 4);
 
         assertEquals("jö", card.store);
         assertEquals("", card.note);
@@ -1289,7 +1289,7 @@ public class ImportExportTest {
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(2, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         assertEquals("Clothes Store", card.store);
         assertEquals("", card.note);
@@ -1303,7 +1303,7 @@ public class ImportExportTest {
         assertEquals(Color.GRAY, (long) card.headerColor);
         assertEquals(0, card.starStatus);
 
-        card = DBHelper.getLoyaltyCard(mDatabase, 2);
+        card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
 
         assertEquals("Department Store", card.store);
         assertEquals("", card.note);

app/src/test/java/protect/card_locker/ImportURITest.java

@@ -25,12 +25,13 @@ import java.util.Date;
 
 @RunWith(RobolectricTestRunner.class)
 public class ImportURITest {
+    private Activity activity;
     private ImportURIHelper importURIHelper;
     private SQLiteDatabase mDatabase;
 
     @Before
     public void setUp() {
-        Activity activity = Robolectric.setupActivity(MainActivity.class);
+        activity = Robolectric.setupActivity(MainActivity.class);
         importURIHelper = new ImportURIHelper(activity);
         mDatabase = TestHelpers.getEmptyDb(activity).getWritableDatabase();
     }
@@ -43,7 +44,7 @@ public class ImportURITest {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "This note contains evil symbols like & and = that will break the parser if not escaped right $#!%()*+;:á", date, date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), Color.BLACK, 1, null,0);
 
         // Get card
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         // Card to URI
         Uri cardUri = importURIHelper.toUri(card);
@@ -73,7 +74,7 @@ public class ImportURITest {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
 
         // Get card
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         // Card to URI
         Uri cardUri = importURIHelper.toUri(card);
@@ -103,7 +104,7 @@ public class ImportURITest {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
 
         // Get card
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         // Card to URI, with a trailing slash
         Uri cardUri = importURIHelper.toUri(card).buildUpon().path("/share/").build();

app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java

@@ -97,7 +97,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapterEmptyNote() {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();
@@ -112,7 +112,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapterWithNote() {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();
@@ -137,7 +137,7 @@ public class LoyaltyCardCursorAdapterTest {
         assertEquals(4, cursor.getCount());
 
         assertTrue(cursor.moveToFirst());
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(cursor);
+        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
         assertEquals("storeD", loyaltyCard.store);
         View view = createView(cursor);
         ConstraintLayout star = view.findViewById(R.id.star);
@@ -146,7 +146,7 @@ public class LoyaltyCardCursorAdapterTest {
         assertEquals(View.GONE, archive.getVisibility());
 
         assertTrue(cursor.moveToNext());
-        loyaltyCard = LoyaltyCard.fromCursor(cursor);
+        loyaltyCard = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
         assertEquals("storeC", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
@@ -155,7 +155,7 @@ public class LoyaltyCardCursorAdapterTest {
         assertEquals(View.GONE, archive.getVisibility());
 
         assertTrue(cursor.moveToNext());
-        loyaltyCard = LoyaltyCard.fromCursor(cursor);
+        loyaltyCard = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
         assertEquals("storeB", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
@@ -164,7 +164,7 @@ public class LoyaltyCardCursorAdapterTest {
         assertEquals(View.VISIBLE, archive.getVisibility());
 
         assertTrue(cursor.moveToNext());
-        loyaltyCard = LoyaltyCard.fromCursor(cursor);
+        loyaltyCard = LoyaltyCard.fromCursor(activity.getApplicationContext(), cursor);
         assertEquals("storeA", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
@@ -178,7 +178,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapter0Points() {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();
@@ -193,7 +193,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapter0EUR() {
         DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();
@@ -208,7 +208,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapter100Points() {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();
@@ -223,7 +223,7 @@ public class LoyaltyCardCursorAdapterTest {
     @Test
     public void TestCursorAdapter10USD() {
         DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         cursor.moveToFirst();

app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java

@@ -167,7 +167,7 @@ public class LoyaltyCardViewActivityTest {
 
         assertEquals(1, DBHelper.getLoyaltyCardCount(database));
 
-        LoyaltyCard card = DBHelper.getLoyaltyCard(database, 1);
+        LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), database, 1);
         assertEquals(store, card.store);
         assertEquals(note, card.note);
         assertEquals(balance, card.balance);
@@ -216,7 +216,7 @@ public class LoyaltyCardViewActivityTest {
      * Initiate and complete a barcode capture, either in success
      * or in failure
      */
-    private void captureBarcodeWithResult(final Activity activity, final boolean success) throws IOException {
+    private void captureBarcodeWithResult(final Activity activity, final boolean success) {
         // Start image capture
         final Button startButton = activity.findViewById(R.id.enterButton);
         startButton.performClick();
@@ -231,10 +231,14 @@ public class LoyaltyCardViewActivityTest {
         assertNotNull(bundle);
 
         Intent resultIntent = new Intent(intent);
-        Bundle resultBundle = new Bundle();
-        resultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, BARCODE_DATA);
-        resultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, BARCODE_TYPE.name());
-        resultIntent.putExtras(resultBundle);
+
+        LoyaltyCard loyaltyCard = new LoyaltyCard();
+        loyaltyCard.setBarcodeId(null);
+        loyaltyCard.setBarcodeType(BARCODE_TYPE);
+        loyaltyCard.setCardId(BARCODE_DATA);
+        ParseResult parseResult = new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard);
+
+        resultIntent.putExtras(parseResult.toLoyaltyCardBundle(activity));
 
         // Respond to image capture, success
         shadowOf(activity).receiveResult(
@@ -247,7 +251,7 @@ public class LoyaltyCardViewActivityTest {
      * Initiate and complete a barcode selection, either in success
      * or in failure
      */
-    private void selectBarcodeWithResult(final Activity activity, final String barcodeData, final String barcodeType, final boolean success) throws IOException {
+    private void selectBarcodeWithResult(final Activity activity, final String barcodeData, final String barcodeType, final boolean success) {
         // Start barcode selector
         final Button startButton = activity.findViewById(R.id.enterButton);
         startButton.performClick();
@@ -267,10 +271,14 @@ public class LoyaltyCardViewActivityTest {
         assertNotNull(bundle);
 
         Intent resultIntent = new Intent(intent);
-        Bundle resultBundle = new Bundle();
-        resultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeType);
-        resultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeData);
-        resultIntent.putExtras(resultBundle);
+
+        LoyaltyCard loyaltyCard = new LoyaltyCard();
+        loyaltyCard.setBarcodeId(null);
+        loyaltyCard.setBarcodeType(barcodeType != null ? CatimaBarcode.fromName(barcodeType) : null);
+        loyaltyCard.setCardId(barcodeData);
+        ParseResult parseResult = new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard);
+
+        resultIntent.putExtras(parseResult.toLoyaltyCardBundle(activity));
 
         // Respond to barcode selection, success
         shadowOf(activity).receiveResult(
@@ -294,10 +302,17 @@ public class LoyaltyCardViewActivityTest {
         } else if (fieldType == FieldTypeView.ImageView) {
             ImageView imageView = (ImageView) view;
             Bitmap image = null;
-            if (imageView.getTag() != null) {
+            try {
                 image = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
+            } catch (ClassCastException e) {
+                // This is probably a VectorDrawable, the placeholder image. Aka: No image.
             }
-            assertEquals(contents, image);
+
+            if (contents == null && image == null) {
+                return;
+            }
+
+            assertTrue(image.sameAs((Bitmap) contents));
         } else {
             throw new UnsupportedOperationException();
         }
@@ -411,8 +426,8 @@ public class LoyaltyCardViewActivityTest {
             cardIdField.setText("12345678");
             barcodeField.setText("87654321");
             barcodeTypeField.setText(CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName());
-            activity.setCardImage(frontImageView, frontBitmap, true);
-            activity.setCardImage(backImageView, backBitmap, true);
+            activity.setCardImage(ImageLocationType.front, frontImageView, frontBitmap, true);
+            activity.setCardImage(ImageLocationType.back, backImageView, backBitmap, true);
 
             shadowOf(getMainLooper()).idle();
 
@@ -575,13 +590,13 @@ public class LoyaltyCardViewActivityTest {
         // A change was made
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.confirmExitDialog.isShowing());
-        assertEquals(true, activity.hasChanged);
+        assertEquals(true, activity.viewModel.getHasChanged());
         assertEquals(false, activity.isFinishing());
 
         // Exit after setting hasChanged to false
-        activity.hasChanged = false;
+        activity.viewModel.setHasChanged(false);
         shadowOf(activity).clickMenuItem(android.R.id.home);
-        assertEquals(false, activity.hasChanged);
+        assertEquals(false, activity.viewModel.getHasChanged());
         assertEquals(true, activity.isFinishing());
     }
 
@@ -698,13 +713,13 @@ public class LoyaltyCardViewActivityTest {
         // A change was made
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.confirmExitDialog.isShowing());
-        assertEquals(true, activity.hasChanged);
+        assertEquals(true, activity.viewModel.getHasChanged());
         assertEquals(false, activity.isFinishing());
 
         // Exit after setting hasChanged to false
-        activity.hasChanged = false;
+        activity.viewModel.setHasChanged(false);
         shadowOf(activity).clickMenuItem(android.R.id.home);
-        assertEquals(false, activity.hasChanged);
+        assertEquals(false, activity.viewModel.getHasChanged());
         assertEquals(true, activity.isFinishing());
 
         database.close();

app/src/test/java/protect/card_locker/PkpassTest.kt

@@ -0,0 +1,238 @@
+package protect.card_locker
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.graphics.Color
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.zxing.BarcodeFormat
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.shadows.ShadowContentResolver
+import org.robolectric.shadows.ShadowLog
+import java.math.BigDecimal
+import java.util.Date
+
+@RunWith(RobolectricTestRunner::class)
+class PkpassTest {
+    @Before
+    fun setUp() {
+        ShadowLog.stream = System.out
+    }
+
+    @Test
+    fun testEurowingsPass() {
+        // Prepare
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val pkpass = "pkpass/Eurowings/Eurowings.pkpass"
+        val image = "pkpass/Eurowings/logo@2x.png"
+
+        val pkpassUri = Uri.parse(pkpass)
+        val imageUri = Uri.parse(image)
+        ShadowContentResolver().registerInputStream(pkpassUri, javaClass.getResourceAsStream(pkpass))
+        ShadowContentResolver().registerInputStream(imageUri, javaClass.getResourceAsStream(image))
+
+        val parser = PkpassParser(context, pkpassUri)
+        val imageBitmap = BitmapFactory.decodeStream(context.contentResolver.openInputStream(imageUri))
+
+        // Confirm this does not have languages
+        Assert.assertEquals(listOf("de", "en"), parser.listLocales())
+
+        // Confirm correct parsing (en)
+        var parsedCard = parser.toLoyaltyCard("de")
+
+        Assert.assertEquals(-1, parsedCard.id)
+        Assert.assertEquals("EUROWINGS", parsedCard.store)
+        Assert.assertEquals("Eurowings Boarding Pass\n" +
+                "\n" +
+                "Gate: B61\n" +
+                "Sitz: 12D\n" +
+                "\n" +
+                "Cologne-Bonn: CGN\n" +
+                "Dubrovnik: DBV\n" +
+                "\n" +
+                "Name: John Doe\n" +
+                "Status: -\n" +
+                "Gruppe: GROUP 1\n" +
+                "Tarif: SMART\n" +
+                "\n" +
+                "Flug: EW 954\n" +
+                "Datum: 08/09/2019\n" +
+                "Boarding: 05:00\n" +
+                "Gate Schließt: 05:15\n" +
+                "\n" +
+                "Eurowings wünscht Ihnen einen angenehmen Flug.\n" +
+                "\n" +
+                "Wir bitten Sie, sich zur angegeben Boarding Zeit am Gate einzufinden.\n" +
+                "Buchungscode: JBZPPP\n" +
+                "Sequenz: 73\n" +
+                "Hinweis: Bitte beachten Sie, dass obwohl Ihr Flug verspätet sein mag, Sie dennoch wie geplant pünktlich am Check-in und am Abfluggate erscheinen müssen.\n" +
+                "\n" +
+                "Kostenlose Mitnahme eines Handgepäckstücks (8 Kg, 55 x 40 x 23cm).\n" +
+                "Mitnahme von Flüssigkeiten im Handgepäck: Neben den sonstigen Beschränkungen für das Handgepäck ist für alle Abflüge innerhalb der Europäischen Union sowie vielen weiteren Ländern (u.a. Schweiz, Russland, Island, Kroatien, Israel, Ägypten, Marokko, Tunesien, Norwegen)  die Mitnahme von vor der Fluggastkontrolle erworbenen bzw. mitgebrachten Flüssigkeiten und Gels nur noch eingeschränkt erlaubt:\n" +
+                "\n" +
+                "- Sämtliche Flüssigkeiten (wie Kosmetik- und Toilettenartikel, Gels, Pasten, Cremes, Lotionen, Gemische aus flüssigen und festen Stoffen, Parfums, Behälter unter Druck, Dosen, Wasserflaschen etc.) sowie wachs- oder gelartige Stoffe dürfen nur noch in Behältnissen bis zu 100 ml bzw. 100 g mit an Bord genommen werden.\n" +
+                "\n" +
+                "- Diese Flüssigkeiten bzw. Stoffe müssen in einem transparenten, wiederverschließbaren Plastikbeutel (max. 1 kg Inhalt) vollständig geschlossen, verpackt sein.\n" +
+                "\n" +
+                "- Diese Beutel müssen Fluggäste selbst vor dem Abflug erwerben. Sie sind in vielen Supermärkten z. B. als Gefrierbeutel erhältlich. Es besteht zurzeit keine Möglichkeit, entsprechende Plastikbeutel am Eurowings Check-In zu erwerben bzw. auszugeben.\n" +
+                "\n" +
+                "- Verschreibungspflichtige Medikamente sowie Babynahrung dürfen weiterhin im Handgepäck transportiert werden. Der Fluggast muss nachweisen, dass die Medikamente und Babynahrung während des Fluges benötigt werden.\n" +
+                "\n" +
+                "- Produkte und Beutel, die nicht den Maßgaben entsprechen oder die nur mit Gummiband oder ähnlichem verschlossen sind, müssen leider abgegeben werden.\n" +
+                "\n" +
+                "Flüssigkeiten und Gels, die Sie nicht zwingend während Ihres Aufenthalts an Bord benötigen, sollten zur raschen Fluggastabfertigung nach Möglichkeit im aufzugebenden Gepäck untergebracht werden.\n" +
+                "\n" +
+                "Selbstverständlich ist die Mitnahme von allen Flüssigkeiten/Gels/Getränken aus Travel-Value oder Duty Free-Shops, die nach der Fluggastkontrolle erworben werden, weiterhin erlaubt.\n" +
+                "\n" +
+                "Eurowings übernimmt keine Haftung für Gegenstände, die der Fluggast nicht im Handgepäck mitführen darf und deshalb aus Sicherheitsgründen an der Fluggastkontrolle abgeben muss.\n" +
+                "Kontakt: Sie erreichen das deutsche Call Center unter der Telefonnummer\n" +
+                "\n" +
+                "0180 6 320 320 ( 0:00 Uhr - 24:00 Uhr )\n" +
+                "\n" +
+                "(0,20 € pro Anruf aus dem Festnetz der Deutschen Telekom - Mobilfunk maximal 0,60 € pro Anruf).", parsedCard.note)
+        Assert.assertEquals(Date(1567911600000), parsedCard.validFrom)
+        Assert.assertEquals(null, parsedCard.expiry)
+        Assert.assertEquals(BigDecimal(0), parsedCard.balance)
+        Assert.assertEquals(null, parsedCard.balanceType)
+        Assert.assertEquals("M1DOE/JOHN         JBZPPP CGNDBVEW 0954 251A012D0073 148>5181W 9250BEW 00000000000002A0000000000000 0                          N", parsedCard.cardId)
+        Assert.assertEquals(null, parsedCard.barcodeId)
+        Assert.assertEquals(BarcodeFormat.AZTEC, parsedCard.barcodeType!!.format())
+        Assert.assertEquals(Color.parseColor("#FFFFFF"), parsedCard.headerColor)
+        Assert.assertEquals(0, parsedCard.starStatus)
+        Assert.assertEquals(0, parsedCard.archiveStatus)
+        Assert.assertEquals(0, parsedCard.lastUsed)
+        Assert.assertEquals(DBHelper.DEFAULT_ZOOM_LEVEL, parsedCard.zoomLevel)
+
+        // Confirm correct image is used
+        Assert.assertTrue(imageBitmap.sameAs(parser.image))
+
+        // Confirm correct parsing (en)
+        parsedCard = parser.toLoyaltyCard("en")
+
+        Assert.assertEquals(-1, parsedCard.id)
+        Assert.assertEquals("EUROWINGS", parsedCard.store)
+        Assert.assertEquals("Eurowings Boarding Pass\n" +
+                "\n" +
+                "Gate: B61\n" +
+                "Seat: 12D\n" +
+                "\n" +
+                "Cologne-Bonn: CGN\n" +
+                "Dubrovnik: DBV\n" +
+                "\n" +
+                "Name: John Doe\n" +
+                "Status: -\n" +
+                "Group: GROUP 1\n" +
+                "Fare: SMART\n" +
+                "\n" +
+                "Flight: EW 954\n" +
+                "Date: 08/09/2019\n" +
+                "Boarding: 05:00\n" +
+                "Gate closure: 05:15\n" +
+                "\n" +
+                "Eurowings wishes you a pleasant flight .\n" +
+                "\n" +
+                "We kindly ask you to be present at your departure gate on time.\n" +
+                "Booking code: JBZPPP\n" +
+                "Sequence: 73\n" +
+                "Notice: Please note that although your flight may be delayed, you will still need to check in and go to your departure gate on time as scheduled.\n" +
+                "\n" +
+                "Carry on one item of hand luggage (8 kg, 55 x 40 x 23 cm) for free.\n" +
+                "Carrying liquids in hand luggage: In addition to other restrictions on hand luggage, there are still restrictions on liquids and gels brought by the passenger or purchased before the security control on all departures within the European Union, as well as to many other countries (including Switzerland, Russia, Iceland, Croatia, Israel, Egypt, Morocco, Tunisia and Norway):\n" +
+                "\n" +
+                "- All liquids (such as toiletries and cosmetics, gels, pastes, creams, lotions, mixtures of liquids and solids, perfumes, pressurised containers, cans, water bottles etc) as well as wax and gel-like substances may only be carried on board in amounts less than 100ml or 100g.\n" +
+                "\n" +
+                "- These liquids or substances must be packed in closed containers in a transparent, re-sealable plastic bag (max. contents 1 kg).\n" +
+                "\n" +
+                "- It is the passenger’s responsibility to purchase this bag before departure. They are available in many supermarkets, e.g. as freezer bags. It is currently not possible for passengers to obtain or purchase the required bags from Eurowings check-in.\n" +
+                "\n" +
+                "- Prescription medicines and baby food may still be carried in hand baggage. The passenger must prove that such medicines and/or baby food are needed during the flight.\n" +
+                "\n" +
+                "- Products and bags which do not meet the requirements or are only sealed with a rubber band or similar will unfortunately have to be surrendered by passengers\n" +
+                "\n" +
+                "In order to pass through the airport as quickly as possible, you are strongly advised to pack any liquids or gels which are not essential for your journey on board the aircraft in your checked baggage if possible.\n" +
+                "\n" +
+                "As a matter of course, liquids from the Travel Value / Duty Free shops which have been purchased after you have passed through security are still allowed on board.\n" +
+                "\n" +
+                "Eurowings shall not be liable for any items which passengers are prohibited from carrying in their hand baggage for security reasons and are required to surrender at the security checkpoint.\n" +
+                "Contact: https://mobile.eurowings.com/booking/StaticContactInfo.aspx?culture=en-GB&back=home", parsedCard.note)
+        Assert.assertEquals(Date(1567911600000), parsedCard.validFrom)
+        Assert.assertEquals(null, parsedCard.expiry)
+        Assert.assertEquals(BigDecimal(0), parsedCard.balance)
+        Assert.assertEquals(null, parsedCard.balanceType)
+        Assert.assertEquals("M1DOE/JOHN         JBZPPP CGNDBVEW 0954 251A012D0073 148>5181W 9250BEW 00000000000002A0000000000000 0                          N", parsedCard.cardId)
+        Assert.assertEquals(null, parsedCard.barcodeId)
+        Assert.assertEquals(BarcodeFormat.AZTEC, parsedCard.barcodeType!!.format())
+        Assert.assertEquals(Color.parseColor("#FFFFFF"), parsedCard.headerColor)
+        Assert.assertEquals(0, parsedCard.starStatus)
+        Assert.assertEquals(0, parsedCard.archiveStatus)
+        Assert.assertEquals(0, parsedCard.lastUsed)
+        Assert.assertEquals(DBHelper.DEFAULT_ZOOM_LEVEL, parsedCard.zoomLevel)
+
+        // Confirm correct image is used
+        Assert.assertTrue(imageBitmap.sameAs(parser.image))
+    }
+
+    @Test
+    fun testDCBPkPass() {
+        // Prepare
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val pkpass = "pkpass/DCBLN24/DCBLN24-QLUKT-1-passbook.pkpass"
+        val image = "pkpass/DCBLN24/logo.png"
+
+        val pkpassUri = Uri.parse(pkpass)
+        val imageUri = Uri.parse(image)
+        ShadowContentResolver().registerInputStream(pkpassUri, javaClass.getResourceAsStream(pkpass))
+        ShadowContentResolver().registerInputStream(imageUri, javaClass.getResourceAsStream(image))
+
+        val parser = PkpassParser(context, pkpassUri)
+        val imageBitmap = BitmapFactory.decodeStream(context.contentResolver.openInputStream(imageUri))
+
+        // Confirm this does not have languages
+        Assert.assertEquals(listOf<String>(), parser.listLocales())
+
+        // Confirm correct parsing
+        val parsedCard = parser.toLoyaltyCard(null)
+
+        Assert.assertEquals(-1, parsedCard.id)
+        Assert.assertEquals("droidcon Berlin 2024", parsedCard.store)
+        Assert.assertEquals("Ticket for droidcon Berlin 2024 (Speaker)\n" +
+                "\n" +
+                "Admission time: 2024-07-03 08:00\n" +
+                "\n" +
+                "Event: droidcon Berlin 2024\n" +
+                "\n" +
+                "Product: Speaker\n" +
+                "\n" +
+                "Attendee name: Sylvia van Os\n" +
+                "From: 2024-07-03 08:00\n" +
+                "To: 2024-07-05 18:30\n" +
+                "\n" +
+                "Admission time: 2024-07-03 08:00\n" +
+                "Attendee name: Sylvia van Os\n" +
+                "Ordered by: REDACTED@example.com\n" +
+                "Organizer: droidcon\n" +
+                "Organizer contact: global@droidcon.de\n" +
+                "Order code: REDACTED\n" +
+                "Purchase date: 2024-06-06 07:26\n" +
+                "Website: https://pretix.eu/droidcon/dcbln24/", parsedCard.note)
+        Assert.assertEquals(null, parsedCard.validFrom)
+        Assert.assertEquals(null, parsedCard.expiry)
+        Assert.assertEquals(BigDecimal(0), parsedCard.balance)
+        Assert.assertEquals(null, parsedCard.balanceType)
+        Assert.assertEquals("ca4phaix1ahkahD2eiVi5iepahxa6rei", parsedCard.cardId)
+        Assert.assertEquals(null, parsedCard.barcodeId)
+        Assert.assertEquals(BarcodeFormat.QR_CODE, parsedCard.barcodeType!!.format())
+        Assert.assertEquals(Color.parseColor("#0014e6"), parsedCard.headerColor)
+        Assert.assertEquals(0, parsedCard.starStatus)
+        Assert.assertEquals(0, parsedCard.archiveStatus)
+        Assert.assertEquals(0, parsedCard.lastUsed)
+        Assert.assertEquals(DBHelper.DEFAULT_ZOOM_LEVEL, parsedCard.zoomLevel)
+
+        // Confirm correct image is used
+        Assert.assertTrue(imageBitmap.sameAs(parser.image))
+    }
+}

build.gradle.kts

@@ -1,8 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.android.application") version "8.7.2" apply false
+    id("com.android.application") version "8.7.3" apply false
     id("com.github.spotbugs") version "5.1.4" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 
 allprojects {

build.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 ### build.sh
-### Builds Catima the same way F-Droid does for reproducible builds
+### Builds Catima the same way rbtlog/IzzyOnDroid does for reproducible builds
 
 if [ -z "${ANDROID_SDK_ROOT:-}" ]; then
   echo "ANDROID_SDK_ROOT is not set, setting to $HOME/Android/Sdk";
@@ -25,7 +25,11 @@ echo "Starting build"
 ./gradlew clean assembleRelease
 
 echo "Build finished (unsigned)"
-echo "Your build is at app/build/outputs/apk/release/app-release-unsigned.apk"
+flavourDirs=$(find app/build/outputs/apk/ -mindepth 1 -maxdepth 1 -type d)
+for flavourDir in $flavourDirs; do
+  flavourName="$(basename "$flavourDir")"
+  echo "Your $flavourName flavour is at $flavourDir/release/app-$flavourName-release-unsigned.apk"
+done
 
 if [ -z "${KEYSTORE:-}" ]; then
   echo "KEYSTORE not set, skipping signing..."
@@ -36,16 +40,26 @@ else
   fi
 
   apksigner_version="$(ls -1 "$HOME/Android/Sdk/build-tools/" | tail -n 1)"
-  cp app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
-  "$HOME/Android/Sdk/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" app/build/outputs/apk/release/app-release.apk
 
-  echo "Build finished (signed)"
-  echo "Your build is at app/build/outputs/apk/release/app-release.apk"
+  for flavourDir in $flavourDirs; do
+    flavourName="$(basename "$flavourDir")"
+    echo "Signing $flavourName flavour..."
+    cp "$flavourDir/release/app-$flavourName-release-unsigned.apk" "$flavourDir/release/app-$flavourName-release.apk"
+    "$HOME/Android/Sdk/build-tools/$apksigner_version/apksigner" sign -v --ks "$KEYSTORE" --ks-key-alias "$KEYSTORE_ALIAS" "$flavourDir/release/app-$flavourName-release.apk"
+
+    echo "Build finished (signed)"
+    echo "Your $flavourName flavour is at $flavourDir/release/app-$flavourName-release.apk"
+  done
+
+  shasumPath="$(pwd)/SHA256SUMS"
+  echo "" > "$shasumPath"
+
+  for flavourDir in $flavourDirs; do
+    pushd "$flavourDir/release/"
+    sha256sum -- *.apk >> "$shasumPath"
+    popd
+  done
+
+  echo "SHA256SUMS generated"
+  echo "Your SHA256SUMS are at SHA256SUMS"
 fi
-
-pushd app/build/outputs/apk/release/
-sha256sum -- *.apk > SHA256SUMS
-popd
-
-echo "SHA256SUMS generated"
-echo "Your SHA256SUMS is at app/build/outputs/apk/release/SHA256SUMS"

docs/README.md

@@ -4,6 +4,7 @@ Copylefted libre software (GPLv3+) card management app.
 
 [![GitHub Version](https://img.shields.io/github/v/release/CatimaLoyalty/Android.svg?logo=github&label=GitHub)](https://github.com/CatimaLoyalty/Android/releases)
 [![IzzyOnDroid Version](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/me.hackerchick.catima)](https://apt.izzysoft.de/fdroid/index/apk/me.hackerchick.catima)
+[![F-Droid Version](https://img.shields.io/f-droid/v/me.hackerchick.catima.svg?logo=f-droid&label=F-Droid)](https://f-droid.org/packages/me.hackerchick.catima/)
 [![Google Play Store Version](https://img.shields.io/endpoint?color=blue&logo=google-play&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dme.hackerchick.catima%26l%3DGoogle%2520Play%26m%3D%24version)](https://play.google.com/store/apps/details?id=me.hackerchick.catima)
 
 ![Android CI](https://github.com/CatimaLoyalty/Android/workflows/Android%20CI/badge.svg)
@@ -13,7 +14,8 @@ Copylefted libre software (GPLv3+) card management app.
 
 <a href="https://apt.izzysoft.de/fdroid/index/apk/me.hackerchick.catima" target="_blank">
 <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="90"/></a>
-
+<a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
+<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
 <a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
 

docs/RELEASE_STEPS.md

@@ -6,8 +6,8 @@
 3. Update `CHANGELOG.md` with the new version name and the release date
 4. Update `app/build.gradle.kts` with the new `versionCode` and `versionName`
 5. Create a commit for the new release: `git add CHANGELOG.md app/build.gradle.kts && git commit -m "Release Catima <VERSION>"`
-6. Build a new .apk: `KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh`
-7. Upload the APK to Google Play Open Testing
+6. Build the new .apks: `KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh`
+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-release.apk` and `SHA256SUMS` files
+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>`

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

@@ -1 +1,3 @@
-- Možnost navigace po kartách pomocí tlačítek hlasitosti
+- Možnost procházet kartami pomocí tlačítek hlasitosti
+ - Oprava importu Stocard
+ - Oprava zprávy "Import zrušen" objevující se po úspěšném importu

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

@@ -0,0 +1 @@
+- Oprava zalamování textu v dialogovém okně Přidat

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

@@ -0,0 +1,4 @@
+- Změňte výchozí sloupec na širokoúhlých obrazovkách na 4
+ - Povolit přepsání počtu sloupců pro výšku a na šířku v nastavení
+ - Při otáčení obrazovky nebo otevírání karty ponechejte filtr vyhledávání na hlavní obrazovce
+ - Omezte maximální délku zobrazení poznámky na hlavní obrazovce

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

@@ -0,0 +1,3 @@
+- Přidejte podporu Passbook (.pkpass).
+ - Oprava importu transparentních souborů PDF
+ - Zlepšení zobrazení průhledných miniatur

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

@@ -0,0 +1 @@
+- Oprava pádu při otevírání neplatných souborů pkpass

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

@@ -0,0 +1,3 @@
+- Unterstützung für Passbook (.pkpass) hinzugefügt
+- Import transparenter PDF-Dateien repariert
+- Anzeige transparenter Vorschaubilder verbessert

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

@@ -0,0 +1 @@
+- Behebt Absturz beim Öffnen ungültiger pkpass-Dateien