Release Catima 2.23.0

Translations update from Hosted Weblate

.github/workflows/android.yml

@@ -20,11 +20,11 @@ jobs:
     - 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/wrapper-validation-action@v1
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
     - name: Build
       run: ./gradlew assembleRelease
     - name: Check lint

CHANGELOG.md

@@ -1,8 +1,19 @@
 # Changelog
 
-## Unreleased - 118
+## v2.23.0 - 120
+
+- Complete redesign of main and loyalty card view screens
+- Material You design for the settings screen
+- Fix crash when using "Take a photo" with disabled camera app
+
+## v2.22.1 - 119
+
+- Use Material You colours on more devices (Google library update)
+
+## v2.22.0 - 118
 
 - Support setting start of card validity
+- Fix Stocard import (Stocard's export format changed)
 
 ## v2.21.2 - 117
 

Gemfile.lock

@@ -3,21 +3,21 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.701.0)
-    aws-sdk-core (3.170.0)
+    aws-partitions (1.749.0)
+    aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
+    aws-sdk-kms (1.63.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.0)
+    aws-sdk-s3 (1.120.1)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -36,7 +36,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.98.0)
+    excon (0.99.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.211.0)
+    fastlane (2.212.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.32.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.10.0)
+    google-apis-androidpublisher_v3 (0.39.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,10 +117,10 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-playcustomapp_v1 (0.12.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -128,7 +128,7 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
+    google-cloud-errors (1.3.1)
     google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -137,7 +137,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -150,7 +150,7 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.6.3)
-    jwt (2.6.0)
+    jwt (2.7.0)
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
@@ -160,7 +160,7 @@ GEM
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
+    plist (3.7.0)
     public_suffix (5.0.1)
     rake (13.0.6)
     representable (3.2.0)

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdk 21
         targetSdk 33
-        versionCode 117
-        versionName "2.21.2"
+        versionCode 120
+        versionName "2.23.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -58,9 +58,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
 
     sourceSets {
         test {
@@ -80,18 +77,22 @@ android {
             includeAndroidResources true
         }
     }
+    lint {
+        lintConfig file('lint.xml')
+    }
+    namespace 'protect.card_locker'
 }
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
 // Splash Screen
     implementation 'androidx.core:core-splashscreen:1.0.0'
@@ -110,7 +111,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.5.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="protect.card_locker">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 

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

@@ -39,6 +39,13 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setTag("https://catima.app/privacy-policy/");
         binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
         binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
+        binding.donate.setTag("https://catima.app/contribute/#donating");
+
+        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
+        // Hide Google Play rate button if not on Google Play
+        binding.rate.setVisibility(installedFromGooglePlay ? 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);
 
         bindClickListeners();
     }
@@ -74,6 +81,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setOnClickListener(openExternalBrowser);
         binding.reportError.setOnClickListener(openExternalBrowser);
         binding.rate.setOnClickListener(openExternalBrowser);
+        binding.donate.setOnClickListener(openExternalBrowser);
 
         binding.credits.setOnClickListener(view -> showCredits());
     }
@@ -86,6 +94,8 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setOnClickListener(null);
         binding.reportError.setOnClickListener(null);
         binding.rate.setOnClickListener(null);
+        binding.donate.setOnClickListener(null);
+
         binding.credits.setOnClickListener(null);
     }
 

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

@@ -0,0 +1,5 @@
+package protect.card_locker;
+
+public interface BarcodeImageWriterResultCallback {
+    void onBarcodeImageWriterResult(boolean success);
+}

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

@@ -42,12 +42,12 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final int imageHeight;
     private final int imageWidth;
     private final boolean showFallback;
-    private final Runnable callback;
+    private final BarcodeImageWriterResultCallback callback;
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback, boolean roundCornerPadding
+            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
     ) {
         mContext = context;
 
@@ -282,7 +282,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         if (callback != null) {
-            callback.run();
+            callback.onBarcodeImageWriterResult(isSuccesful);
         }
     }
 

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

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -69,10 +68,9 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
             subscriber.onSubscribe(new NoOpSubscription());
             for (String controlId : controlIds) {
                 Control control;
-
-                try {
-                    Integer cardId = this.controlIdToCardId(controlId);
-                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                Integer cardId = this.controlIdToCardId(controlId);
+                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                if (card != null) {
                     Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                             .putExtra("id", card.id);
@@ -85,7 +83,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
                             .setControlTemplate(new StatelessTemplate(controlId))
                             .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
                             .build();
-                } catch (NullPointerException ignored) {
+                } else {
                     Intent mainScreenIntent = new Intent(this, MainActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);

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

@@ -17,7 +17,6 @@ import protect.card_locker.databinding.GroupLayoutBinding;
 import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
-    Settings mSettings;
     public final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
@@ -25,7 +24,6 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
     public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
-        mSettings = new Settings(inputContext);
         mContext = inputContext;
         mListener = inputListener;
         mDatabase = new DBHelper(inputContext).getReadableDatabase();
@@ -63,8 +61,6 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         }
 
         inputHolder.mCardCount.setText(cardCountText);
-        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
 
         applyClickEvents(inputHolder);
     }

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

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

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

@@ -35,7 +35,6 @@ import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
     private int mCurrentSelectedIndex = -1;
-    Settings mSettings;
     boolean mDarkModeEnabled;
     public final Context mContext;
     private final CardAdapterListener mListener;
@@ -47,7 +46,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
-        mSettings = new Settings(inputContext);
         mContext = inputContext;
         mListener = inputListener;
         mSelectedItems = new SparseBooleanArray();
@@ -107,7 +105,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
 
-        inputHolder.setStoreField(loyaltyCard.store);
         if (mShowDetails && !loyaltyCard.note.isEmpty()) {
             inputHolder.setNoteField(loyaltyCard.note);
         } else {
@@ -132,16 +129,9 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.setExtraField(inputHolder.mExpiryField, null, null);
         }
 
-        setHeaderHeight(inputHolder, mShowDetails);
-        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
-        if (cardIcon != null) {
-            inputHolder.mCardIcon.setImageBitmap(cardIcon);
-            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        } else {
-            inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
-            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        }
-        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
+        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
+        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, inputHolder.mCardIcon, inputHolder.mCardText);
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -153,19 +143,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         inputHolder.mRow.requestLayout();
     }
 
-    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
-        int iconHeight;
-        if (expanded) {
-            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
-        } else {
-            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
-        }
-
-        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
-        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
-        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
-    }
-
     private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -241,28 +218,25 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
-        public TextView mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
+        public TextView mCardText, mNoteField, mBalanceField, mValidFromField, mExpiryField;
         public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
-        public MaterialCardView mRow, mIconLayout;
+        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();
             mRow = loyaltyCardLayoutBinding.row;
             mDivider = loyaltyCardLayoutBinding.infoDivider;
-            mStoreField = loyaltyCardLayoutBinding.store;
             mNoteField = loyaltyCardLayoutBinding.note;
             mBalanceField = loyaltyCardLayoutBinding.balance;
             mValidFromField = loyaltyCardLayoutBinding.validFrom;
             mExpiryField = loyaltyCardLayoutBinding.expiry;
-            mIconLayout = loyaltyCardLayoutBinding.iconLayout;
             mCardIcon = loyaltyCardLayoutBinding.thumbnail;
+            mCardText = loyaltyCardLayoutBinding.thumbnailText;
             mStar = loyaltyCardLayoutBinding.star;
             mStarBackground = loyaltyCardLayoutBinding.starBackground;
             mStarBorder = loyaltyCardLayoutBinding.starBorder;
@@ -285,20 +259,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 return;
             }
 
-            int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
-
             field.setVisibility(View.VISIBLE);
             field.setText(text);
-            field.setTextSize(size);
-            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
+            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, com.google.android.material.R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
 
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
             mDivider.setVisibility(View.VISIBLE);
             field.setVisibility(View.VISIBLE);
             Drawable icon = field.getCompoundDrawables()[0];
             if (icon != null) {
                 icon.mutate();
-                icon.setBounds(0, 0, drawableSize, drawableSize);
                 field.setCompoundDrawablesRelative(icon, null, null, null);
 
                 if (color != null) {
@@ -311,19 +280,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             field.requestLayout();
         }
 
-        public void setStoreField(String text) {
-            mStoreField.setText(text);
-            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
-            mStoreField.requestLayout();
-        }
-
         public void setNoteField(String text) {
             if (text == null) {
                 mNoteField.setVisibility(View.GONE);
             } else {
                 mNoteField.setVisibility(View.VISIBLE);
                 mNoteField.setText(text);
-                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
             }
             mNoteField.requestLayout();
         }

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

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -73,7 +72,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
@@ -85,7 +83,7 @@ import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;
 
-public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback {
     private LoyaltyCardEditActivityBinding binding;
     private static final String TAG = "Catima";
 
@@ -171,8 +169,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     AlertDialog confirmExitDialog = null;
 
     boolean validBalance = true;
-    Runnable barcodeImageGenerationFinishedCallback;
-
     HashMap<String, Currency> currencies = new HashMap<>();
 
     LoyaltyCard tempLoyaltyCard;
@@ -350,13 +346,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         enterButton = binding.enterButton;
 
-        barcodeImageGenerationFinishedCallback = () -> {
-            if (!(boolean) barcodeImage.getTag()) {
-                barcodeImageLayout.setVisibility(View.GONE);
-                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-            }
-        };
-
         storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -672,16 +661,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
         mCropperOptions.setAspectRatioOptions(selectedByDefault,
                 new AspectRatio(null, 1, 1),
-                new AspectRatio(getResources().getString(R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
+                new AspectRatio(getResources().getString(com.yalantis.ucrop.R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
                 new AspectRatio(getResources().getString(R.string.card).toUpperCase(), 85.6f, 53.98f)
         );
 
         // Fix theming
 
-        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
-        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
-        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        int colorPrimary = MaterialColors.getColor(this, androidx.appcompat.R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         mCropperOptions.setToolbarColor(colorSurface);
         mCropperOptions.setStatusBarColor(colorSurface);
@@ -913,7 +902,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary);
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);
 
             updateTempState(LoyaltyCardField.headerColor, headerColor);
 
@@ -1131,7 +1120,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         Uri photoURI = FileProvider.getUriForFile(LoyaltyCardEditActivity.this, BuildConfig.APPLICATION_ID, Utils.createTempFile(this, TEMP_CAMERA_IMAGE_NAME));
         mRequestedImage = type;
 
-        mPhotoTakerLauncher.launch(photoURI);
+        try {
+            mPhotoTakerLauncher.launch(photoURI);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(getApplicationContext(), R.string.cameraPermissionDeniedTitle, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
     }
 
     private void selectImageFromGallery(int type) {
@@ -1152,6 +1146,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
     }
 
+    @Override
+    public void onBarcodeImageWriterResult(boolean success) {
+        if (!success) {
+            barcodeImageLayout.setVisibility(View.GONE);
+            Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+        }
+    }
+
     class EditCardIdAndBarcode implements View.OnClickListener {
         @Override
         public void onClick(View v) {
@@ -1549,13 +1551,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -9,8 +9,6 @@ import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.graphics.Outline;
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,13 +21,10 @@ import android.text.style.ForegroundColorSpan;
 import android.text.util.Linkify;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -47,23 +42,17 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.widget.TextViewCompat;
 
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputEditText;
 
 import java.io.File;
@@ -82,31 +71,10 @@ import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LoyaltyCardViewLayoutBinding;
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements GestureDetector.OnGestureListener {
+public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback {
     private LoyaltyCardViewLayoutBinding binding;
     private static final String TAG = "Catima";
 
-    private GestureDetector mGestureDetector;
-
-    CoordinatorLayout coordinatorLayout;
-    ConstraintLayout mainLayout;
-    TextView cardIdFieldView;
-    BottomAppBar bottomAppBar;
-    ImageButton bottomAppBarInfoButton;
-    ImageButton bottomAppBarPreviousButton;
-    ImageButton bottomAppBarNextButton;
-    ImageButton bottomAppBarUpdateBalanceButton;
-    AppCompatTextView storeName;
-    ImageButton maximizeButton;
-    ImageView mainImage;
-    LinearLayout dotIndicator;
-    ImageButton minimizeButton;
-    View collapsingToolbarLayout;
-    AppBarLayout appBarLayout;
-    ImageView iconImage;
-    Toolbar portraitToolbar;
-    Toolbar landscapeToolbar;
-
     int loyaltyCardId;
     ArrayList<Integer> cardList;
 
@@ -121,56 +89,36 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     String barcodeIdString;
     CatimaBarcode format;
 
-    FloatingActionButton editButton;
-
-    Guideline centerGuideline;
-    SeekBar barcodeScaler;
-
     Bitmap frontImageBitmap;
     Bitmap backImageBitmap;
 
-    boolean starred;
     boolean backgroundNeedsDarkIcons;
     boolean isFullscreen = false;
+    ImageView barcodeRenderTarget;
     int mainImageIndex = 0;
     List<ImageType> imageTypes;
-    private ImageView[] dots;
     boolean isBarcodeSupported = true;
 
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
 
-    private final int HEADER_FILTER_ALPHA = 127;
-
     final private TaskHandler mTasks = new TaskHandler();
     Runnable barcodeImageGenerationFinishedCallback;
 
-    @Override
-    public boolean onDown(MotionEvent e) {
-        return true;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent e) {
-        if (imageTypes.size() > 1) {
-            Toast.makeText(this, getString(R.string.swipeToSwitchImages), Toast.LENGTH_SHORT).show();
+    public void onMainImageTap() {
+        // If we're in fullscreen, leave fullscreen
+        if (isFullscreen) {
+            setFullscreen(false);
+            return;
         }
 
-        return false;
-    }
+        // If the barcode is shown, switch to fullscreen layout
+        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
+            setFullscreen(true);
+            return;
+        }
 
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
+        // If this is an image, open it in the gallery.
         openCurrentMainImageInGallery();
     }
 
@@ -212,46 +160,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     }
 
     @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        Log.d(TAG, "On fling");
+    public void onBarcodeImageWriterResult(boolean success) {
+        if (!success) {
+            imageTypes.remove(ImageType.BARCODE);
 
-        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
-            // Vertical swipe
-            // Swipe up
-            if (velocityY < -150) {
-                if (!isFullscreen) {
-                    setFullscreen(true);
-                }
-                return false;
-            }
+            setStateBasedOnImageTypes();
 
-            // Swipe down
-            if (velocityY > 150) {
-                if (isFullscreen) {
-                    setFullscreen(false);
-                }
-                return false;
-            }
-        } else if (Math.abs(velocityX) > (0.75 * Math.abs(velocityY))) {
-            // Horizontal swipe
-            // Swipe right
-            if (velocityX < -150) {
-                setMainImage(true, false);
-                return false;
-            }
+            // Call correct drawMainImage
+            setFullscreen(isFullscreen);
 
-            // Swipe left
-            if (velocityX > 150) {
-                setMainImage(false, false);
-                return false;
-            }
+            Toast.makeText(LoyaltyCardViewActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
         }
-
-        if (imageTypes.size() > 1) {
-            Toast.makeText(this, getString(R.string.swipeToSwitchImages), Toast.LENGTH_SHORT).show();
-        }
-
-        return true;
     }
 
     enum ImageType {
@@ -268,40 +187,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
-    private Drawable getDotIcon(boolean active, boolean darkMode) {
-        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, active ? R.drawable.active_dot : R.drawable.inactive_dot);
-        assert unwrappedIcon != null;
-        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        if (darkMode) {
-            DrawableCompat.setTint(wrappedIcon, Color.WHITE);
-        } else {
-            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
-        }
-
-        return wrappedIcon;
-    }
-
-    private Drawable getIcon(int icon, boolean dark) {
-        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
-        assert unwrappedIcon != null;
-        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        wrappedIcon.mutate();
-        if (dark) {
-            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
-        } else {
-            DrawableCompat.setTintList(wrappedIcon, null);
-        }
-
-        return wrappedIcon;
-    }
-
-    private void setCenterGuideline(int zoomLevel) {
+    private void setScalerGuideline(int zoomLevel) {
         float scale = zoomLevel / 100f;
 
         if (format != null && format.isSquare()) {
-            centerGuideline.setGuidelinePercent(0.75f * scale);
+            binding.scalerGuideline.setGuidelinePercent(0.75f * scale);
         } else {
-            centerGuideline.setGuidelinePercent(0.5f * scale);
+            binding.scalerGuideline.setGuidelinePercent(0.5f * scale);
         }
 
     }
@@ -329,6 +221,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         super.onCreate(savedInstanceState);
         binding = LoyaltyCardViewLayoutBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
 
         settings = new Settings(this);
 
@@ -355,43 +250,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         database = new DBHelper(this).getWritableDatabase();
         importURIHelper = new ImportURIHelper(this);
 
-        coordinatorLayout = binding.coordinatorLayout;
-        mainLayout = binding.mainLayout;
-        cardIdFieldView = binding.cardIdView;
-        storeName = binding.storeName;
-        maximizeButton = binding.maximizeButton;
-        mainImage = binding.mainImage;
-        mainImage.setClipToOutline(true);
-        dotIndicator = binding.dotIndicator;
-        minimizeButton = binding.minimizeButton;
-        collapsingToolbarLayout = binding.collapsingToolbarLayout;
-        appBarLayout = binding.appBarLayout;
-        bottomAppBar = binding.bottomAppBar;
-        iconImage = binding.iconImage;
-        portraitToolbar = binding.toolbar;
-        landscapeToolbar = binding.toolbarLandscape;
-
-        bottomAppBarInfoButton = binding.buttonShowInfo;
-        bottomAppBarPreviousButton = binding.buttonPrevious;
-        bottomAppBarNextButton = binding.buttonNext;
-        bottomAppBarUpdateBalanceButton = binding.buttonUpdateBalance;
-
-        barcodeImageGenerationFinishedCallback = () -> {
-            if (!(boolean) mainImage.getTag()) {
-                mainImage.setVisibility(View.GONE);
-                imageTypes.remove(ImageType.BARCODE);
-
-                // Redraw UI
-                setDotIndicator(Utils.isDarkModeEnabled(LoyaltyCardViewActivity.this));
-                setFullscreen(isFullscreen);
-
-                Toast.makeText(LoyaltyCardViewActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-            }
-        };
-
-        centerGuideline = binding.centerGuideline;
-        barcodeScaler = binding.barcodeScaler;
-        barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        binding.barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 if (!fromUser) {
@@ -399,14 +258,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     return;
                 }
                 Log.d(TAG, "Progress is " + progress);
-                Log.d(TAG, "Max is " + barcodeScaler.getMax());
-                float scale = (float) progress / (float) barcodeScaler.getMax();
+                Log.d(TAG, "Max is " + binding.barcodeScaler.getMax());
+                float scale = (float) progress / (float) binding.barcodeScaler.getMax();
                 Log.d(TAG, "Scaling to " + scale);
 
                 loyaltyCard.zoomLevel = progress;
                 DBHelper.updateLoyaltyCardZoomLevel(database, loyaltyCardId, loyaltyCard.zoomLevel);
 
-                setCenterGuideline(loyaltyCard.zoomLevel);
+                setScalerGuideline(loyaltyCard.zoomLevel);
 
                 drawMainImage(mainImageIndex, true, isFullscreen);
             }
@@ -424,12 +283,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         rotationEnabled = true;
 
-        // Allow making barcode fullscreen on tap
-        maximizeButton.setOnClickListener(v -> setFullscreen(true));
-        minimizeButton.setOnClickListener(v -> setFullscreen(false));
+        binding.fullscreenButtonMinimize.setOnClickListener(v -> setFullscreen(false));
 
-        editButton = binding.fabEdit;
-        editButton.setOnClickListener(v -> {
+        binding.fabEdit.setOnClickListener(v -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
             bundle.putInt("id", loyaltyCardId);
@@ -438,35 +294,21 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             startActivity(intent);
             finish();
         });
-        editButton.bringToFront();
+        binding.fabEdit.bringToFront();
 
-        appBarLayout.setOutlineProvider(new ViewOutlineProvider() {
-            @Override
-            public void getOutline(View view, Outline outline) {
-                ViewOutlineProvider.BACKGROUND.getOutline(view, outline);
-                outline.setAlpha(0f);
-            }
+        binding.bottomAppBarInfoButton.setOnClickListener(view -> showInfoDialog());
+        binding.bottomAppBarPreviousButton.setOnClickListener(view -> prevNextCard(false));
+        binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
+        binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
+
+        binding.mainImage.setOnClickListener(view -> onMainImageTap());
+        // This long-press was originally only intended for when Talkback was used but sadly limiting
+        // this doesn't seem to work well
+        binding.mainImage.setOnLongClickListener(view -> {
+            setMainImage(true, true);
+            return true;
         });
-
-        bottomAppBarInfoButton.setOnClickListener(view -> showInfoDialog());
-        bottomAppBarPreviousButton.setOnClickListener(view -> prevNextCard(false));
-        bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
-        bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
-
-        mGestureDetector = new GestureDetector(this, this);
-        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
-        mainImage.setOnTouchListener(gestureTouchListener);
-
-        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-            @Override
-            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
-                        CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
-                );
-                iconImage.setClipBounds(new Rect(left, top, right, bottom));
-            }
-        });
-        this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        binding.fullscreenImage.setOnClickListener(view -> onMainImageTap());
     }
 
     private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
@@ -493,7 +335,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 dialogContentPadding,
                 dialogTitlePadding
         );
-        infoTitleView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
         infoTitleView.setText(loyaltyCard.store);
         infoDialog.setCustomTitle(infoTitleView);
         infoDialog.setTitle(loyaltyCard.store);
@@ -630,20 +471,20 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void setBottomAppBarButtonState() {
         if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.validFrom != null || loyaltyCard.expiry != null) {
-            bottomAppBarInfoButton.setVisibility(View.VISIBLE);
+            binding.bottomAppBarInfoButton.setVisibility(View.VISIBLE);
         } else {
-            bottomAppBarInfoButton.setVisibility(View.GONE);
+            binding.bottomAppBarInfoButton.setVisibility(View.GONE);
         }
 
         if (cardList == null || cardList.size() == 1) {
-            bottomAppBarPreviousButton.setVisibility(View.GONE);
-            bottomAppBarNextButton.setVisibility(View.GONE);
+            binding.bottomAppBarPreviousButton.setVisibility(View.GONE);
+            binding.bottomAppBarNextButton.setVisibility(View.GONE);
         } else {
-            bottomAppBarPreviousButton.setVisibility(View.VISIBLE);
-            bottomAppBarNextButton.setVisibility(View.VISIBLE);
+            binding.bottomAppBarPreviousButton.setVisibility(View.VISIBLE);
+            binding.bottomAppBarNextButton.setVisibility(View.VISIBLE);
         }
 
-        bottomAppBarUpdateBalanceButton.setVisibility(hasBalance(loyaltyCard) ? View.VISIBLE : View.GONE);
+        binding.bottomAppBarUpdateBalanceButton.setVisibility(hasBalance(loyaltyCard) ? View.VISIBLE : View.GONE);
     }
 
     private void prevNextCard(boolean next) {
@@ -738,6 +579,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        setTitle(loyaltyCard.store);
+
         loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
 
         setupOrientation();
@@ -746,19 +589,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         cardIdString = loyaltyCard.cardId;
         barcodeIdString = loyaltyCard.barcodeId;
 
-        cardIdFieldView.setText(loyaltyCard.cardId);
-        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
-                settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
-                1, TypedValue.COMPLEX_UNIT_SP);
-
-        storeName.setText(loyaltyCard.store);
-        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
-        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
-                storeName,
-                settings.getFontSizeMin(settings.getLargeFont()),
-                settings.getFontSizeMax(settings.getLargeFont()),
-                1,
-                TypedValue.COMPLEX_UNIT_DIP);
+        binding.cardIdView.setText(loyaltyCard.cardId);
 
         int backgroundHeaderColor;
         if (loyaltyCard.headerColor != null) {
@@ -767,72 +598,29 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             backgroundHeaderColor = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
         }
 
-        int textColor;
-        if (Utils.needsDarkForeground(backgroundHeaderColor)) {
-            textColor = Color.BLACK;
-        } else {
-            textColor = Color.WHITE;
-        }
-        storeName.setTextColor(textColor);
-        landscapeToolbar.setTitleTextColor(textColor);
-
         // Also apply colours to UI elements
         int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
-        barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
-        barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
-        maximizeButton.setBackgroundColor(darkenedColor);
-        minimizeButton.setBackgroundColor(darkenedColor);
-        bottomAppBar.setBackgroundColor(darkenedColor);
-        maximizeButton.setColorFilter(textColor);
-        minimizeButton.setColorFilter(textColor);
+        binding.barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
+        binding.barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+        binding.bottomAppBar.setBackgroundColor(darkenedColor);
         int complementaryColor = Utils.getComplementaryColor(darkenedColor);
-        editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
-        Drawable editButtonIcon = editButton.getDrawable();
+        binding.fabEdit.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
+        Drawable editButtonIcon = binding.fabEdit.getDrawable();
         editButtonIcon.mutate();
         editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
-        editButton.setImageDrawable(editButtonIcon);
+        binding.fabEdit.setImageDrawable(editButtonIcon);
 
-        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
-        if (icon != null) {
-            int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;
-            Log.d("onResume", "setting icon image");
-            iconImage.setImageBitmap(icon);
-            int backgroundWithAlpha = Color.argb(HEADER_FILTER_ALPHA, Color.red(backgroundAlphaColor), Color.green(backgroundAlphaColor), Color.blue(backgroundAlphaColor));
-            // for images that has alpha
-            appBarLayout.setBackgroundColor(backgroundWithAlpha);
-        } else {
-            Bitmap plain = Bitmap.createBitmap(new int[]{backgroundHeaderColor}, 1, 1, Bitmap.Config.ARGB_8888);
-            iconImage.setImageBitmap(plain);
-            appBarLayout.setBackgroundColor(Color.TRANSPARENT);
-        }
+        Utils.setIconOrTextWithBackground(this, loyaltyCard, binding.iconImage, binding.iconText);
 
         // If the background is very bright, we should use dark icons
         backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.home_arrow_back_white, backgroundNeedsDarkIcons));
-        }
 
-        fixImageButtonColor(bottomAppBarInfoButton);
-        fixImageButtonColor(bottomAppBarPreviousButton);
-        fixImageButtonColor(bottomAppBarNextButton);
-        fixImageButtonColor(bottomAppBarUpdateBalanceButton);
+        fixBottomAppBarImageButtonColor(binding.bottomAppBarInfoButton);
+        fixBottomAppBarImageButtonColor(binding.bottomAppBarPreviousButton);
+        fixBottomAppBarImageButtonColor(binding.bottomAppBarNextButton);
+        fixBottomAppBarImageButtonColor(binding.bottomAppBarUpdateBalanceButton);
         setBottomAppBarButtonState();
 
-        // Make notification area light if dark icons are needed
-        if (Build.VERSION.SDK_INT >= 23) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(backgroundNeedsDarkIcons);
-            window.setStatusBarColor(Color.TRANSPARENT);
-        } else {
-            // Darken statusbar if icons won't be visible otherwise
-            window.setStatusBarColor(backgroundNeedsDarkIcons ? ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.15f) : Color.TRANSPARENT);
-        }
-
-        // Set shadow colour of store text so even same color on same color would be readable
-        storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
-
         if (format != null && !format.isSupported()) {
             isBarcodeSupported = false;
 
@@ -857,11 +645,29 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.IMAGE_BACK);
         }
 
-        setDotIndicator(Utils.isDarkModeEnabled(this));
+        setStateBasedOnImageTypes();
 
         setFullscreen(isFullscreen);
 
         DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
+
+        invalidateOptionsMenu();
+    }
+
+    private void setStateBasedOnImageTypes() {
+        // Decrease the card holder size to only fit the value if there is no barcode
+        // This looks much cleaner
+        ViewGroup.LayoutParams cardHolderLayoutParams = binding.cardHolder.getLayoutParams();
+        if (imageTypes.isEmpty()) {
+            cardHolderLayoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        } else {
+            cardHolderLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
+        }
+        binding.cardHolder.setLayoutParams(cardHolderLayoutParams);
+
+        // Ensure buttons and accessibility are correct
+        setMainImagePreviousNextButtons();
+        setMainImageAccessibility();
     }
 
     @SuppressWarnings("deprecation")
@@ -870,7 +676,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
     }
 
-    private void fixImageButtonColor(ImageButton imageButton) {
+    private void fixBottomAppBarImageButtonColor(ImageButton imageButton) {
         imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
     }
 
@@ -887,18 +693,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
-        starred = loyaltyCard.starStatus != 0;
-
-        if (loyaltyCard.archiveStatus != 0) {
-            menu.findItem(R.id.action_unarchive).setVisible(true);
-            menu.findItem(R.id.action_archive).setVisible(false);
-        } else {
-            menu.findItem(R.id.action_unarchive).setVisible(false);
-            menu.findItem(R.id.action_archive).setVisible(true);
-        }
-
-        menu.findItem(R.id.action_overflow).setIcon(getIcon(R.drawable.ic_overflow_menu, backgroundNeedsDarkIcons));
-        menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -907,13 +701,27 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        if (starred) {
-            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
-            menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
-        } else {
-            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
-            menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
+
+        if (loyaltyCard != null) {
+            // Update star status
+            if (loyaltyCard.starStatus == 1) {
+                menu.findItem(R.id.action_star_unstar).setIcon(R.drawable.ic_starred);
+                menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
+            } else {
+                menu.findItem(R.id.action_star_unstar).setIcon(R.drawable.ic_unstarred);
+                menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
+            }
+
+            // Update archive/unarchive button
+            if (loyaltyCard.archiveStatus != 0) {
+                menu.findItem(R.id.action_unarchive).setVisible(true);
+                menu.findItem(R.id.action_archive).setVisible(false);
+            } else {
+                menu.findItem(R.id.action_unarchive).setVisible(false);
+                menu.findItem(R.id.action_archive).setVisible(true);
+            }
         }
+
         return true;
     }
 
@@ -942,11 +750,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             return true;
         } else if (id == R.id.action_star_unstar) {
-            starred = !starred;
-            DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
+            DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, loyaltyCard.starStatus == 0 ? 1 : 0);
 
             // Re-init loyaltyCard with new data from DB
             onResume();
+            invalidateOptionsMenu();
 
             return true;
         } else if (id == R.id.action_archive) {
@@ -955,6 +763,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Re-init loyaltyCard with new data from DB
             onResume();
+            invalidateOptionsMenu();
 
             return true;
         } else if (id == R.id.action_unarchive) {
@@ -963,6 +772,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Re-init loyaltyCard with new data from DB
             onResume();
+            invalidateOptionsMenu();
 
             return true;
         } else if (id == R.id.action_delete) {
@@ -993,23 +803,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             Log.d(TAG, "Detected landscape mode");
-            setTitle(loyaltyCard.store);
-
-            collapsingToolbarLayout.setVisibility(View.GONE);
-            portraitToolbar.setVisibility(View.GONE);
-            landscapeToolbar.setVisibility(View.VISIBLE);
-
-            setSupportActionBar(landscapeToolbar);
+            binding.iconContainer.setVisibility(View.GONE);
         } else {
             Log.d(TAG, "Detected portrait mode");
-
-            setTitle("");
-
-            collapsingToolbarLayout.setVisibility(View.VISIBLE);
-            portraitToolbar.setVisibility(View.VISIBLE);
-            landscapeToolbar.setVisibility(View.GONE);
-
-            setSupportActionBar(portraitToolbar);
+            binding.iconContainer.setVisibility(View.VISIBLE);
         }
 
         enableToolbarBackButton();
@@ -1017,15 +814,16 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void drawBarcode(boolean addPadding) {
         mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+
         if (format != null) {
             BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
                     getApplicationContext(),
-                    mainImage,
+                    barcodeRenderTarget,
                     barcodeIdString != null ? barcodeIdString : cardIdString,
                     format,
                     null,
                     false,
-                    barcodeImageGenerationFinishedCallback,
+                    this,
                     addPadding);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
@@ -1033,11 +831,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void redrawBarcodeAfterResize(boolean addPadding) {
         if (format != null) {
-            mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
+            barcodeRenderTarget.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener() {
                         @Override
                         public void onGlobalLayout() {
-                            mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                            barcodeRenderTarget.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
                             drawBarcode(addPadding);
@@ -1048,25 +846,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void drawMainImage(int index, boolean waitForResize, boolean isFullscreen) {
         if (imageTypes.isEmpty()) {
-            mainImage.setVisibility(View.GONE);
+            barcodeRenderTarget.setVisibility(View.GONE);
             return;
         }
 
-        if (dots != null) {
-            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
-            for (int i = 0; i < dots.length; i++) {
-                dots[i].setImageDrawable(getDotIcon(i == index, darkMode));
-            }
-        }
-
         ImageType wantedImageType = imageTypes.get(index);
 
         if (wantedImageType == ImageType.BARCODE) {
             // Use border in non-fullscreen mode
             if (!isFullscreen) {
-                mainImage.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
+                barcodeRenderTarget.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
             } else {
-                mainImage.setBackgroundColor(Color.WHITE);
+                barcodeRenderTarget.setBackgroundColor(Color.WHITE);
             }
 
             if (waitForResize) {
@@ -1075,27 +866,27 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 drawBarcode(!isFullscreen);
             }
 
-            mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
+            barcodeRenderTarget.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
         } else if (wantedImageType == ImageType.IMAGE_FRONT) {
-            mainImage.setImageBitmap(frontImageBitmap);
-            mainImage.setBackgroundColor(Color.TRANSPARENT);
-            mainImage.setContentDescription(getString(R.string.frontImageDescription));
+            barcodeRenderTarget.setImageBitmap(frontImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            barcodeRenderTarget.setContentDescription(getString(R.string.frontImageDescription));
         } else if (wantedImageType == ImageType.IMAGE_BACK) {
-            mainImage.setImageBitmap(backImageBitmap);
-            mainImage.setBackgroundColor(Color.TRANSPARENT);
-            mainImage.setContentDescription(getString(R.string.backImageDescription));
+            barcodeRenderTarget.setImageBitmap(backImageBitmap);
+            barcodeRenderTarget.setBackgroundColor(Color.TRANSPARENT);
+            barcodeRenderTarget.setContentDescription(getString(R.string.backImageDescription));
         } else {
             throw new IllegalArgumentException("Unknown image type: " + wantedImageType);
         }
 
-        mainImage.setVisibility(View.VISIBLE);
+        barcodeRenderTarget.setVisibility(View.VISIBLE);
     }
 
     private void setMainImage(boolean next, boolean overflow) {
         int newIndex = mainImageIndex + (next ? 1 : -1);
 
         if (newIndex >= imageTypes.size() && overflow) {
-            newIndex = 0;
+        newIndex = 0;
         }
 
         if (newIndex == -1 || newIndex >= imageTypes.size()) {
@@ -1105,24 +896,85 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         mainImageIndex = newIndex;
 
         drawMainImage(newIndex, false, isFullscreen);
+
+        setMainImagePreviousNextButtons();
+        setMainImageAccessibility();
     }
 
-    private void setDotIndicator(boolean darkMode) {
-        dotIndicator.removeAllViews();
-        if (imageTypes.size() >= 2) {
-            dots = new ImageView[imageTypes.size()];
-
-            for (int i = 0; i < imageTypes.size(); i++) {
-                dots[i] = new ImageView(this);
-                dots[i].setImageDrawable(getDotIcon(false, darkMode));
-
-                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-                params.setMargins(8, 0, 8, 0);
-
-                dotIndicator.addView(dots[i], params);
+    private void setMainImageAccessibility() {
+        // Single-click actions
+        if (mainImageIndex == 0) {
+            ViewCompat.replaceAccessibilityAction(
+                    binding.mainImage,
+                    AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CLICK,
+                    getString(R.string.moveBarcodeToTopOfScreen),
+                    null
+            );
+        } else {
+            int accessibilityClickAction;
+            if (mainImageIndex == 1) {
+                accessibilityClickAction = R.string.openFrontImageInGalleryApp;
+            } else if (mainImageIndex == 2) {
+                accessibilityClickAction = R.string.openBackImageInGalleryApp;
+            } else {
+                throw new IndexOutOfBoundsException("setMainImageAccessibility was out of range (action_click)");
             }
 
-            dotIndicator.setVisibility(View.VISIBLE);
+            ViewCompat.replaceAccessibilityAction(
+                    binding.mainImage,
+                    AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CLICK,
+                    getString(accessibilityClickAction),
+                    null
+            );
+        }
+
+        // Long-press actions
+        int accessibilityLongPressAction;
+        if (mainImageIndex == 0) {
+            accessibilityLongPressAction = R.string.switchToFrontImage;
+        } else if (mainImageIndex == 1) {
+            accessibilityLongPressAction = R.string.switchToBackImage;
+        } else if (mainImageIndex == 2) {
+            accessibilityLongPressAction = R.string.switchToBarcode;
+        } else {
+            throw new IndexOutOfBoundsException("setMainImageAccessibility was out of range (action_long_click)");
+        }
+
+        ViewCompat.replaceAccessibilityAction(
+                binding.mainImage,
+                AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_LONG_CLICK,
+                getString(accessibilityLongPressAction),
+                null
+        );
+    }
+
+    private void setMainImagePreviousNextButtons() {
+        if (imageTypes.size() < 2) {
+            binding.mainLeftButton.setVisibility(View.INVISIBLE);
+            binding.mainRightButton.setVisibility(View.INVISIBLE);
+
+            binding.mainLeftButton.setOnClickListener(null);
+            binding.mainRightButton.setOnClickListener(null);
+
+            return;
+        }
+
+        // Enable left button if we can go further left
+        if (mainImageIndex > 0) {
+            binding.mainLeftButton.setVisibility(View.VISIBLE);
+            binding.mainLeftButton.setOnClickListener(view -> setMainImage(false, false));
+        } else {
+            binding.mainLeftButton.setVisibility(View.INVISIBLE);
+            binding.mainLeftButton.setOnClickListener(null);
+        }
+
+        // Enable right button if we can go further right
+        if (mainImageIndex < (imageTypes.size() - 1)) {
+            binding.mainRightButton.setVisibility(View.VISIBLE);
+            binding.mainRightButton.setOnClickListener(view -> setMainImage(true, false));
+        } else {
+            binding.mainRightButton.setVisibility(View.INVISIBLE);
+            binding.mainRightButton.setOnClickListener(null);
         }
     }
 
@@ -1133,37 +985,31 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
      * by machines which offer no space to insert the complete device.
      */
     private void setFullscreen(boolean enabled) {
-        isFullscreen = enabled;
         ActionBar actionBar = getSupportActionBar();
+        isFullscreen = enabled;
 
         if (enabled && !imageTypes.isEmpty()) {
             Log.d(TAG, "Move into fullscreen");
 
+            barcodeRenderTarget = binding.fullscreenImage;
+
+            // Show only fullscreen view
+            binding.container.setVisibility(View.GONE);
+            binding.fullscreenLayout.setVisibility(View.VISIBLE);
+
             drawMainImage(mainImageIndex, true, isFullscreen);
 
-            barcodeScaler.setProgress(loyaltyCard.zoomLevel);
-            setCenterGuideline(loyaltyCard.zoomLevel);
-
-            // Hide maximize and show minimize button and scaler
-            maximizeButton.setVisibility(View.GONE);
-            minimizeButton.setVisibility(View.VISIBLE);
-            barcodeScaler.setVisibility(View.VISIBLE);
+            binding.barcodeScaler.setProgress(loyaltyCard.zoomLevel);
+            setScalerGuideline(loyaltyCard.zoomLevel);
 
             // Hide actionbar
             if (actionBar != null) {
                 actionBar.hide();
             }
 
-            // Hide toolbars
-            appBarLayout.setVisibility(View.INVISIBLE);
-            iconImage.setVisibility(View.INVISIBLE);
-            collapsingToolbarLayout.setVisibility(View.GONE);
-            landscapeToolbar.setVisibility(View.GONE);
-
             // Hide other UI elements
-            cardIdFieldView.setVisibility(View.GONE);
-            bottomAppBar.setVisibility(View.GONE);
-            editButton.setVisibility(View.GONE);
+            binding.bottomAppBar.setVisibility(View.GONE);
+            binding.fabEdit.setVisibility(View.GONE);
 
             // Set Android to fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -1178,44 +1024,36 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         } else {
             Log.d(TAG, "Move out of fullscreen");
 
-            // Reset center guideline
-            setCenterGuideline(100);
+            barcodeRenderTarget = binding.mainImage;
+
+            // Show only regular view
+            binding.container.setVisibility(View.VISIBLE);
+            binding.fullscreenLayout.setVisibility(View.GONE);
 
             drawMainImage(mainImageIndex, true, isFullscreen);
 
-            // Show maximize and hide minimize button and scaler
-            maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
-
-            minimizeButton.setVisibility(View.GONE);
-            barcodeScaler.setVisibility(View.GONE);
-
             // Show actionbar
             if (actionBar != null) {
                 actionBar.show();
             }
 
-            // Show appropriate toolbar
-            appBarLayout.setVisibility(View.VISIBLE);
-            setupOrientation();
-            iconImage.setVisibility(View.VISIBLE);
-
             // Show other UI elements
-            cardIdFieldView.setVisibility(View.VISIBLE);
-            editButton.setVisibility(View.VISIBLE);
-            bottomAppBar.setVisibility(View.VISIBLE);
+            binding.bottomAppBar.setVisibility(View.VISIBLE);
+            binding.fabEdit.setVisibility(View.VISIBLE);
 
             // Unset fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 getWindow().setDecorFitsSystemWindows(true);
                 if (getWindow().getInsetsController() != null) {
                     getWindow().getInsetsController().show(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+                    getWindow().getInsetsController().setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
                 }
             } else {
                 unsetFullscreenModeSdkLessThan30();
             }
         }
 
-        Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + barcodeScaler.getProgress());
+        Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + binding.barcodeScaler.getProgress());
     }
 
     @SuppressWarnings("deprecation")

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

@@ -50,7 +50,7 @@ import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     private MainActivityBinding binding;
     private ArchiveActivityBinding archiveActivityBinding;
     private ContentMainBinding contentMainBinding;
@@ -63,7 +63,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private LoyaltyCardCursorAdapter mAdapter;
     private ActionMode mCurrentActionMode;
     private SearchView mSearchView;
-    private GestureDetector mGestureDetector;
     private int mLoyaltyCardCount = 0;
     protected String mFilter = "";
     protected Object mGroup = null;
@@ -282,19 +281,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             }
         });
 
-        mGestureDetector = new GestureDetector(this, this);
-
-        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
-
         mHelpSection = contentMainBinding.helpSection;
         mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
         mNoGroupCardsText = contentMainBinding.noGroupCardsText;
         mCardList = contentMainBinding.list;
 
-        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
-        mCardList.setOnTouchListener(gestureTouchListener);
-        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
-
         mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
@@ -375,18 +366,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         // Start of active tab logic
         updateTabGroups(groupsTabLayout);
 
-        // Restore settings from Shared Preference
+        // Restore selected tab from Shared Preference
         SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_active_tab),
                 Context.MODE_PRIVATE);
         selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+
+        // Restore sort preferences from Shared Preferences
+        // If one of the sorting prefererences has never been set or is set to an invalid value,
+        // stick to the defaults.
         SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_sort),
                 Context.MODE_PRIVATE);
-        try {
-            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
-            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
-        } catch (IllegalArgumentException | NullPointerException ignored) {
+
+        String orderString = sortPref.getString(getString(R.string.sharedpreference_sort_order), null);
+        String orderDirectionString = sortPref.getString(getString(R.string.sharedpreference_sort_direction), null);
+
+        if (orderString != null && orderDirectionString != null) {
+            try {
+                mOrder = DBHelper.LoyaltyCardOrder.valueOf(orderString);
+                mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
+            } catch (IllegalArgumentException ignored) {
+            }
         }
 
         mGroup = null;
@@ -520,38 +521,41 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         // Check if an image was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (receivedType.startsWith("image/")) {
-                BarcodeValues barcodeValues;
-                try {
-                    Bitmap bitmap;
-                    try {
-                        Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                        bitmap = Utils.retrieveImageFromUri(this, data);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Error getting data from image file");
-                        e.printStackTrace();
-                        Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-
-                    barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-                    if (barcodeValues.isEmpty()) {
-                        Log.i(TAG, "No barcode found in image file");
-                        Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-                } catch (NullPointerException e) {
-                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                    finish();
-                    return;
-                }
-                processBarcodeValues(barcodeValues, null);
-            } else {
+            if (!receivedType.startsWith("image/")) {
                 Log.e(TAG, "Wrong mime-type");
+                return;
             }
+
+            BarcodeValues barcodeValues;
+            Bitmap bitmap;
+
+            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            if (data == null) {
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            try {
+                bitmap = Utils.retrieveImageFromUri(this, data);
+            } catch (IOException e) {
+                Log.e(TAG, "Error getting data from image file");
+                e.printStackTrace();
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
+
+            if (barcodeValues.isEmpty()) {
+                Log.i(TAG, "No barcode found in image file");
+                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            processBarcodeValues(barcodeValues, null);
         }
     }
 
@@ -755,83 +759,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         updateLoyaltyCardList(false);
     }
 
-    @Override
-    public boolean onDown(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean onSingleTapUp(MotionEvent e) {
-        return false;
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        mGestureDetector.onTouchEvent(ev);
-        return super.dispatchTouchEvent(ev);
-    }
-
-    @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        Log.d(TAG, "On fling");
-
-        // Don't swipe if we have too much vertical movement
-        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
-            return false;
-        }
-
-        if (groupsTabLayout.getTabCount() < 2) {
-            return false;
-        }
-
-        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
-        Log.d("onFling", "Current Tab " + currentTab);
-        // Swipe right
-        if (velocityX < -150) {
-            Log.d("onFling", "Right Swipe detected " + velocityX);
-            Integer nextTab = currentTab + 1;
-
-            if (nextTab == groupsTabLayout.getTabCount()) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        // Swipe left
-        if (velocityX > 150) {
-            Log.d("onFling", "Left Swipe detected " + velocityX);
-            Integer nextTab = currentTab - 1;
-
-            if (nextTab < 0) {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(groupsTabLayout.getTabCount() - 1));
-            } else {
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     @Override
     public void onRowLongClicked(int inputPosition) {
         enableActionMode(inputPosition);

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

@@ -21,7 +21,6 @@ import android.widget.Toast;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
 import androidx.core.content.ContextCompat;
@@ -194,27 +193,22 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues;
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        try {
-            barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-        } catch (NullPointerException e) {
-            Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+        if (barcodeValues.isEmpty()) {
             return;
         }
 
-        if (!barcodeValues.isEmpty()) {
-            Intent manualResult = new Intent();
-            Bundle manualResultBundle = new Bundle();
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
-            if (addGroup != null) {
-                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
-            }
-            manualResult.putExtras(manualResultBundle);
-            ScanActivity.this.setResult(RESULT_OK, manualResult);
-            finish();
+        Intent manualResult = new Intent();
+        Bundle manualResultBundle = new Bundle();
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+        if (addGroup != null) {
+            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
         }
+        manualResult.putExtras(manualResultBundle);
+        ScanActivity.this.setResult(RESULT_OK, manualResult);
+        finish();
     }
 
     public void addManually(View view) {
@@ -251,7 +245,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedClickableArea.setOnClickListener(show ? v -> {
             navigateToSystemPermissionSetting();
         } : null);
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(R.attr.colorSurface) : Color.TRANSPARENT);
+        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
         customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(show ? View.VISIBLE : View.GONE);
     }
 

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

@@ -53,8 +53,8 @@ public class UCropWrapper extends UCropActivity {
                         AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
                         // everything gathered and are as expected, now perform color patching
                         Utils.patchColors(this);
-                        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-                        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+                        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+                        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
 
                         Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
                         controlsBackgroundImageDrawable.mutate();

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

@@ -15,10 +15,12 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.LocaleList;
 import android.provider.MediaStore;
-import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.RawRes;
@@ -46,7 +48,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
@@ -114,6 +115,17 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
+    /**
+     * 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.
+     *
+     * @param requestCode
+     * @param resultCode
+     * @param intent
+     * @param context
+     * @return BarcodeValues
+     */
     static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
@@ -125,9 +137,15 @@ public class Utils {
         if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
             Log.i(TAG, "Received image file with possible barcode");
 
+            Uri data = intent.getData();
+            if (data == null) {
+                Log.e(TAG, "Intent did not contain any data");
+                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                return new BarcodeValues(null, null);
+            }
+
             Bitmap bitmap;
             try {
-                Uri data = intent.getData();
                 bitmap = retrieveImageFromUri(context, data);
             } catch (IOException e) {
                 Log.e(TAG, "Error getting data from image file");
@@ -557,7 +575,7 @@ public class Utils {
             return fallback;
         }
 
-        return new Palette.Builder(image).generate().getDominantColor(R.attr.colorPrimary);
+        return new Palette.Builder(image).generate().getDominantColor(androidx.appcompat.R.attr.colorPrimary);
     }
 
     public static int getRandomHeaderColor(Context context) {
@@ -584,4 +602,39 @@ public class Utils {
 
         return result.toString();
     }
+
+    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        Bitmap icon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        if (icon != null) {
+            Log.d("onResume", "setting icon image");
+            textWhenNoImage.setVisibility(View.GONE);
+
+            backgroundOrIcon.setImageBitmap(icon);
+            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
+        } else {
+            textWhenNoImage.setVisibility(View.VISIBLE);
+
+            int headerColor = loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
+
+            backgroundOrIcon.setImageBitmap(null);
+            backgroundOrIcon.setBackgroundColor(headerColor);
+            textWhenNoImage.setText(loyaltyCard.store);
+            textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+        }
+    }
+
+    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;
+        }
+    }
 }

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

@@ -8,22 +8,14 @@ public class CSVHelpers {
     /**
      * Extract a string from the items array. The index into the array
      * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
+     * "key" as the key. If no such key exists, defaultValue is returned.
      */
-    static String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException {
-        String toReturn = defaultValue;
-
+    static String extractString(String key, CSVRecord record, String defaultValue) {
         if (record.isMapped(key)) {
-            toReturn = record.get(key);
-        } else {
-            if (defaultValue == null) {
-                throw new FormatException("Field not used but expected: " + key);
-            }
+            return record.get(key);
         }
 
-        return toReturn;
+        return defaultValue;
     }
 
     /**
@@ -32,15 +24,15 @@ public class CSVHelpers {
      * "key" as the key. If no such key exists, or the data is not a valid
      * int, a FormatException is thrown.
      */
-    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+    static Integer extractInt(String key, CSVRecord record)
             throws FormatException {
-        if (record.isMapped(key) == false) {
+        if (!record.isMapped(key)) {
             throw new FormatException("Field not used but expected: " + key);
         }
 
         String value = record.get(key);
-        if (value.isEmpty() && nullIsOk) {
-            return null;
+        if (value.isEmpty()) {
+            throw new FormatException("Field is empty: " + key);
         }
 
         try {
@@ -56,15 +48,15 @@ public class CSVHelpers {
      * "key" as the key. If no such key exists, or the data is not a valid
      * int, a FormatException is thrown.
      */
-    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
+    static Long extractLong(String key, CSVRecord record)
             throws FormatException {
-        if (record.isMapped(key) == false) {
+        if (!record.isMapped(key)) {
             throw new FormatException("Field not used but expected: " + key);
         }
 
         String value = record.get(key);
-        if (value.isEmpty() && nullIsOk) {
-            return null;
+        if (value.isEmpty()) {
+            throw new FormatException("Field is empty: " + key);
         }
 
         try {

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

@@ -77,7 +77,7 @@ public class CatimaImporter implements Importer {
         int version = parseVersion(bufferedReader);
         switch (version) {
             case 1:
-                parseV1(context, database, bufferedReader);
+                parseV1(database, bufferedReader);
                 break;
             case 2:
                 parseV2(context, database, bufferedReader);
@@ -87,12 +87,12 @@ public class CatimaImporter implements Importer {
         }
     }
 
-    public void parseV1(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+    public void parseV1(SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
         final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());
 
         try {
             for (CSVRecord record : parser) {
-                importLoyaltyCard(context, database, record);
+                importLoyaltyCard(database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -214,7 +214,7 @@ public class CatimaImporter implements Importer {
         }
 
         for (CSVRecord record : records) {
-            importLoyaltyCard(context, database, record);
+            importLoyaltyCard(database, record);
         }
     }
 
@@ -276,9 +276,9 @@ public class CatimaImporter implements Importer {
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
-            throws IOException, FormatException {
-        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record);
 
         String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
         if (store.isEmpty()) {
@@ -286,25 +286,38 @@ public class CatimaImporter implements Importer {
         }
 
         String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
+
         Date validFrom = null;
+        Long validFromLong;
         try {
-            validFrom = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.VALID_FROM, record, true));
-        } catch (NullPointerException | FormatException e) {
+            validFromLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.VALID_FROM, record);
+        } catch (FormatException ignored) {
+            validFromLong = null;
+        }
+        if (validFromLong != null) {
+            validFrom = new Date(validFromLong);
         }
 
         Date expiry = null;
+        Long expiryLong;
         try {
-            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
-        } catch (NullPointerException | FormatException e) {
+            expiryLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record);
+        } catch (FormatException ignored) {
+            expiryLong = null;
+        }
+        if (expiryLong != null) {
+            expiry = new Date(expiryLong);
         }
 
-        BigDecimal balance;
-        try {
-            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
-        } catch (FormatException _e) {
-            // These fields did not exist in versions 1.8.1 and before
-            // We catch this exception so we can still import old backups
-            balance = new BigDecimal("0");
+        // These fields did not exist in versions 1.8.1 and before
+        // We default to 0 so we can still import old backups
+        BigDecimal balance = new BigDecimal("0");
+        String balanceString = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null);
+        if (balanceString != null) {
+            try {
+                balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
+            } catch (NumberFormatException ignored) {
+            }
         }
 
         Currency balanceType = null;
@@ -330,14 +343,14 @@ public class CatimaImporter implements Importer {
         }
 
         Integer headerColor = null;
-
-        if (record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)) {
-            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+        try {
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
+        } catch (FormatException ignored) {
         }
 
         int starStatus = 0;
         try {
-            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 0.28 and before
             // We catch this exception so we can still import old backups
@@ -346,7 +359,7 @@ public class CatimaImporter implements Importer {
 
         int archiveStatus = 0;
         try {
-            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record, false);
+            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 2.16.3 and before
             // We catch this exception so we can still import old backups
@@ -355,7 +368,7 @@ public class CatimaImporter implements Importer {
 
         Long lastUsed = 0L;
         try {
-            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
+            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record);
         } catch (FormatException _e) {
             // This field did not exist in versions 2.5.0 and before
             // We catch this exception so we can still import old backups
@@ -371,6 +384,10 @@ public class CatimaImporter implements Importer {
     private void importGroup(SQLiteDatabase database, CSVRecord record) throws FormatException {
         String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
 
+        if (id == null) {
+            throw new FormatException("Group has no ID: " + record);
+        }
+
         DBHelper.insertGroup(database, id);
     }
 
@@ -379,9 +396,13 @@ public class CatimaImporter implements Importer {
      * session.
      */
     private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
-        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        int cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record);
         String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
 
+        if (groupId == null) {
+            throw new FormatException("Group has no ID: " + record);
+        }
+
         List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
         cardGroups.add(DBHelper.getGroup(database, groupId));
         DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);

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

@@ -74,29 +74,31 @@ public class StocardImporter implements Importer {
             String fileName = localFileHeader.getFileName();
             String[] nameParts = fileName.split("/");
 
+            if (nameParts.length < 2) {
+                continue;
+            }
+
             if (providersFileName == null) {
                 providersFileName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
-                        "analytics-properties.json"
+                        nameParts[1],
+                        "analytics-properties",
+                        "content.json"
                 };
                 customProvidersBaseName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
+                        nameParts[1],
                         "loyalty-card-custom-providers"
                 };
                 cardBaseName = new String[]{
-                        nameParts[0],
-                        "sync",
-                        "data",
+                        "extracts",
+                        nameParts[1],
                         "users",
-                        nameParts[0],
+                        nameParts[1],
                         "loyalty-cards"
                 };
             }
@@ -106,18 +108,15 @@ public class StocardImporter implements Importer {
                 customProviderId = nameParts[customProvidersBaseName.length].split("\\.", 2)[0];
 
                 // Name file
-                if (nameParts.length == customProvidersBaseName.length + 1) {
-                    // Ignore the .txt file
-                    if (fileName.endsWith(".json")) {
-                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                if (fileName.endsWith(customProviderId + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        providers = appendToHashMap(
-                                providers,
-                                customProviderId,
-                                "name",
-                                jsonObject.getString("name")
-                        );
-                    }
+                    providers = appendToHashMap(
+                            providers,
+                            customProviderId,
+                            "name",
+                            jsonObject.getString("name")
+                    );
                 } else if (fileName.endsWith("logo.png")) {
                     providers = appendToHashMap(
                             providers,
@@ -133,46 +132,43 @@ public class StocardImporter implements Importer {
                 cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
 
                 // This is the card itself
-                if (nameParts.length == cardBaseName.length + 1) {
-                    // Ignore the .txt file
-                    if (fileName.endsWith(".json")) {
-                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                if (fileName.endsWith(cardName + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        loyaltyCardHashMap = appendToHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "cardId",
-                                jsonObject.getString("input_id")
-                        );
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "cardId",
+                            jsonObject.getString("input_id")
+                    );
 
-                        // Provider ID can be either custom or not, extract whatever version is relevant
-                        String customProviderPrefix = "/users/" + nameParts[0] + "/loyalty-card-custom-providers/";
-                        String providerId = jsonObject
-                                .getJSONObject("input_provider_reference")
-                                .getString("identifier");
-                        if (providerId.startsWith(customProviderPrefix)) {
-                            providerId = providerId.substring(customProviderPrefix.length());
-                        } else {
-                            providerId = providerId.substring("/loyalty-card-providers/".length());
-                        }
-
-                        loyaltyCardHashMap = appendToHashMap(
-                                loyaltyCardHashMap,
-                                cardName,
-                                "_providerId",
-                                providerId
-                        );
-
-                        if (jsonObject.has("input_barcode_format")) {
-                            loyaltyCardHashMap = appendToHashMap(
-                                    loyaltyCardHashMap,
-                                    cardName,
-                                    "barcodeType",
-                                    jsonObject.getString("input_barcode_format")
-                            );
-                        }
+                    // Provider ID can be either custom or not, extract whatever version is relevant
+                    String customProviderPrefix = "/users/" + nameParts[1] + "/loyalty-card-custom-providers/";
+                    String providerId = jsonObject
+                            .getJSONObject("input_provider_reference")
+                            .getString("identifier");
+                    if (providerId.startsWith(customProviderPrefix)) {
+                        providerId = providerId.substring(customProviderPrefix.length());
+                    } else {
+                        providerId = providerId.substring("/loyalty-card-providers/".length());
                     }
-                } else if (fileName.endsWith("notes/default.json")) {
+
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "_providerId",
+                            providerId
+                    );
+
+                    if (jsonObject.has("input_barcode_format")) {
+                        loyaltyCardHashMap = appendToHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "barcodeType",
+                                jsonObject.getString("input_barcode_format")
+                        );
+                    }
+                } else if (fileName.endsWith("notes/default/content.json")) {
                     loyaltyCardHashMap = appendToHashMap(
                             loyaltyCardHashMap,
                             cardName,

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -63,30 +63,6 @@ public class Settings {
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public double getFontSizeScale() {
-        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
-    }
-
-    public int getSmallFont() {
-        return 14;
-    }
-
-    public int getMediumFont() {
-        return 28;
-    }
-
-    public int getLargeFont() {
-        return 40;
-    }
-
-    public int getFontSizeMin(int fontSize) {
-        return (int) (Math.round(fontSize / 2.0) - 1);
-    }
-
-    public int getFontSizeMax(int fontSize) {
-        return (int) Math.round(fontSize * getFontSizeScale());
-    }
-
     public boolean useMaxBrightnessDisplayingBarcode() {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" android:useLevel="true"
-    android:dither="true">
-
-    <size android:height="12dip" android:width="12dip"/>
-
-    <solid android:color="@android:color/white"/>
-</shape>

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

@@ -0,0 +1,24 @@
+<layer-list xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/m3_popupmenu_overlay_color"
+                tools:ignore="PrivateResource" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    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.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    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/inactive_dot.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" android:useLevel="true"
-    android:dither="true">
-
-    <size android:height="8dip" android:width="8dip"/>
-
-    <solid android:color="@android:color/white"/>
-</shape>

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

@@ -271,6 +271,36 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/donate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/donate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/donate"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/rate"
                 android:layout_width="match_parent"

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

@@ -9,8 +9,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/icon_layout"
@@ -19,12 +18,11 @@
             android:outlineProvider="none"
             app:cardCornerRadius="8dp"
             app:strokeWidth="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/store"
+            app:layout_constraintBottom_toTopOf="@+id/note"
             app:layout_constraintDimensionRatio="85.6f:53.98f"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
-                android:importantForAccessibility="no"
                 android:id="@+id/thumbnail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -36,6 +34,20 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/thumbnail_text"
+                android:importantForAccessibility="no"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:textStyle="bold"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="12sp"
+                app:autoSizeMaxTextSize="100sp"
+                app:autoSizeStepGranularity="2sp"
+                android:gravity="center"
+                android:maxLines="1"
+                android:layout_margin="20dp" />
+
             <ImageView
                 android:importantForAccessibility="no"
                 android:id="@+id/selected_thumbnail"
@@ -117,20 +129,6 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <TextView
-            android:id="@+id/store"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp"
-            android:textAppearance="?attr/textAppearanceHeadline1"
-            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
-            app:layout_constraintBottom_toTopOf="@+id/note"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="Example store"/>
-
         <TextView
             android:id="@+id/note"
             android:layout_width="match_parent"
@@ -142,7 +140,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:visibility="gone"
             tools:visibility="visible"
-            app:layout_constraintTop_toBottomOf="@+id/store"
+            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
             app:layout_constraintBottom_toTopOf="@+id/info_divider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -6,215 +6,196 @@
     android:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:fitsSystemWindows="true">
-
+    android:fitsSystemWindows="false">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:fitsSystemWindows="true"
-        android:weightSum="1.0">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_landscape"
-            android:layout_width="fill_parent"
-            android:layout_height="?actionBarSize"
-            android:background="@android:color/transparent"
-            android:fitsSystemWindows="false"
-            android:paddingTop="0dp"
-            android:visibility="gone"
-            app:contentInsetStart="72.0dip"
-            app:layout_collapseMode="pin" />
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingToolbarLayout"
-            android:layout_width="fill_parent"
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginBottom="100dp"
+        android:orientation="vertical"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp">
+
+        <LinearLayout
+            android:id="@+id/icon_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:minHeight="56.0dip"
-            app:contentScrim="?colorPrimary"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginEnd="64dp"
-            app:expandedTitleMarginStart="48dp">
+            android:layout_marginBottom="20dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/storeName"
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="0dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/icon_holder"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:cardCornerRadius="8dp"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="85.6f:53.98f">
+
+                    <ImageView
+                        android:id="@+id/icon_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+
+                    <TextView
+                        android:id="@+id/icon_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textStyle="bold"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMinTextSize="12sp"
+                        app:autoSizeMaxTextSize="100sp"
+                        app:autoSizeStepGranularity="2sp"
+                        android:gravity="center"
+                        android:maxLines="1"
+                        android:layout_margin="20dp" />
+                </com.google.android.material.card.MaterialCardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <Space
+                android:layout_width="50dp"
+                android:layout_height="0dp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp">
+
+            <!-- We don't use these buttons for Talkback -->
+            <ImageButton
+                android:importantForAccessibility="no"
+                android:id="@+id/main_left_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/ic_baseline_chevron_left_24"
+                android:background="@android:color/transparent"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/card_holder"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:cardCornerRadius="8dp"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="4dp"
+                        android:orientation="vertical">
+
+                            <ImageView
+                                android:id="@+id/main_image"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"/>
+
+                            <TextView
+                                android:id="@+id/card_id_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:textSize="@dimen/text_size_large"
+                                android:gravity="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <!-- We don't use these buttons for Talkback -->
+            <ImageButton
+                android:importantForAccessibility="no"
+                android:id="@+id/main_right_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                app:srcCompat="@drawable/ic_baseline_chevron_right_24"
+                android:background="@android:color/transparent"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/fullscreen_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:importantForAccessibility="no"
+            android:id="@+id/fullscreen_image"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/scaler_guideline"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/scaler_guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.5"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/fullscreen_button_minimize"
+            android:layout_marginBottom="50dp"
+            android:layout_marginStart="15.0dip"
+            android:layout_marginEnd="15.0dip">
+
+            <TextView
+                android:importantForAccessibility="no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/height"/>
+
+            <SeekBar
+                android:id="@+id/barcode_scaler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginTop="?actionBarSize"
-                android:layout_marginBottom="?actionBarSize"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAlignment="center"
-                android:textColor="@android:color/white"
-                android:textSize="40sp"
-                app:layout_collapseMode="parallax" />
+                android:contentDescription="@string/setBarcodeHeight"
+                android:max="100" />
+        </LinearLayout>
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@id/toolbar"
-                android:layout_width="fill_parent"
-                android:layout_height="?actionBarSize"
-                android:background="@android:color/transparent"
-                app:contentInsetStart="72.0dip"
-                app:layout_collapseMode="pin" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <ImageView
-        android:id="@+id/icon_image"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_alignParentTop="true"
-        android:fitsSystemWindows="true"
-        android:scaleType="centerCrop"
-        app:srcCompat="@drawable/ic_launcher_foreground"
-        tools:ignore="ContentDescription" />
-
-    <FrameLayout
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/mainLayout"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/centerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5"/>
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/scalerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.75"/>
-
-            <ImageButton
-                android:id="@+id/maximizeButton"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:background="?attr/colorPrimary"
-                android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible" />
-
-            <ImageView
-                android:id="@+id/mainImage"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
-
-            <ImageButton
-                android:id="@+id/minimizeButton"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:background="?attr/colorPrimary"
-                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                android:padding="0dp"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/mainImage"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible" />
-
-            <LinearLayout
-                android:id="@+id/dotIndicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="15.0dip"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
-                tools:visibility="visible" />
-
-            <SeekBar
-                android:id="@+id/barcodeScaler"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/inputPadding"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:contentDescription="@string/set_scale"
-                android:max="100"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline" />
-
-            <TextView
-                android:id="@+id/cardIdView"
-                android:enabled="true"
-                android:textIsSelectable="true"
-                android:focusable="true"
-                android:longClickable="true"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginLeft="10.0dip"
-                android:layout_marginRight="10.0dip"
-                android:paddingBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:textAlignment="center"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
-                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
-                android:ellipsize="end"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:id="@+id/drop_shadow_actionbar"
-            android:layout_width="fill_parent"
-            android:layout_height="5.0dip"
-            android:layout_gravity="top"/>
-    </FrameLayout>
+        <ImageButton
+            android:id="@+id/fullscreen_button_minimize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_baseline_expand_more_24"
+            android:tooltipText="@string/moveDown"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="50dp"
+            android:background="@android:color/transparent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_app_bar"
@@ -230,7 +211,7 @@
         app:fabAlignmentMode="center">
 
         <ImageButton
-            android:id="@+id/button_previous"
+            android:id="@+id/bottom_app_bar_previous_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="left"
@@ -242,7 +223,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_show_info"
+            android:id="@+id/bottom_app_bar_info_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="start"
@@ -254,7 +235,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_next"
+            android:id="@+id/bottom_app_bar_next_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="right"
@@ -266,7 +247,7 @@
             android:visibility="gone" />
 
         <ImageButton
-            android:id="@+id/button_update_balance"
+            android:id="@+id/bottom_app_bar_update_balance_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="end"

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />

app/src/main/res/menu/card_view_menu.xml

@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/action_share"
-        android:icon="@drawable/ic_share_white"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_star_unstar"
-        android:icon="@drawable/ic_unstarred_white"
+        android:icon="@drawable/ic_unstarred"
         android:title="@string/star"
         app:showAsAction="always" />
 

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

@@ -16,8 +16,8 @@ Gediminas Murauskas
 Petr Novák
 Joel A
 Taco
-pfaffenrodt
 laralem
+pfaffenrodt
 Nyatsuki
 gallegonovato
 HudobniVolk
@@ -30,10 +30,12 @@ huuhaa
 Quentin PAGÈS
 Alexander Ivanov
 arshbeerSingh
+Denis Shilin
 Freddo espresso
+Projjal Moitra
 Silvério Santos
 Miha Frangež
-Arnis Jaundzeikars
+Arnis Jaundžeikars
 Kefir2105
 sr093906
 Giovanni Donisi
@@ -44,10 +46,11 @@ Magnitudee
 Olivia (Zoe)
 betsythefc
 waffshappen
+(Cliff Heraldo)
 Robin
 Eric
 ati3
-(Cliff Heraldo)
+Balázs Meskó
 Evgeniy Khramov
 Jane Kong
 Jiri Grönroos
@@ -78,7 +81,7 @@ francescbassas
 Jean-Luc Tibaux
 Jesse Davids
 Lukas Grassauer
-bittin
+Luna Jernberg
 Marnick L'Eau
 Michalis
 Michał
@@ -101,12 +104,15 @@ ce i moa
 inesre
 lgasp
 phlostically
+pokeghost
 sal0max
 Ágata Leuck
 BmBKun
 Aditya Das
+asier123123131
 Kevin Sicong Jiang
 Tomer Ben-Rachel
+Tom Sawyer
 tfuxu
 Ahmed Saleh
 Airat
@@ -115,13 +121,13 @@ sNiXx
 Angela Enogieru
 AnimeshChatterjee1
 Ashish Yadav
-Asier
 Aya Elsaadany
 Biren
 Booc Sylvan
 Brage Nesteby Reitan
+Cap Amr Karam
+Carlo Maria Cuoghi Barbagli
 CherryMonster222
-Colgrave
 Csaba
 Mylou53
 danieluhrinyi
@@ -129,6 +135,7 @@ Kasina Dheeraj
 Donno
 Flav
 Franciszek Stefan
+Gael Caraballo
 Grzegorz
 gneiss15
 Hamustra Scans
@@ -136,10 +143,9 @@ HowITsDone
 Izzy
 Jacek
 Jacopo Gennaro Esposito
-Jasielprogramador
 Jean Mareilles
 Jean-Baptiste
-人工知能
+Kung-chih
 Karvjorm
 krkk
 Laura Ferraz 
@@ -151,10 +157,12 @@ Mattia
 Md. Al-Amin
 Michael Gangolf
 3DN1M
+Mobashir Raihan
 Moi Toi
 DivideEtImpera
 Nicolas
 Nosnahc
+pa4k
 pbeckmann
 Peer Beckmann
 Piotr Strebski
@@ -171,20 +179,23 @@ Samarth Asthan
 Shailendra Maurya
 Simone Dotto
 Subhashish Anand
-TenTraicion
+Subhradeep Bera
+SziaTomi
+Mehedi Hasan
 Titas Pažereckas
-Tom Sawyer
 atakujonc
 Tony C
 Tymofii Lytvynenko
 Vancha March
 Yevgeny M
 Yusril A
+ahmed-awad26
 Avik Kundu
 diksha-2911
 gbonaspetti
 gittyboy-cell
 huang ivan
+liva
 lucafont2
 mtrmirez
 opsik
@@ -199,6 +210,7 @@ Truestorybaby
 tygyh
 unstartdev
 wmilan 17
+يوسف لطفي
 luoyang3
 JaeBeom An
 JungHee Lee

app/src/main/res/raw/readme.md

@@ -2,6 +2,18 @@
 
 stocard_stores.csv was created by extracting /data/data/de.stocard/de.stocard.stocard/databases/stores on a rooted devices and running the following command over it:
 
-    sqlite3 -header -csv stores "select _id,name,barcodeFormat from stores" > stocard_stores.csv
+```
+sqlite3 -header -csv sync_db "select id,content from synced_resources where collection = '/loyalty-card-providers/'" > stocard_providers.csv
+while IFS= read -r line; do
+  if [ "$line" = "id,content" ]; then
+    echo "_id,name,barcodeFormat" > stocard_stores.csv
+  else
+    id="$(echo "$line" | cut -d ',' -f1)"
+    name="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .name)"
+    barcodeFormat="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .default_barcode_format)"
+    echo "$id,\"$name\",$barcodeFormat" >> stocard_stores.csv
+  fi
+done < stocard_providers.csv
+```
 
 Only used for data portability reasons (ensuring importing works). Do NOT copy this anywhere else or use it for any purpose other than ensuring we can import a GDPR-provided export. We want to make sure this stays under fair use.

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

@@ -93,7 +93,7 @@
     <string name="importFidme">الاستيراد من FidMe</string>
     <string name="importFidmeMessage">حدد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد ، ثم حدد أنواع الباركود يدويًا بعد ذلك.
 \nقم بإنشائه من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
-    <string name="importStocardMessage">حدد ملفك <i>***-sync.zip</i> تصدير من Stocard للاستيراد.
+    <string name="importStocardMessage">حدد ملفك <i>***.zip</i> تصدير من Stocard للاستيراد.
 \nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
     <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
     <string name="importVoucherVaultMessage">حدد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.
@@ -290,4 +290,11 @@
     <string name="noCameraPermissionDirectToSystemSetting">لمسح الباركود، ستحتاج Catima إلى الوصول إلى الكاميرا. اضغط هنا لتغيير إعدادات الأذونات.</string>
     <string name="updateBalance">تحديث الرصيد</string>
     <string name="updateBalanceHint">أدخل المبلغ</string>
+    <string name="storageReadPermissionRequired">الصلاحيه للوصل للتخزين مطلوبة لهذا الاجراء</string>
+    <string name="validFromDate">عربيه</string>
+    <string name="cameraPermissionRequired">إذن للوصول إلى الكاميرا اللازمة لهذا الإجراء…</string>
+    <string name="anyDate">أي تاريخ</string>
+    <string name="chooseValidFromDate">اختر صالح من التاريخ</string>
+    <string name="validFromSentence">صالح من:<xliff:g>%s</xliff:g></string>
+    <string name="height">الطول:</string>
 </resources>

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

@@ -71,13 +71,13 @@
     <string name="moveBarcodeToCenterOfScreen">Премества щрихкода в центъра на екрана</string>
     <string name="moveBarcodeToTopOfScreen">Премества щрихкода най-горе на екрана</string>
     <string name="never">Не изтича</string>
-    <string name="chooseExpiryDate">Дата на изтичане</string>
-    <string name="expiryDate">Валидност</string>
+    <string name="chooseExpiryDate">Определена дата</string>
+    <string name="expiryDate">Валидна до</string>
     <string name="editBarcode">Редактиране на щрихкод</string>
     <string name="barcode">Щрихкод</string>
     <string name="card">Карта</string>
     <string name="groupsList">Списъци: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Валидност: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Валидна до: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
@@ -152,7 +152,7 @@
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
 \nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard.
+    <string name="importStocardMessage">Изберете файла <i>***.zip</i>, предварително изнесен от Stocard.
 \nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
@@ -267,5 +267,14 @@
     <string name="validFromDate">Валидна от</string>
     <string name="anyDate">Без значение от датата</string>
     <string name="validFromSentence">Валидна от: <xliff:g>%s</xliff:g></string>
-    <string name="chooseValidFromDate">Изберете датата, от която е валидна</string>
+    <string name="chooseValidFromDate">Определена дата</string>
+    <string name="height">Височина:</string>
+    <string name="switchToFrontImage">Показване на предната страна</string>
+    <string name="switchToBackImage">Показване на задната страна</string>
+    <string name="switchToBarcode">Показване на щрихкода</string>
+    <string name="openImageInGallery">Отваряне на изображението в приложението галерия</string>
+    <string name="openFrontImageInGalleryApp">Отваряне на изображението на предната страна в приложението галерия</string>
+    <string name="openBackImageInGalleryApp">Отваряне на изображението на задната страна в приложението галерия</string>
+    <string name="setBarcodeHeight">Задаване на височина на щрихкода</string>
+    <string name="donate">Даряване</string>
 </resources>

app/src/main/res/values-bn-rIN/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="save">সংরক্ষণ</string>
     <string name="cancel">বাতিল</string>
     <string name="unstar">তারা মুক্ত</string>
@@ -8,18 +8,18 @@
     <string name="barcodeType">বারকোড ধরন</string>
     <string name="note">বিঃদ্রঃ</string>
     <string name="storeName">দোকানের নাম</string>
-    <string name="noMatchingGiftCards">কোন ম্যাচিং উপহার কার্ড নেই</string>
-    <string name="noGiftCards">উপহার কার্ড নেই</string>
+    <string name="noMatchingGiftCards">কোনো ফলাফল পাওয়া যায়নি। অনুসন্ধানের বাক্যটি বদলে দেখুন।</string>
+    <string name="noGiftCards">প্লাস বোতামটি টিপে একটি কার্ড যোগ করুন বা ⋮ মেনু থেকে কিছু নিয়ে আসুন।</string>
     <string name="action_add">কর্ম যোগ</string>
     <string name="all">সব</string>
-    <string name="noGroupCards">গোষ্ঠী কার্ড নেই</string>
-    <string name="noGroups">গোষ্ঠীগুলি নেই</string>
+    <string name="noGroupCards">এই গ্রুপটি খালি</string>
+    <string name="noGroups">+ যোগ বোতামটি টিপে গ্রুপ যোগ করুন যাতে তাদের শ্রেণীকরণ করা যায়।</string>
     <string name="groups">গোষ্ঠীগুলি</string>
     <string name="enter_group_name">গোষ্ঠী নাম লিখুন </string>
-    <string name="exportSuccessful">রপ্তানি সফল</string>
-    <string name="importSuccessful">আগম সফল</string>
+    <string name="exportSuccessful">তথ্য রপ্তানি করা শেষ</string>
+    <string name="importSuccessful">তথ্য আনা শেষ</string>
     <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</string>
-    <string name="settings_disable_lockscreen_while_viewing_card"> কার্ড দেখা কালিন লকস্ক্রিন নিষ্ক্রিয়</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">স্ক্রীন লক হতে দেবেন না</string>
     <string name="settings_keep_screen_on">সেটিংস পর্দা খোলা রাখুন</string>
     <string name="settings_max_font_size_scale">সর্বোচ্চ হরফ আকার</string>
     <string name="settings_light_theme">সাদাটে থিম</string>
@@ -32,11 +32,11 @@
     <string name="importStocard">স্টো কার্ড আমদানি করুন</string>
     <string name="importVoucherVault">আমদানি ভাউচার ভল্ট</string>
     <string name="barcodeId">বারকোড আইডি</string>
-    <string name="sameAsCardId">কার্ড আইডির মতো</string>
+    <string name="sameAsCardId">আইডি আর এটা এক</string>
     <string name="setBarcodeId">বারকোড আইডি সেট করুন</string>
-    <string name="unsupportedBarcodeType">অসমর্থিত বারকোড টাইপ</string>
+    <string name="unsupportedBarcodeType">এই বারকোডের টাইপটি এখন দেখানো যাচ্ছে না। অ্যাপের পরের সংস্করণে হয়ত এটি সমর্থন করা যেতে পারে।</string>
     <string name="wrongValueForBarcodeType">বারকোড টাইপের জন্য ভুল মান</string>
-    <string name="copy_to_clipboard_multiple_toast">ক্লিপবোর্ড একাধিক টোস্টে অনুলিপি করুন</string>
+    <string name="copy_to_clipboard_multiple_toast">আইডিগুলি ক্লিপবোর্ডে কপি হল</string>
     <string name="intent_import_card_from_url_share_multiple_text">url থেকে ইন্টেন্ট ইম্পোর্ট কার্ড একাধিক টেক্সট শেয়ার করে</string>
     <string name="frontImageDescription">সামনের চিত্র</string>
     <string name="backImageDescription">পিছনের চিত্র</string>
@@ -45,12 +45,12 @@
     <string name="setBackImage">পিছনের ছবি স্থাপন</string>
     <string name="removeImage">ছবি অপসারণ</string>
     <string name="takePhoto">ছবি নেত্তয়া</string>
-    <string name="updateBarcodeQuestionTitle">হালনাগাদ বারকোড প্রশ্ন শিরোনাম</string>
-    <string name="updateBarcodeQuestionText">হালনাগাদ বারকোড প্রশ্ন টেক্সট </string>
+    <string name="updateBarcodeQuestionTitle">বারকোডের মানটি আপডেট করবেন\?</string>
+    <string name="updateBarcodeQuestionText">আপনি আইডিটি পাল্টেছেন, এটির কোনো বারকোড দিয়ে কি এখনের বারকোডটি আপডেট করে দেবেন\?</string>
     <string name="yes">হাঁ</string>
     <string name="no">না</string>
     <string name="passwordRequired">পাসওয়ার্ড প্রয়োজন</string>
-    <string name="failedGeneratingShareURL">শেয়ার ইউআরএল তৈরি করতে ব্যর্থ হয়েছে</string>
+    <string name="failedGeneratingShareURL">শেয়ার করার ইউআরএল তৈরি করা গেল না। অনুগ্রহ করে এটিকে রিপোর্ট করে দিন।</string>
     <string name="turn_flashlight_on">টর্চলাইট চালু করুন</string>
     <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
     <string name="settings_locale">লোকেল</string>
@@ -65,11 +65,11 @@
     <string name="settings_green_theme">সবুজ থিম</string>
     <string name="settings_brown_theme">বাদামী থিম</string>
     <string name="sort">সাজান</string>
-    <string name="swipeToSwitchImages">ছবি পরিবর্তন করতে সোয়াইপ করুন</string>
+    <string name="swipeToSwitchImages">ছবি পাল্টানোর জন্য সোয়াইপ করুন, ছবিটি গ্যালারি অ্যাপে খোলার জন্য টিপে ধড়ে থাকুন</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="reverse">...উল্টো ক্রমে</string>
     <string name="sort_by">ক্রমানুসার</string>
     <string name="noCardExistsError">কার্ডটি পাওয়া যায়নি</string>
     <string name="noStoreError">স্টোরেজ ত্রুটি নেই</string>
@@ -80,7 +80,7 @@
     <string name="sendLabel">পাঠান…</string>
     <string name="share">ভাগ</string>
     <string name="copy_to_clipboard">নকল করুন ক্লিপবোর্ড এ</string>
-    <string name="deleteConfirmation">নিশ্চিতকরণ মুছে দিন</string>
+    <string name="deleteConfirmation">এই কার্ডটি চিরকালের জন্য মুছে দেবো\?</string>
     <string name="confirm">নিশ্চিত করুন</string>
     <string name="delete">মুছে ফেলুন</string>
     <string name="edit">সম্পাদনা</string>
@@ -92,13 +92,180 @@
     <string name="deleteTitle">কার্ড ডিলিট করুন</string>
     <string name="ok">ঠিক আছে</string>
     <string name="about">সম্পর্কিত</string>
-    <string name="debug_version_fmt">সংস্করণ:
-\n<xliff:g id="version">
-\n%s</xliff:g></string>
+    <string name="debug_version_fmt">সংস্করণ: <xliff:g id="version">%s</xliff:g></string>
     <string name="importOptionApplicationButton">অন্য অ্যাপ ব্যাবহার করুন</string>
     <string name="moveUp">উপরে উঠান</string>
     <string name="moveDown">নিচে নামান</string>
     <string name="barcode">বারকোড</string>
     <string name="expiryDate">মেয়াদোত্তীর্ণ তারিখ</string>
     <string name="noBarcodeFound">কোনো বারকোড পাওয়া যায়নি</string>
+    <string name="cameraPermissionRequired">এই কাজটির জন্য ক্যামেরা ব্যবহার করার অনুমতি লাগবে…</string>
+    <string name="noCameraPermissionDirectToSystemSetting">বারকোড স্ক্যান করার জন্য, কাটিমাকে ফোনের ক্যামেরা ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
+    <string name="importOptionApplicationExplanation">আপনার প্রিয় ফাইল ম্যানেজার বা আর যেকোনো অ্যাপ দিয়ে একটি ফাইল খুলুন।</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © ২০১৯-<xliff:g>%d</xliff:g> সিলভিয়া ভান অস</string>
+    <string name="app_license">কপিলেফ্ট করা মুক্ত সফটওয়্যার, জিপিএলের ৩য় এবং তার অধিক সংস্করণে লাইসেন্স করা</string>
+    <string name="enterBarcodeInstructions">আইডিটি লিখুন আর নয় নিচ থেকে একটি বারকোডের প্রকার বা \"কোনো বারকোড নেই\", নির্বাচন করুন।</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
+        <item quantity="other">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> একটি নির্বাচিত</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> টি নির্বাচিত</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
+        <item quantity="other"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
+    </plurals>
+    <string name="cameraPermissionDeniedTitle">ফোনের ক্যামেরা ব্যবহার করা যাচ্ছে না</string>
+    <string name="importOptionFilesystemExplanation">ফোনের স্টোরেজ থেকে নির্দিষ্ট একটি ফাইল আনুন।</string>
+    <string name="app_libraries">মুক্ত লাইব্রেরি যেগুলি আমার নয়: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>টির ব্যাপারে</string>
+    <string name="app_revision_fmt">সংশোধন তথ্য: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_resources">মুক্ত সম্পদ যেগুলি আমার নয়: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="thumbnailDescription">থাম্বনেইল</string>
+    <string name="settings_card_orientation">বারকোড অভিমুখ</string>
+    <string name="settings_follow_system_orientation">সিস্টেমের অনুসারে</string>
+    <string name="settings_portrait_orientation">প্রতিকৃতি</string>
+    <string name="barcodeImageDescriptionWithType">ছবি <xliff:g>%s</xliff:g> বারকোড</string>
+    <string name="exportName">রপ্তানি</string>
+    <string name="failedParsingImportUriError">আমদানির ইউআরআই বোঝা যাচ্ছে না</string>
+    <string name="importExport">আমদানি/রপ্তানি</string>
+    <string name="cardShortcut">কার্ড শর্টকাট</string>
+    <string name="exportFailed">বার করা যাচ্ছে না</string>
+    <string name="copy_to_clipboard_toast">আইডি ক্লিপবোর্ডে নকল করা হল</string>
+    <string name="noCardIdError">কোনো আইডি দওয়া হয়নি</string>
+    <string name="importExportHelp">নিজের তথ্য অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ফোনে আবার নিয়ে নাওয়া যাই।</string>
+    <string name="importFailed">আনা যাচ্ছে না</string>
+    <string name="noGiftCardsGroup">কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন।</string>
+    <string name="scanCardBarcode">বারকোড স্ক্যান করুন</string>
+    <string name="importSuccessfulTitle">আনা শেষ</string>
+    <string name="importFailedTitle">আনা ব্যর্থ</string>
+    <string name="exportSuccessfulTitle">বার করা শেষ</string>
+    <string name="exportFailedTitle">বার করা ব্যর্থ</string>
+    <string name="importing">আনা হচ্ছে…</string>
+    <string name="exporting">বার করা হচ্ছে…</string>
+    <string name="storageReadPermissionRequired">এই কাজটির জন্য ফোনের স্টোরেজ দেখার অনুমতি লাগবে…</string>
+    <string name="exportOptionExplanation">তথ্যটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
+    <string name="importOptionFilesystemTitle">ফোনের স্টোরেজ থেকে আনুন</string>
+    <string name="importOptionFilesystemButton">ফোনের স্টোরেজ থেকে</string>
+    <string name="importOptionApplicationTitle">অন্য অ্যাপ ব্যবহার করুন</string>
+    <string name="app_copyright_old">লয়ালটি কার্ড কিচ্যেনের উপর ভিত্তি করে
+\nমেধাস্বত্ব © ২০১৬-২০২০ ব্রানডেন আর্চার</string>
+    <string name="selectBarcodeTitle">বারকোড নির্বাচন করুন</string>
+    <string name="settings">সেটিংস</string>
+    <string name="settings_dark_theme">অন্ধকার</string>
+    <string name="settings_landscape_orientation">অনুভূমিক</string>
+    <string name="settings_lock_on_opening_orientation">কার্ড খোলার সময় যে অভিমুখ থাকে সেটিতে লক করে দেবেন</string>
+    <string name="group_name_already_in_use">গ্রুপটির নাম আগে একবার ব্যবহার করে ফেলেছেন</string>
+    <string name="group_edit">গ্রুপ সম্পাদনা করুন</string>
+    <string name="group_updated">গ্রুপটি আপডেট করা হল</string>
+    <string name="group_name_is_empty">গ্রুপের একটি নাম থাকতে হবে</string>
+    <string name="deleteConfirmationGroup">গ্রুপটি মুছে দেবেন\?</string>
+    <string name="failedOpeningFileManager">প্রথমে একটি ফাইল ম্যানেজার ইনস্টল করুন।</string>
+    <string name="leaveWithoutSaveConfirmation">সংরক্ষণ না করেই চলে যাবেন\?</string>
+    <string name="addManually">নিজে হাতে আইডি লিখুন</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="leaveWithoutSaveTitle">প্রস্থান</string>
+    <string name="settings_display_barcode_max_brightness">বারকোড উজ্জ্বল করুন</string>
+    <string name="editGroup">যেই গ্রুপ সম্পাদনা করা হচ্ছে: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">মেয়াদ শেষ হয়ে গিয়েছে: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">বারকোড সম্পাদন করুন</string>
+    <string name="never">কখনই না</string>
+    <string name="addFromImage">গ্যালারি থেকে ছবি বাছুন</string>
+    <string name="groupsList">গ্রুপগুলি: <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="expiryStateSentence">মেয়াদ শেষ হবে: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">ব্যালেন্স: <xliff:g>%s</xliff:g></string>
+    <string name="chooseExpiryDate">মেয়াদ শেষ হওয়ার তারিখ মনোনীত করুন</string>
+    <string name="moveBarcodeToTopOfScreen">বারকোডটি স্ক্রিনের উপরে উঠিয়ে দিন</string>
+    <string name="moveBarcodeToCenterOfScreen">বারকোডটি স্ক্রিনের কেন্দ্রে সরিয়ে দিন</string>
+    <string name="errorReadingImage">ছবিটি স্ক্যান করা যাচ্ছে না</string>
+    <string name="privacy_policy_popup_text">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি নোটিশ (কিছু অ্যাপ স্টোরের এটি লাগে):
+\n
+\nকোন তথ্য একেবারেই সংগ্রহ করা হয় না, যা যে কেউ নিশ্চিত করতে পারবেন কারন আমাদের অ্যাপ মুক্ত সফটওয়্যার।</string>
+    <string name="balance">ব্যালান্স</string>
+    <string name="points">পয়েন্ট</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> কোনো বৈধ ব্যালান্স মনে হচ্ছে না।</string>
+    <string name="chooseImportType">এখান থেকে তথ্য আমদানি করুন</string>
+    <string name="app_loyalty_card_keychain">আনুগত্য কার্ড কীচেন</string>
+    <string name="privacy_policy">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি</string>
+    <string name="accept">গ্রহণ</string>
+    <string name="failedToRetrieveImageFile">ছবি ফাইল পুনরুদ্ধার করতে ব্যর্থ হয়েছে</string>
+    <string name="on_github">GitHub -এ</string>
+    <string name="importLoyaltyCardKeychainMessage">আমদানি করতে লয়্যালটি কার্ড কীচেন থেকে আপনার <i>LoyaltyCardKeychain.csv</i> এক্সপোর্ট নির্বাচন করুন।
+\nলয়্যালটি কার্ড কীচেনের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
+    <string name="selectColor">রঙ নির্বাচন করুন</string>
+    <string name="unarchived">কার্ড সংরক্ষণাগারমুক্ত করা হয়েছে</string>
+    <string name="archiveList">সংরক্ষণাগার</string>
+    <string name="report_error">ভুল প্রতিবেদন</string>
+    <string name="failedLaunchingPhotoPicker">একটি সমর্থিত গ্যালারি অ্যাপ খুঁজে পাওয়া যায়নি</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> cards (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
+    </plurals>
+    <string name="nextCard">পরবর্তী</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ড)</item>
+        <item quantity="other">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ডগুলি)</item>
+    </plurals>
+    <string name="failedToOpenUrl">প্রথমে একটি ওয়েব ব্রাউজার ইন্সটল করুন</string>
+    <string name="newBalanceSentence">নতুন ব্যালেন্স: <xliff:g>%s</xliff:g></string>
+    <string name="chooseValidFromDate">তারিখ থেকে বৈধ নির্বাচন করুন</string>
+    <string name="validFromSentence">এর থেকে বৈধ: <xliff:g>%s</xliff:g></string>
+    <string name="version_history">সংস্করণ ইতিহাস</string>
+    <string name="credits">ক্রেডিট</string>
+    <string name="help_translate_this_app">এই অ্যাপটি অনুবাদ করতে সাহায্য করুন</string>
+    <string name="showMoreInfo">তথ্য দেখান</string>
+    <string name="app_contributors">এর দ্বারা সম্ভব হয়েছে: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="hideMoreInfo">তথ্য লুকান</string>
+    <string name="importCards">কার্ড আমদানি করুন</string>
+    <string name="sort_by_balance">ব্যালান্স</string>
+    <string name="importFidmeMessage">FidMe থেকে আমদানি করতে আপনার <i>fidme-export-request-xxxxxx.zip</i> রপ্তানি নির্বাচন করুন এবং পরে বারকোডের ধরন ম্যানুয়ালি নির্বাচন করুন।
+\nআপনার FidMe প্রোফাইল থেকে ডেটা সুরক্ষা নির্বাচন করে এবং তারপর প্রথমে আমার ডেটা বের করুন টিপে এটি তৈরি করুন।</string>
+    <string name="importCatimaMessage">ক্যাটিমা থেকে আমদানি করতে আপনার <i>catima.zip</i> রপ্তানি নির্বাচন করুন।
+\nঅন্য Catima অ্যাপের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
+    <string name="importStocardMessage">আমদানি করতে Stocard থেকে আপনার <i>***.zip</i> এক্সপোর্ট নির্বাচন করুন।
+\nআপনার ডেটা রপ্তানির জন্য জিজ্ঞাসা করে support@stocardapp.com ই-মেইল করে এটি পান।</string>
+    <string name="importVoucherVaultMessage">আমদানি করতে ভাউচার ভল্ট থেকে আপনার <i>vouchervault.json</i> এক্সপোর্ট নির্বাচন করুন।
+\nপ্রথমে ভাউচার ভল্টে এক্সপোর্ট টিপে এটি তৈরি করুন।</string>
+    <string name="settings_oled_dark">অন্ধকার থিমের জন্য খাঁটি কালো পটভূমি</string>
+    <string name="setIcon">আইকন সেট করুন</string>
+    <string name="settings_grey_theme">ধূসর</string>
+    <string name="updateBalance">ব্যালেন্স আপডেট করুন</string>
+    <string name="barcodeLongPressMessage">গ্যালারি অ্যাপে শুধুমাত্র ছবি খোলা যাবে</string>
+    <string name="translate_platform">Weblate-এ</string>
+    <string name="on_google_play">Google Play-তে</string>
+    <string name="action_show_details">বিস্তারিত দেখাও</string>
+    <string name="action_hide_details">আড়াল বিস্তারিত</string>
+    <string name="shortcutSelectCard">একটি কার্ড নির্বাচন করুন</string>
+    <string name="options">অপশন</string>
+    <string name="starred">তারকাচিহ্নিত</string>
+    <string name="set_scale">স্কেল সেট করুন</string>
+    <string name="duplicateCard">নকল</string>
+    <string name="include_if_asking_support">আপনি যদি সমর্থনের জন্য অনুরোধ করতে চান তবে নিম্নলিখিত তথ্যগুলি অন্তর্ভুক্ত করুন:</string>
+    <string name="importFidme">FidMe থেকে আমদানি করুন</string>
+    <string name="validFromDate">বৈধ হবে</string>
+    <string name="anyDate">যেকোনো তারিখ</string>
+    <string name="previousCard">আগে</string>
+    <string name="exportPassword">আপনার রপ্তানি রক্ষা করার জন্য একটি পাসওয়ার্ড সেট করুন (ঐচ্ছিক)</string>
+    <string name="exportPasswordHint">পাসওয়ার্ড লিখুন</string>
+    <string name="license">লাইসেন্স</string>
+    <string name="source_repository">Source Repository</string>
+    <string name="and_data_usage">এবং ডেটা ব্যবহার</string>
+    <string name="rate_this_app">এই অ্যাপ্লিকেশন রেট করুন</string>
+    <string name="archive">সংরক্ষণ করুন</string>
+    <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
+    <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
+    <string name="noUnarchivedCardsMessage">আর্কাইভ করা কোনো কার্ড নেই</string>
+    <string name="welcome">Catima-তে স্বাগতম</string>
+    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
+    <string name="updateBalanceHint">পরিমান লিখুন</string>
+    <string name="currentBalanceSentence">বর্তমান ব্যালেন্স: <xliff:g>%s</xliff:g></string>
 </resources>

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

@@ -52,4 +52,5 @@
         <item quantity="other"><xliff:g>%d</xliff:g> কার্ডগুলো মুছুন</item>
     </plurals>
     <string name="deleteTitle">কার্ড মুছুন</string>
-</resources>
+    <string name="noGiftCards">একটি কার্ড যোগ করতে + প্লাস বোতামে ক্লিক করুন বা ⋮ মেনু থেকে আমদানি করুন।</string>
+</resources>

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

@@ -13,4 +13,5 @@
     <string name="deleteTitle">Elimina la targeta</string>
     <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>
 </resources>

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

@@ -135,7 +135,7 @@
     <string name="importVoucherVaultMessage">Vyberte k importu svůj <i>vouchervault.json</i> exportovaný z Voucher Vault.
 \nVytvoříte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
-    <string name="importStocardMessage">Vyberte k importu svůj <i>***-sync.zip</i> exportovaný z aplikace Stocard.
+    <string name="importStocardMessage">Vyberte k importu svůj <i>***.zip</i> exportovaný z aplikace Stocard.
 \nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
     <string name="importStocard">Import ze Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Vyberte k importu <i>LoyaltyCardKeychain.csv</i> exportovaný z Loyalty Card Keychain.
@@ -275,4 +275,13 @@
     <string name="anyDate">Jakékoliv datum</string>
     <string name="chooseValidFromDate">Vyberte datum počátku platnosti</string>
     <string name="validFromSentence">Platnost od: <xliff:g>%s</xliff:g></string>
+    <string name="height">Výška:</string>
+    <string name="switchToFrontImage">Přepnout na přední obrázek</string>
+    <string name="switchToBackImage">Přepnout na zadní obrázek</string>
+    <string name="switchToBarcode">Přepnout na čárový kód</string>
+    <string name="openFrontImageInGalleryApp">Otevřít přední obrázek v galerii</string>
+    <string name="openImageInGallery">Otevřít obrázek v galerii</string>
+    <string name="openBackImageInGalleryApp">Otevřít zadní obrázek v galerii</string>
+    <string name="setBarcodeHeight">Nastavit výšku čárového kódu</string>
+    <string name="donate">Přispět</string>
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="frontImageDescription">Bild auf der Vorseite</string>
     <string name="backImageDescription">Bild auf der Rückseite</string>
     <string name="passwordRequired">Bitte gib das Passwort ein</string>
-    <string name="importStocardMessage">Wähle deinen <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
+    <string name="importStocardMessage">Wähle deinen <i>***.zip</i>-Export aus Stocard zum Importieren aus.
 \nSie erhalten ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bitten.</string>
     <string name="importStocard">Von Stocard importieren</string>
     <string name="turn_flashlight_off">Licht ausschalten</string>

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

@@ -140,7 +140,7 @@
     </plurals>
     <string name="importCatimaMessage">Επιλέξτε την <i>catima.zip</i> εξαγωγή από το Catima για εισαγωγή
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής μιας άλλης εφαρμογής Catima κάνοντας εξαγωγή εκεί πρώτα.</string>
-    <string name="importStocardMessage">Επιλέξτε την <i>***-sync.zip</i> εξαγωγή από το Stocard για εισαγωγή.
+    <string name="importStocardMessage">Επιλέξτε την <i>***.zip</i> εξαγωγή από το Stocard για εισαγωγή.
 \nΠάρτε το στέλνοντας email στο: support@stocardapp.com ζητώντας μια εξαγωγή αρχείων των δεδομένων σας.</string>
     <string name="intent_import_card_from_url_share_multiple_text">Θέλω να μοιραστώ μερικές κάρτες μαζί σου</string>
     <string name="editGroup">Επεξεργασία Ομάδας: <xliff:g>%s</xliff:g></string>

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

@@ -108,7 +108,7 @@
 \nCréalo primero desde tu perfil de FidMe eligiendo Protección de datos y pulsa Extraer mis datos.</string>
     <string name="importLoyaltyCardKeychainMessage">Seleccione su <i>LoyaltyCardKeychain.csv</i> exportado desde Loyalty Card Keychain para importarlo.
 \nCréalo primero desde el menú Importar/Exportar en Loyalty Card Keychain pulsando Exportar desde allí.</string>
-    <string name="importStocardMessage">Seleccione su exportación <i>*-sync.zip</i> de Stocard para importarla.
+    <string name="importStocardMessage">Seleccione su exportación <i>*.zip</i> de Stocard para importarla.
 \nConsígalo enviando un correo electrónico a support@stocardapp.com solicitando una exportación de sus datos.</string>
     <string name="importVoucherVaultMessage">Seleccione su <i>vouchervault.json</i> exportado desde Voucher Vault para importarlo.
 \nCréalo pulsando primero Exportar en Voucher Vault.</string>
@@ -275,4 +275,13 @@
     <string name="validFromDate">Válido desde</string>
     <string name="chooseValidFromDate">Elija una fecha válida desde</string>
     <string name="validFromSentence">Válido desde: <xliff:g>%s</xliff:g></string>
+    <string name="height">Altura:</string>
+    <string name="switchToFrontImage">Cambiar a imagen frontal</string>
+    <string name="openFrontImageInGalleryApp">Abrir imagen frontal en la aplicación de la galería</string>
+    <string name="openBackImageInGalleryApp">Abrir imagen trasera en la aplicación de la galería</string>
+    <string name="setBarcodeHeight">Ajustar la altura del código de barras</string>
+    <string name="donate">Donar</string>
+    <string name="switchToBarcode">Cambiar a código de barras</string>
+    <string name="openImageInGallery">Abrir imagen en la aplicación de la galería</string>
+    <string name="switchToBackImage">Cambiar a imagen trasera</string>
 </resources>

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

@@ -163,7 +163,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> valittu</item>
     </plurals>
     <string name="importStocard">Tuo Stocardista</string>
-    <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.
+    <string name="importStocardMessage">Valitse tuotava <i>***.zip</i>-vienti Stocardista.
 \nHanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
     <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
     <string name="failedGeneratingShareURL">Jaettavaa URL-osoitetta ei voitu luoda. Ilmoita tästä.</string>

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

@@ -150,7 +150,7 @@
     <string name="backImageDescription">Image du verso</string>
     <string name="frontImageDescription">Image du recto</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
-    <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
+    <string name="importStocardMessage">Sélectionnez votre exportation <i>***.zip</i> de Stocard pour l’importer.
 \nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
     <string name="importStocard">Importer depuis Stocard</string>
     <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
@@ -275,4 +275,13 @@
     <string name="validFromSentence">Valide à partir de : <xliff:g>%s</xliff:g></string>
     <string name="anyDate">N’importe quelle date</string>
     <string name="chooseValidFromDate">Choisissez la date de début de validité</string>
+    <string name="height">Hauteur :</string>
+    <string name="switchToFrontImage">Passer à l\'image avant</string>
+    <string name="switchToBackImage">Passer à l\'image arrière</string>
+    <string name="switchToBarcode">Passer au code barre</string>
+    <string name="openImageInGallery">Ouvrir l\'image dans l\'application galerie</string>
+    <string name="openFrontImageInGalleryApp">Ouvrir l\'image avant dans l\'application galerie</string>
+    <string name="openBackImageInGalleryApp">Ouvrir l\'image arrière dans l\'application galerie</string>
+    <string name="setBarcodeHeight">Définir la hauteur du code-barres</string>
+    <string name="donate">Faire un don</string>
 </resources>

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

@@ -1,83 +1,287 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="unstar">Ukloni iz favorita</string>
-    <string name="action_search">Pretraživanje</string>
+    <string name="action_search">Pretraži</string>
     <string name="save">Spremi</string>
     <string name="edit">Uredi</string>
     <string name="delete">Ukloni</string>
     <string name="confirm">Potvrdi</string>
-    <string name="deleteTitle">Ukloni kartu</string>
+    <string name="deleteTitle">Izbriši karticu</string>
     <string name="deleteConfirmation">Izbrisati ovu karticu zauvijek\?</string>
     <string name="copy_to_clipboard">Kopiraj ID u međuspremnik</string>
-    <string name="share">Podijeli</string>
-    <string name="sendLabel">Pošalji…</string>
+    <string name="share">Dijeli</string>
+    <string name="sendLabel">Pošalji …</string>
     <string name="editCardTitle">Uredi karticu</string>
-    <string name="addCardTitle">Dodaj Kartu</string>
-    <string name="scanCardBarcode">Skeniranje crtičnog koda kartice</string>
-    <string name="cardShortcut">Oznaka karte</string>
-    <string name="noCardsMessage">Najprije dodajte karticu</string>
-    <string name="card_ids_copied">Kopirani ID kartice</string>
+    <string name="addCardTitle">Dodaj karticu</string>
+    <string name="scanCardBarcode">Snimi crtični kod kartice</string>
+    <string name="cardShortcut">Prečac kartice</string>
+    <string name="noCardsMessage">Najprije dodaj karticu</string>
+    <string name="card_ids_copied">ID oznake su kopirane</string>
     <string name="noBarcode">Nema crtičnog koda</string>
     <string name="star">Dodaj u favorite</string>
     <string name="action_add">Dodaj</string>
     <string name="storeName">Ime</string>
     <string name="note">Napomena</string>
-    <string name="noMatchingGiftCards">Nema rezultata. Pokušajte promijeniti pretraživanje.</string>
+    <string name="noMatchingGiftCards">Nema rezultata. Pokušaj promijeniti pretragu.</string>
     <string name="cardId">ID kartice</string>
     <string name="barcodeType">Vrsta crtičnog koda</string>
-    <string name="barcodeNoBarcode">Na ovoj kartici nema crtičnog koda</string>
-    <string name="cancel">Poništi</string>
-    <string name="noGiftCards">Pritisnite gumb + plus da biste dodali karticu ili ga najprije uvezite iz izbornika ⋮.</string>
-    <string name="noStoreError">Ime nije uneseno</string>
-    <string name="noCardExistsError">Nije moguće pronaći karticu</string>
-    <string name="failedParsingImportUriError">Nije moguće analizirati uvoz URI</string>
-    <string name="importExport">Uvoz / Izvoz</string>
+    <string name="barcodeNoBarcode">Ne postoji crtični kod</string>
+    <string name="cancel">Odustani</string>
+    <string name="noGiftCards">Pritisni gumb + plus za dodavanje kartice ili uvezi putem izbornika ⋮.</string>
+    <string name="noStoreError">Ime nije zadano</string>
+    <string name="noCardExistsError">Nije bilo moguće pronaći tu karticu</string>
+    <string name="failedParsingImportUriError">Nije bilo moguće obraditi URI uvoza</string>
+    <string name="importExport">Uvoz/Izvoz</string>
     <string name="exportName">Izvoz</string>
-    <string name="importExportHelp">Sigurnosno kopiranje kartica omogućuje vam da ih premjestite na drugi uređaj.</string>
+    <string name="importExportHelp">Spremanje sigurnosnih kopija tvojih podataka omogućuje premještanje podataka na jedan drugi uređaj.</string>
     <string name="importSuccessfulTitle">Uvezeno</string>
-    <string name="importFailedTitle">Nije moguće uvesti</string>
-    <string name="importFailed">Nije moguće uvesti karte</string>
+    <string name="importFailedTitle">Neuspio uvoz</string>
+    <string name="importFailed">Nije bilo moguće izvršiti uvoz</string>
     <string name="exportSuccessfulTitle">Izvezeno</string>
-    <string name="about">Oh</string>
-    <string name="importOptionApplicationButton">Koristite drugu aplikaciju</string>
-    <string name="barcode">Barkod</string>
-    <string name="exportOptionExplanation">Podaci će biti zabilježeni na odabranom mjestu.</string>
-    <string name="exportFailedTitle">Izvoz nije uspio</string>
-    <string name="exporting">Opskrba…</string>
-    <string name="importOptionFilesystemExplanation">Odaberite određenu datoteku iz datotečnog sustava.</string>
-    <string name="importOptionApplicationTitle">Koristite drugu aplikaciju</string>
+    <string name="about">Informacije</string>
+    <string name="importOptionApplicationButton">Koristi jednu drugu aplikaciju</string>
+    <string name="barcode">Crtični kod</string>
+    <string name="exportOptionExplanation">Podaci će se zapisati u željeno mjesto.</string>
+    <string name="exportFailedTitle">Neuspio izvoz</string>
+    <string name="exporting">Izvoz …</string>
+    <string name="importOptionFilesystemExplanation">Odaberi određenu datoteku iz datotečnog sustava.</string>
+    <string name="importOptionApplicationTitle">Koristi jednu drugu aplikaciju</string>
     <string name="settings">Postavke</string>
-    <string name="settings_dark_theme">Tamno</string>
-    <string name="exportFailed">Nije moguće izvesti karte</string>
-    <string name="importing">Uvoz…</string>
+    <string name="settings_dark_theme">Tamna</string>
+    <string name="exportFailed">Nije bilo moguće izvršiti izvoz</string>
+    <string name="importing">Uvoz …</string>
     <string name="importOptionFilesystemTitle">Uvoz iz datotečnog sustava</string>
     <string name="importOptionFilesystemButton">Iz datotečnog sustava</string>
-    <string name="importOptionApplicationExplanation">Koristite bilo koju aplikaciju ili omiljeni upravitelj datoteka za otvaranje datoteke.</string>
+    <string name="importOptionApplicationExplanation">Za otvaranje datoteke koristi bilo koju aplikaciju ili tvoj omiljeni upravljač datoteka.</string>
     <string name="settings_theme">Tema</string>
     <string name="settings_system_theme">Sustav</string>
-    <string name="settings_light_theme">Svjetlo</string>
+    <string name="settings_light_theme">Svijetla</string>
     <string name="settings_max_font_size_scale">Maksimalna veličina fonta</string>
-    <string name="settings_display_barcode_max_brightness">Osvijetlite izgled crtičnog koda</string>
-    <string name="moveDown">Pomicanje prema dolje</string>
-    <string name="addManually">Ručno unesite ID kartice</string>
-    <string name="thumbnailDescription">Sličica za karticu</string>
+    <string name="settings_display_barcode_max_brightness">Osvijetli prikaz crtičnog koda</string>
+    <string name="moveDown">Pomakni prema dolje</string>
+    <string name="addManually">Ručno upiši ID</string>
+    <string name="thumbnailDescription">Sličica</string>
     <string name="starImage">Omiljena zvijezda</string>
     <string name="settings_category_title_ui">Korisničko sučelje</string>
-    <string name="exportSuccessful">Izvezeni podaci o karti</string>
-    <string name="settings_keep_screen_on">Držite zaslon uključen</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Spriječiti zaključavanje zaslona</string>
-    <string name="intent_import_card_from_url_share_text">Želim podijeliti razglednicu s vama</string>
-    <string name="importSuccessful">Uvezeni podaci o karti</string>
-    <string name="enter_group_name">Unesite naziv grupe</string>
+    <string name="exportSuccessful">Podaci su izvezeni</string>
+    <string name="settings_keep_screen_on">Ostavi ekran uključen</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
+    <string name="intent_import_card_from_url_share_text">Želim dijeliti karticu s tobom</string>
+    <string name="importSuccessful">Podaci su uvezeni</string>
+    <string name="enter_group_name">Upiši ime grupe</string>
     <string name="groups">Grupe</string>
-    <string name="noGroups">Pritisnite gumb + plus da biste najprije dodali grupe za klasifikaciju.</string>
-    <string name="noGroupCards">Ova grupa ne sadrži nikakve kartice</string>
-    <string name="addFromImage">Odaberite sliku iz galerije</string>
-    <string name="deleteConfirmationGroup">Izbriši grupu\?</string>
-    <string name="failedOpeningFileManager">Najprije instalirajte upravitelj datoteka.</string>
-    <string name="moveUp">Pomicanje gore</string>
-    <string name="leaveWithoutSaveTitle">Izlaz</string>
-    <string name="card">Karta</string>
-    <string name="leaveWithoutSaveConfirmation">Otići bez očuvanja\?</string>
-    <string name="noGiftCardsGroup">Izradite neke kartice, a zatim ih dodijelite grupi ovdje.</string>
+    <string name="noGroups">Pritisni gumb + plus za dodavanje grupe za kategoriziranje.</string>
+    <string name="noGroupCards">Ova je grupa prazna</string>
+    <string name="addFromImage">Odaberi sliku iz galerije</string>
+    <string name="deleteConfirmationGroup">Izbrisati grupu\?</string>
+    <string name="failedOpeningFileManager">Najprije instaliraj upravljač datoteka.</string>
+    <string name="moveUp">Pomakni prema gore</string>
+    <string name="leaveWithoutSaveTitle">Zatvori aplikaciju</string>
+    <string name="card">Kartica</string>
+    <string name="leaveWithoutSaveConfirmation">Zatvoriti aplikaciju bez spremanja\?</string>
+    <string name="noGiftCardsGroup">Stvori neke kartice, a zatim ih ovdje dodijeli grupi.</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kartica</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <string name="importStocardMessage">Odaberi tvoju iz Stocard izvezenu <i>***.zip</i> datoteku koju želiš uvesti.
+\nPošalji e-mail na support@stocardapp.com s molbom za izvoz tvojih podataka.</string>
+    <string name="translate_platform">na platformi Weblate</string>
+    <string name="editGroup">Uređivanje grupe: <xliff:g>%s</xliff:g></string>
+    <string name="editBarcode">Uredi crtični kod</string>
+    <string name="expiryDate">Datum isteka</string>
+    <string name="never">Nikada</string>
+    <string name="accept">Prihvati</string>
+    <string name="importCatima">Uvezi iz Catima</string>
+    <string name="importFidme">Uvezi iz FidMe</string>
+    <string name="importStocard">Uvezi iz Stocard</string>
+    <string name="importLoyaltyCardKeychainMessage">Odaberi tvoju iz LoyaltyCardKeychain izvezenu <i>LoyaltyCardKeychain.csv</i> datoteku koju želiš uvesti.
+\nStvori je putem izbornika „Uvoz/Izvoz” u aplikaciji LoyaltyCardKeychain i tamo najprije pritisni „Izvoz”.</string>
+    <string name="updateBarcodeQuestionText">Promijenio/la si ID. Želiš li također aktualizirati crtični kod da koristi istu vrijednost\?</string>
+    <string name="action_hide_details">Sakrij detalje</string>
+    <string name="importCards">Uvezi kartice</string>
+    <string name="selectColor">Odaberi boju</string>
+    <string name="setIcon">Postavi ikonu</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_green_theme">Zelena</string>
+    <string name="settings_grey_theme">Siva</string>
+    <string name="sort_by_expiry">Istek</string>
+    <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
+    <string name="noCardIdError">ID nije zadan</string>
+    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
+    <string name="frontImageDescription">Prednja slika</string>
+    <string name="exportPasswordHint">Upiši lozinku</string>
+    <string name="turn_flashlight_on">Uključi svjetiljku</string>
+    <string name="failedGeneratingShareURL">Nije bilo moguće generirati URL za dijeljenje. Prijavi ovaj problem.</string>
+    <string name="turn_flashlight_off">Isključi svjetiljku</string>
+    <string name="settings_locale">Jezik</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Ljubičasta</string>
+    <string name="settings_sky_blue_theme">Nebesko plava</string>
+    <string name="sort">Razvrstaj</string>
+    <string name="hideMoreInfo">Sakrij informacije</string>
+    <string name="updateBalance">Aktualiziraj saldo</string>
+    <string name="swipeToSwitchImages">Klizni prstom za mijenjanje slika, pritisni dugo za otvaranje slike u aplikaciji galerije</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by">Redoslijed</string>
+    <string name="version_history">Kronologija verzija</string>
+    <string name="credits">Zasluge</string>
+    <string name="and_data_usage">i korištenje podataka</string>
+    <string name="rate_this_app">Ocijeni ovu aplikaciju</string>
+    <string name="report_error">Prijavi greške</string>
+    <string name="include_if_asking_support">Ako želiš zatražiti podršku, uključi sljedeće informacije:</string>
+    <string name="options">Opcije</string>
+    <string name="starred">Označeno</string>
+    <string name="set_scale">Postavi veličinu</string>
+    <string name="duplicateCard">Dupliciraj</string>
+    <string name="archive">Arhiviraj</string>
+    <string name="archived">Kartica je arhivirana</string>
+    <string name="unarchived">Kartica je dearhivirana</string>
+    <string name="failedLaunchingPhotoPicker">Nije bilo moguće pronaći aplikaciju za galeriju</string>
+    <string name="archiveList">Arhiva</string>
+    <string name="cameraPermissionDeniedTitle">Nije bilo moguće pristupiti kameri</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Za snimanje crtičnih kodova Catima treba pristup tvojoj kameri. Dodirni ovdje za mijenjanje postavki dozvola.</string>
+    <string name="app_libraries">Libre biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Biranje crtičnog koda</string>
+    <string name="copy_to_clipboard_toast">ID je kopiran u međuspremnik</string>
+    <string name="enterBarcodeInstructions">Upiši ID i dolje odaberi vrstu crtičnog koda ili „Ne postoji crtični kod”.</string>
+    <string name="settings_portrait_orientation">Okomito</string>
+    <string name="settings_lock_on_opening_orientation">Zaključaj na položaj koji se koristi prilikom otvaranja kartice</string>
+    <string name="group_edit">Uredi grupu</string>
+    <string name="group_name_already_in_use">Ime grupe se već koristi</string>
+    <string name="noBarcodeFound">Nijedan crtični kod nije pronađen</string>
+    <string name="balance">Saldo</string>
+    <string name="chooseImportType">Uvezi podatke iz</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="parsingBalanceFailed">Čini se da <xliff:g>%s</xliff:g> nije ispravni saldo.</string>
+    <string name="privacy_policy_popup_text">Obavijest o politici privatnosti (obavezna za neke trgovine aplikacija):
+\n
+\nPODACI SE UOPĆE NE PRIKUPLJAJU, što svatko može potvrditi budući da je naša aplikacija libre softver.</string>
+    <string name="importCatimaMessage">Odaberi tvoju iz Catima izvezenu <i>catima.zip</i> datoteku koju želiš uvesti.
+\nStvori je putem izbornika „Uvoz/Izvoz” jedne druge Catima aplikacije i tamo najprije pritisni „Izvoz”.</string>
+    <string name="height">Visina:</string>
+    <string name="switchToFrontImage">Prebaci na prednju sliku</string>
+    <string name="switchToBackImage">Prebaci na stražnju sliku</string>
+    <string name="switchToBarcode">Prebaci na crtični kod</string>
+    <string name="openImageInGallery">Otvori sliku u aplikaciji galerije</string>
+    <string name="openFrontImageInGalleryApp">Otvori prednju sliku u aplikaciji galerije</string>
+    <string name="openBackImageInGalleryApp">Otvori stražnju sliku u aplikaciji galerije</string>
+    <string name="setBarcodeHeight">Postavi visinu crtičnog koda</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> odabrana</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> odabrane</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> odabrano</item>
+    </plurals>
+    <string name="validFromDate">Vrijedi od</string>
+    <string name="chooseValidFromDate">Odaberi datum od kada kartica vrijedi</string>
+    <string name="anyDate">Bilo koji datum</string>
+    <string name="validFromSentence">Vrijedi od: <xliff:g>%s</xliff:g></string>
+    <string name="photos">Slike</string>
+    <string name="ok">U redu</string>
+    <string name="app_copyright_old">Zasnovano na Loyalty Card Keychain
+\nautorsko pravo © 2016. – 2020. Branden Archer</string>
+    <string name="settings_system_locale">Sustav</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> boda</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> bodova</item>
+    </plurals>
+    <string name="donate">Doniraj</string>
+    <string name="storageReadPermissionRequired">Za ovu radnju je potrebna dozvola za čitanje spremljenih podataka …</string>
+    <string name="cameraPermissionRequired">Za ovu radnju je potrebna dozvola za pristup kameri …</string>
+    <string name="app_license">Copylefted libre softver, GPLv3+ licenca</string>
+    <string name="settings_card_orientation">Položaj crtičnog koda</string>
+    <string name="settings_follow_system_orientation">Slijedi sustav</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="importFidmeMessage">Odaberi tvoju iz FidMe izvezenu <i>idme-export-request-xxxxxx.zip</i> datoteku koju želiš uvesti i ručno odaberi vste crtičnog koda nakon toga.
+\nStvori je putem tvog FidMe profila i tamo najprije odaberi „Zaštita podataka” a zatim pritisni „Dekomprimiraj moje podatke”.</string>
+    <string name="importVoucherVaultMessage">Odaberi tvoju iz Voucher Vault izvezenu <i>vouchervault.json</i> datoteku koju želiš uvesti.
+\nStvori je u aplikaciji Voucher Vault i tamo najprije pritisni „Izvoz”.</string>
+    <string name="settings_pink_theme">Ružičasta</string>
+    <string name="settings_blue_theme">Plava</string>
+    <string name="failedToRetrieveImageFile">Neuspjelo dohvaćanje slikovne datoteke</string>
+    <string name="license">Licenca</string>
+    <string name="barcodeLongPressMessage">U aplikaciji galerije se mogu otvoriiti samo slike</string>
+    <string name="source_repository">Izvorni repozitorij</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="on_google_play">na stranici Google Play</string>
+    <string name="unarchive">Dearhiviraj</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> kartice (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirane)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirano)</item>
+    </plurals>
+    <string name="help_translate_this_app">Pomogni prevoditi ovu aplikaciju</string>
+    <string name="welcome">Pozdrav u Catima</string>
+    <string name="currentBalanceSentence">Aktualni saldo: <xliff:g>%s</xliff:g></string>
+    <string name="newBalanceSentence">Novi saldo: <xliff:g>%s</xliff:g></string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Izbriši <xliff:g>%d</xliff:g> karticu</item>
+        <item quantity="few">Izbriši <xliff:g>%d</xliff:g> kartice</item>
+        <item quantity="other">Izbriši <xliff:g>%d</xliff:g> kartica</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Izbrisati ovu <xliff:g>%d</xliff:g> karticu zauvijek\?</item>
+        <item quantity="few">Izbrisati ove <xliff:g>%d</xliff:g> kartice zauvijek\?</item>
+        <item quantity="other">Izbrisati ovih <xliff:g>%d</xliff:g> kartica zauvijek\?</item>
+    </plurals>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019. – <xliff:g>%d.</xliff:g> Sylvia van Os</string>
+    <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informacije revizije: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_resources">Libre resursi trećih strana: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="settings_landscape_orientation">Vodoravno</string>
+    <string name="group_name_is_empty">Ime grupe ne smije biti prazno</string>
+    <string name="group_updated">Grupa je aktualizirana</string>
+    <string name="all">Sve</string>
+    <string name="groupsList">Grupe: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Isteče: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Isteklo: <xliff:g>%s</xliff:g></string>
+    <string name="chooseExpiryDate">Odaberi datum isteka</string>
+    <string name="moveBarcodeToTopOfScreen">Premjesti crtični kod na vrh ekrana</string>
+    <string name="moveBarcodeToCenterOfScreen">Centriraj crtični kod na ekranu</string>
+    <string name="errorReadingImage">Nije bilo moguće učitati sliku</string>
+    <string name="currency">Valuta</string>
+    <string name="points">Bodovi</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="importVoucherVault">Uvezi iz Voucher Vault</string>
+    <string name="barcodeId">Vrijednost crtičnog koda</string>
+    <string name="sameAsCardId">Ista kao ID</string>
+    <string name="setBarcodeId">Postavi vrijednost crtičnog koda</string>
+    <string name="unsupportedBarcodeType">Ova se vrsta crtičnog koda još ne može prikazati. Možda će se podržati u novijoj verziji aplikacije.</string>
+    <string name="wrongValueForBarcodeType">Vrijednost nije valjana za odabranu vrstu crtičnog koda</string>
+    <string name="copy_to_clipboard_multiple_toast">ID oznke su kopirane u međuspremnik</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Želim dijeliti neke kartice s tobom</string>
+    <string name="backImageDescription">Stražnja slika</string>
+    <string name="setFrontImage">Postavi prednju sliku</string>
+    <string name="setBackImage">Postavi stražnju sliku</string>
+    <string name="removeImage">Ukloni sliku</string>
+    <string name="takePhoto">Uslikaj fotografiju</string>
+    <string name="updateBarcodeQuestionTitle">Aktualizirati vrijednost crtičnog koda\?</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="passwordRequired">Upiši lozinku</string>
+    <string name="exportPassword">Postavi lozinku za zaštitu tvog izvoza (opcionalno)</string>
+    <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_brown_theme">Smeđa</string>
+    <string name="app_contributors">Omogućuje: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Prikaži informacije</string>
+    <string name="sort_by_name">Ime</string>
+    <string name="sort_by_most_recently_used">Nedavno korišteno</string>
+    <string name="reverse">… u obrnutom redoslijedu</string>
+    <string name="action_show_details">Prikaži detalje</string>
+    <string name="shortcutSelectCard">Odaberi karticu</string>
+    <string name="noUnarchivedCardsMessage">Ne postoje nearhivirane kartice</string>
+    <string name="previousCard">Prethodna</string>
+    <string name="nextCard">Sljedeća</string>
+    <string name="updateBalanceTitle">Koliko si potrošio/la\?</string>
+    <string name="updateBalanceHint">Upiši iznos</string>
+    <string name="about_title_fmt">Informaije o <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="failedToOpenUrl">Najprije instaliraj web preglednik</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartica)</item>
+        <item quantity="few">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartice)</item>
+        <item quantity="other">Pogledaj arhivu (<xliff:g>%1$d</xliff:g> kartica)</item>
+    </plurals>
 </resources>

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

@@ -4,96 +4,96 @@
     <string name="action_add">Hozzáadás</string>
     <string name="action_search">Keresés</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kiválasztott</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztottak</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kiválasztva</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztva</item>
     </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 eredmény. Próbálja módosítani a keresést.</string>
+    <string name="noMatchingGiftCards">Nincs találaat. 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ártya azonosító</string>
-    <string name="barcodeType">Vonalkód típus</string>
+    <string name="cardId">Kártyaazonosító</string>
+    <string name="barcodeType">Vonalkód típusa</string>
     <string name="barcodeNoBarcode">Nincs vonalkód</string>
     <string name="noBarcode">Nincs vonalkód</string>
-    <string name="star">Kedvencekhez adás</string>
-    <string name="unstar">Kivétel a kedvencek közül</string>
+    <string name="star">Hozzáadás a kedvencekhez</string>
+    <string name="unstar">Eltávolítás a kedvencekből</string>
     <string name="cancel">Mégse</string>
     <string name="save">Mentés</string>
     <string name="edit">Szerkesztés</string>
     <string name="delete">Törlés</string>
-    <string name="confirm">Alkalmaz</string>
+    <string name="confirm">Jóváhagyás</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Törölje az <xliff:g>%d</xliff:g> kártyát</item>
+        <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>
     </plurals>
     <string name="deleteConfirmation">Véglegesen törli a kártyát\?</string>
     <string name="ok">Rendben</string>
-    <string name="copy_to_clipboard">Azonosító másolása a vágólapra</string>
+    <string name="copy_to_clipboard">Azonosító vágólapra másolása</string>
     <string name="share">Megosztás</string>
     <string name="sendLabel">Küldés…</string>
     <string name="editCardTitle">Kártya szerkesztése</string>
     <string name="addCardTitle">Kártya hozzáadása</string>
-    <string name="scanCardBarcode">Vonalkód szkennelése</string>
+    <string name="scanCardBarcode">Vonalkód leolvasása</string>
     <string name="cardShortcut">Kártya parancsikon</string>
     <string name="noStoreError">Nincs név megadva</string>
-    <string name="failedParsingImportUriError">Nem elemezhető az importált URI</string>
-    <string name="importExport">Import/Export</string>
-    <string name="exportName">Export</string>
-    <string name="importExportHelp">Az adataid mentése lehetővé teszi, hogy egy másik eszközre feltöltsd.</string>
+    <string name="failedParsingImportUriError">Az importálási URI nem értelmezhető</string>
+    <string name="importExport">Importálás/exportálás</string>
+    <string name="exportName">Exportálás</string>
+    <string name="importExportHelp">Az adatok mentése lehetővé teszi, hogy egy másik eszközre helyezze át.</string>
     <string name="importSuccessfulTitle">Importálva</string>
-    <string name="importFailedTitle">Importálás meghiúsult</string>
-    <string name="importFailed">Importálás nem hajtható végre</string>
+    <string name="importFailedTitle">Az importálás sikertelen</string>
+    <string name="importFailed">Nem sikerült az importálás végrehajtása</string>
     <string name="exportSuccessfulTitle">Exportálva</string>
-    <string name="exportFailedTitle">Exportálás meghiúsult</string>
+    <string name="exportFailedTitle">Az exportálás sikertelen</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Véglegesen törli a <xliff:g>%d</xliff:g> kártyát\?</item>
-        <item quantity="other">Véglegesen törli a <xliff:g>%d</xliff:g> kártyákat\?</item>
+        <item quantity="one">Véglegesen töröl <xliff:g>%d</xliff:g> kártyát\?</item>
+        <item quantity="other">Véglegesen töröl <xliff:g>%d</xliff:g> kártyát\?</item>
     </plurals>
     <string name="deleteTitle">Kártya törlése</string>
-    <string name="card_ids_copied">Azonosító(k) másolása</string>
-    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> vonalkód képe</string>
+    <string name="card_ids_copied">Azonosító(k) másolva</string>
+    <string name="barcodeImageDescriptionWithType">A(z) <xliff:g>%s</xliff:g> vonalkód képe</string>
     <string name="noCardIdError">Nincs azonosító megadva</string>
-    <string name="noCardExistsError">Kártya nem található</string>
-    <string name="importStocardMessage">Válassza ki a <i>***-sync.zip</i> Stocard exportot.
-\nAdatinak exportját kérheti e-mailben a support@stocardapp.com címre írva.</string>
-    <string name="importVoucherVault">Importálás Voucher Vault-ból</string>
-    <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a vonalkód típushoz</string>
+    <string name="noCardExistsError">A kártya nem található</string>
+    <string name="importStocardMessage">Válassza ki az importálandó <i>***.zip</i> Stocard export fájlt.
+\nAz adatainak exportálását a support@stocardapp.com címre írt levélben kérheti.</string>
+    <string name="importVoucherVault">Importálás a Voucher Vaultból</string>
+    <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a kiválasztott vonalkódtípushoz</string>
     <string name="settings_green_theme">Zöld</string>
     <string name="setBackImage">Hátlapi kép beállítása</string>
     <string name="no">Nem</string>
-    <string name="passwordRequired">Kérem írja be a kódot</string>
+    <string name="passwordRequired">Adja meg a jelszót</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="exportPasswordHint">Kód beírása</string>
-    <string name="failedGeneratingShareURL">Nem lehetett megosztható címet generálni. Kérem jelentse ezt.</string>
+    <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
     <string name="settings_theme_color">Téma színe</string>
     <string name="settings_grey_theme">Szürke</string>
-    <string name="sort">Rendez</string>
-    <string name="on_google_play">Google Play-en</string>
-    <string name="action_show_details">Részletek mutatása</string>
+    <string name="sort">Rendezés</string>
+    <string name="on_google_play">a Google Playen</string>
+    <string name="action_show_details">Részletek megjelenítése</string>
     <string name="action_hide_details">Részletek elrejtése</string>
-    <string name="and_data_usage">és adat használat</string>
-    <string name="translate_platform">Weblate-en</string>
+    <string name="and_data_usage">és adathasználat</string>
+    <string name="translate_platform">a Weblate-en</string>
     <string name="sort_by_name">Név</string>
     <string name="sort_by_most_recently_used">Legutóbb használt</string>
     <string name="sort_by_expiry">Lejárat</string>
-    <string name="rate_this_app">Értékelje az appot</string>
-    <string name="exportFailed">Exportálás sikertelen</string>
+    <string name="rate_this_app">Értékelje az alkalmazást</string>
+    <string name="exportFailed">Nem sikerült az exportálás végrehajtása</string>
     <string name="importing">Importálás…</string>
     <string name="exporting">Exportálás…</string>
-    <string name="exportOptionExplanation">Az adatokat a kiválasztott helyre fogjuk menteni.</string>
+    <string name="exportOptionExplanation">Az adatok a kiválasztott helyre lesznek mentve.</string>
     <string name="importOptionFilesystemTitle">Importálás fájlrendszerből</string>
     <string name="importOptionFilesystemButton">A fájlrendszerből</string>
-    <string name="importOptionApplicationTitle">Másik app használata</string>
-    <string name="importOptionApplicationExplanation">Használjon egy tetszőleges appot, vagy kedvenc fájl menedzserét a fájl megnyitásához.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Szerzői Jog © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_license">Copyleft-elt gáttalan szoftver, GPLv3+ licenszelve</string>
-    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> névjegye</string>
+    <string name="importOptionApplicationTitle">Másik alkalmazás használata</string>
+    <string name="importOptionApplicationExplanation">A fájl megnyitásához használjon egy tetszőleges alkalmazást, vagy a kedvenc fájlkezelőjét.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_license">Copyleft licencű szabad szoftver, GPLv3+ alatt közzétéve</string>
+    <string name="about_title_fmt">A <xliff:g id="app_name">%s</xliff:g> névjegye</string>
     <string name="debug_version_fmt">Verzió: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revíziós információ: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_resources">Gáttalan külsős források: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources">Szabad külső erőforrások: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vonalkód kiválasztása</string>
-    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a \"Nincs vonalkód\" opciót.</string>
+    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a „Nincs vonalkód” lehetőséget.</string>
     <string name="copy_to_clipboard_toast">Azonosító vágólapra másolva</string>
     <string name="starImage">Kedvencek csillag</string>
     <string name="settings">Beállítások</string>
@@ -101,26 +101,26 @@
     <string name="settings_theme">Téma</string>
     <string name="settings_system_theme">Rendszer</string>
     <string name="settings_light_theme">Világos</string>
-    <string name="settings_max_font_size_scale">Max. betű méret</string>
-    <string name="settings_display_barcode_max_brightness">Fényes vonalkód nézet</string>
-    <string name="settings_keep_screen_on">Képernyő bekapcsolva marad</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Képernyő zárólás megakadályozása</string>
+    <string name="settings_max_font_size_scale">Legnagyobb betűméret</string>
+    <string name="settings_display_barcode_max_brightness">Vonalkód nézet világosítása</string>
+    <string name="settings_keep_screen_on">A képernyő bekapcsolva tartása</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Képernyőzárólás megakadályozása</string>
     <string name="intent_import_card_from_url_share_text">Meg akarok veled osztani egy kártyát</string>
-    <string name="importSuccessful">Adat importálva</string>
-    <string name="exportSuccessful">Adat exportálva</string>
+    <string name="importSuccessful">Adatok importálva</string>
+    <string name="exportSuccessful">Adatok exportálva</string>
     <string name="enter_group_name">Adja meg a csoport nevét</string>
     <string name="groups">Csoportok</string>
     <string name="group_edit">Csoport szerkesztése</string>
-    <string name="group_name_is_empty">Csoport név nem lehet üres</string>
-    <string name="failedOpeningFileManager">Telepítsen egy fájl menedzsert.</string>
-    <string name="moveUp">Felfelé mozgatás</string>
-    <string name="moveDown">Lefelé mozgatás</string>
+    <string name="group_name_is_empty">A csoportnév nem lehet üres</string>
+    <string name="failedOpeningFileManager">Előbb telepítsen egy fájlkezelőt.</string>
+    <string name="moveUp">Mozgatás felfelé</string>
+    <string name="moveDown">Mozgatás lefelé</string>
     <string name="leaveWithoutSaveTitle">Kilépés</string>
     <string name="leaveWithoutSaveConfirmation">Kilépés mentés nélkül\?</string>
-    <string name="addManually">Azonosító manuális beírása</string>
+    <string name="addManually">Azonosító kézi beírása</string>
     <string name="addFromImage">Kép kiválasztása a galériából</string>
     <string name="editGroup">Csoportok szerkesztése: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Érvényes: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Lejárat: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="card">Kártya</string>
     <string name="barcode">Vonalkód</string>
@@ -133,25 +133,25 @@
     <string name="noBarcodeFound">Nem található vonalkód</string>
     <string name="errorReadingImage">Nem lehet olvasni a képet</string>
     <string name="balance">Egyenleg</string>
-    <string name="currency">Valuta</string>
+    <string name="currency">Pénznem</string>
     <string name="points">Pontok</string>
-    <string name="parsingBalanceFailed">A <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
-    <string name="app_loyalty_card_keychain">Hűségkártya kulcstartó</string>
-    <string name="privacy_policy">Adatvédelmi Szabályzat</string>
-    <string name="accept">Elfogad</string>
-    <string name="importCatima">Importálás Catimából</string>
-    <string name="importFidme">Importálás FidMe-ből</string>
-    <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychain-ből</string>
-    <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychain-ból importálni kívánt <i>LoyaltyCardKeychain.csv</i> export fájlt.
-\nLétrehozhatja az Import/Export menüből ha a Loyalty Card Keychain-ben rányom az Exportra.</string>
-    <string name="importStocard">Importálás Stocard-ból</string>
-    <string name="importVoucherVaultMessage">Válassza ki a <i>vouchervault.json</i> Voucher Vault exportját.
-\nLétrehozhatja az Export-ra nyomva a Voucher Vault-ban.</string>
-    <string name="barcodeId">Vonalkód érték</string>
+    <string name="parsingBalanceFailed">A(z) <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
+    <string name="app_loyalty_card_keychain">Hűségkártya-kulcstartó</string>
+    <string name="privacy_policy">Adatvédelmi irányelvek</string>
+    <string name="accept">Elfogadás</string>
+    <string name="importCatima">Importálás a Catimából</string>
+    <string name="importFidme">Importálás a FidMeből</string>
+    <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychainből</string>
+    <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychainből importálandó <i>LoyaltyCardKeychain.csv</i> export fájlt.
+\nEzt hozza létre a Loyalty Card Keychainben az Importálás/exportálás menüben, az Exportálás megnyomásával.</string>
+    <string name="importStocard">Importálás a Stocardból</string>
+    <string name="importVoucherVaultMessage">Válassza ki az importálandó <i>vouchervault.json</i> Voucher Vault export fájlt.
+\nEzt hozza létre a Voucher Vaultban az Exportálás megnyomásával.</string>
+    <string name="barcodeId">Vonalkód értéke</string>
     <string name="sameAsCardId">Ugyanaz, mint az azonosító</string>
-    <string name="setBarcodeId">Vonalkód érték beállítása</string>
-    <string name="unsupportedBarcodeType">Ez a vonalkód típus még nem megjeleníthető. Feltehetően támogatva lesz egy későbbi verzióban.</string>
-    <string name="copy_to_clipboard_multiple_toast">Azonosítók a vágólapra másolva</string>
+    <string name="setBarcodeId">Vonalkód értékének beállítása</string>
+    <string name="unsupportedBarcodeType">Ez a vonalkódtípus még nem jeleníthető meg. Lehet, hogy támogatott lesz az alkalmazás egy későbbi verziójában.</string>
+    <string name="copy_to_clipboard_multiple_toast">Az azonosítók a vágólapra másolva</string>
     <string name="intent_import_card_from_url_share_multiple_text">Meg akarok veled osztani pár kártyát</string>
     <string name="frontImageDescription">Előlapi kép</string>
     <string name="backImageDescription">Hátlapi kép</string>
@@ -159,10 +159,10 @@
     <string name="setFrontImage">Előlapi kép beállítása</string>
     <string name="removeImage">Kép eltávolítása</string>
     <string name="takePhoto">Fénykép készítése</string>
-    <string name="updateBarcodeQuestionTitle">Vonalkód érték frissítése\?</string>
-    <string name="updateBarcodeQuestionText">Megváltoztatta az azonosító. Meg akarja ennek megfelelően változtatni a vonalkód értéket is\?</string>
+    <string name="updateBarcodeQuestionTitle">Vonalkódérték frissítése\?</string>
+    <string name="updateBarcodeQuestionText">Megváltoztatta az azonosítót. Ennek megfelelően megváltoztatja a vonalkód értéket is\?</string>
     <string name="yes">Igen</string>
-    <string name="exportPassword">Írjon be egy jelszót az export védelme érdekében (opcionális)</string>
+    <string name="exportPassword">Állítson be egy jelszót az export védelme érdekében (nem kötelező)</string>
     <string name="turn_flashlight_on">Zseblámpa bekapcsolása</string>
     <string name="turn_flashlight_off">Zseblámpa kikapcsolása</string>
     <string name="settings_locale">Nyelv</string>
@@ -170,96 +170,111 @@
     <string name="selectColor">Szín kiválasztása</string>
     <string name="setIcon">Ikon beállítása</string>
     <string name="settings_pink_theme">Rózsaszín</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Ibolyaszínű</string>
+    <string name="settings_magenta_theme">Bíbor</string>
+    <string name="settings_violet_theme">Ibolya</string>
     <string name="settings_blue_theme">Kék</string>
     <string name="settings_sky_blue_theme">Égszínkék</string>
     <string name="settings_brown_theme">Barna</string>
-    <string name="app_contributors">Lehetővé tette: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="showMoreInfo">Infó mutatása</string>
-    <string name="hideMoreInfo">Infó elrejtése</string>
-    <string name="swipeToSwitchImages">Csúsztassa ujját a képek váltásához, tartsa lenyomva a kép megnyitásához a Galéria alkalmazásban</string>
+    <string name="app_contributors">Lehetővé tették: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Információk megjelenítése</string>
+    <string name="hideMoreInfo">Információk elrejtése</string>
+    <string name="swipeToSwitchImages">Legyintsen a képek váltásához, tartsa lenyomva a kép megnyitásához a galéria alkalmazásban</string>
     <string name="sort_by_balance">Egyenleg</string>
-    <string name="reverse">...fordított sorrendben</string>
-    <string name="sort_by">Rendezés mint</string>
-    <string name="version_history">Verzió történet</string>
+    <string name="reverse">…fordított sorrendben</string>
+    <string name="sort_by">Rendezés:</string>
+    <string name="version_history">Verziótörténet</string>
     <string name="credits">Köszönet</string>
-    <string name="help_translate_this_app">Segítsen lefordítani az appot</string>
-    <string name="license">Licensz</string>
-    <string name="source_repository">Forrás repó</string>
-    <string name="on_github">GitBub-on</string>
-    <string name="report_error">Hiba Jelentése</string>
+    <string name="help_translate_this_app">Segítsen lefordítani az alkalmazást</string>
+    <string name="license">Licenc</string>
+    <string name="source_repository">Forráskódtároló</string>
+    <string name="on_github">a GitHubon</string>
+    <string name="report_error">Hiba jelentése</string>
     <string name="shortcutSelectCard">Válasszon egy kártyát</string>
     <string name="options">Beállítások</string>
     <string name="starred">Csillagozva</string>
-    <string name="set_scale">Méret választása</string>
+    <string name="set_scale">Méret beállítása</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kártya</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kártyák</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kártya</item>
     </plurals>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> pont</item>
         <item quantity="other"><xliff:g>%s</xliff:g> pontok</item>
     </plurals>
-    <string name="chooseImportType">Adat importálása innen</string>
+    <string name="chooseImportType">Adatok importálása innen</string>
     <string name="thumbnailDescription">Előkép</string>
     <string name="importOptionFilesystemExplanation">Válassza ki a kívánt fájlt a fájlrendszerből.</string>
-    <string name="importOptionApplicationButton">Másik app használata</string>
+    <string name="importOptionApplicationButton">Másik alkalmazás használata</string>
     <string name="about">Névjegy</string>
     <string name="app_copyright_old">Készült a Loyalty Card Keychain alapján
-\nszerzői jog © 2016–2020 Branden Archer</string>
-    <string name="app_libraries">Gáttalan külsős mappák: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+\nCopyright © 2016–2020 Branden Archer</string>
+    <string name="app_libraries">Szabad külső programkönyvtárak: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="settings_dark_theme">Sötét</string>
     <string name="deleteConfirmationGroup">Csoport törlése\?</string>
     <string name="noGroups">Nyomja meg a + gombot a csoportok kategorizálásához.</string>
-    <string name="group_name_already_in_use">Csoport név már létezik</string>
-    <string name="all">Mind</string>
+    <string name="group_name_already_in_use">A csoportnév már létezik</string>
+    <string name="all">Összes</string>
     <string name="noGroupCards">Ez a csoport üres</string>
     <string name="group_updated">Csoport frissítve</string>
     <string name="expiryStateSentenceExpired">Lejárt: <xliff:g>%s</xliff:g></string>
     <string name="groupsList">Csoportok: <xliff:g>%s</xliff:g></string>
-    <string name="importCatimaMessage">Válassza ki a <i>catima.zip</i>-jét az importáláshoz.
-\nLétrehozhatja az Import/Export menüből az Exportálást megnyomva egy másik Catima appban.</string>
-    <string name="privacy_policy_popup_text">Adatvédelmi szabály értesítő (némely app bolt kéri):
+    <string name="importCatimaMessage">Válassza ki az exportált <i>catima.zip</i> fájlt az importáláshoz.
+\nLétrehozhatja az Importálás/exportálás menüből az Exportálást megnyomva egy másik Catima alkalmazásban.</string>
+    <string name="privacy_policy_popup_text">Adatvédelmi irányelvek nyilatkozata (némely alkalmazásbolt kéri):
 \n
-\nSEMMILYEN ADATGYŰJTÉS NINCS, amit bárki ellenőrizhet, lévén hogy az app gáttalan szoftver.</string>
-    <string name="importFidmeMessage">Válassza ki a <i>fidme-export-request-xxxxxx.zip</i> nevű FidMe exportot, majd importálja be és válassza a manuális vonalkód opciót utána.
-\nEzt a FidMe-ben megtalálja a profiljában az Adat Védelem résznél ha rányom az Adataim Kivonata linkre.</string>
-    <string name="settings_card_orientation">Vonalkód tájolás</string>
+\nSEMMILYEN ADAT NEM KERÜL GYŰJTÉSRE, amit bárki ellenőrizhet, hiszen az alkalmazás szabad szoftver.</string>
+    <string name="importFidmeMessage">Válassza ki a FidMeből exportált <i>fidme-export-request-xxxxxx.zip</i> fájl majd importálja be, és utána válassza a kézi vonalkódbeírást.
+\nEzt hozza létre a FidMe-profiljában az Adatvédelem rész választásával, majd a Saját adatok kinyerése megnyomásával.</string>
+    <string name="settings_card_orientation">Vonalkód tájolása</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> kártyák (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
     </plurals>
     <string name="noUnarchivedCardsMessage">Nincs archiválatlan kártya</string>
-    <string name="failedToOpenUrl">Először telepíts egy webböngészőt</string>
-    <string name="failedLaunchingPhotoPicker">Nem található támogatott képnézegető app</string>
+    <string name="failedToOpenUrl">Először telepítsen egy webböngészőt</string>
+    <string name="failedLaunchingPhotoPicker">Nem található támogatott galéria alkalmazás</string>
     <string name="previousCard">Előző</string>
     <string name="nextCard">Következő</string>
     <string name="settings_portrait_orientation">Álló</string>
     <string name="settings_follow_system_orientation">Rendszer követése</string>
-    <string name="settings_lock_on_opening_orientation">A használt tájolás zárolása kártya használatakor</string>
+    <string name="settings_lock_on_opening_orientation">A használt tájolás zárolása a kártya megnyitásakor</string>
     <string name="settings_landscape_orientation">Fekvő</string>
-    <string name="settings_oled_dark">Tiszta fekete háttér sötét témánál</string>
-    <string name="include_if_asking_support">Ha támogatást szeretnél igénybe venni, oszd meg az alábbi információkat:</string>
-    <string name="archive">Archivál</string>
+    <string name="settings_oled_dark">Teljesen fekete háttér a sötét témánál</string>
+    <string name="include_if_asking_support">Ha támogatás akar kérni, ossza meg az alábbi információkat:</string>
+    <string name="archive">Archiválás</string>
     <string name="unarchive">Archiválás megszüntetése</string>
-    <string name="archived">Kártya archiválása</string>
-    <string name="archiveList">Archivál</string>
-    <string name="duplicateCard">Másolat</string>
+    <string name="archived">Kártya archiválva</string>
+    <string name="archiveList">Archívum</string>
+    <string name="duplicateCard">Klónozás</string>
     <string name="currentBalanceSentence">Jelenlegi egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="updateBalanceHint">Adja meg az összeget</string>
     <string name="importCards">Kártyák importálása</string>
-    <string name="updateBalanceTitle">Mennyit költöttél\?</string>
+    <string name="updateBalanceTitle">Mennyit költött\?</string>
     <string name="newBalanceSentence">Új egyenleg: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Nem sikerült hozzáférni a kamerához</string>
     <string name="failedToRetrieveImageFile">Nem sikerült lekérni a képfájlt</string>
     <string name="barcodeLongPressMessage">Csak képek nyithatók meg a galéria alkalmazásban</string>
-    <string name="unarchived">Archiválatlan kártya</string>
-    <string name="welcome">Üdvözöljük Catimában</string>
+    <string name="unarchived">Kártya archiválása megszüntetve</string>
+    <string name="welcome">Üdvözöljük a Catimában</string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="one">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártya)</item>
-        <item quantity="other">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártyák)</item>
+        <item quantity="other">Archívum megtekintése (<xliff:g>%1$d</xliff:g> kártya)</item>
     </plurals>
     <string name="updateBalance">Egyenleg frissítése</string>
-    <string name="noCameraPermissionDirectToSystemSetting">A vonalkódok beolvasásához a Catimának hozzá kell férnie a kamerához. Koppintson ide az engedélybeállítások módosításához.</string>
+    <string name="noCameraPermissionDirectToSystemSetting">A vonalkódok leolvasásához a Catimának hozzá kell férnie a kamerához. Koppintson ide az engedélybeállítások módosításához.</string>
+    <string name="validFromDate">Érvényesség kezdete</string>
+    <string name="anyDate">Bármely dátum</string>
+    <string name="chooseValidFromDate">Válassza ki az érvényesség kezdetét</string>
+    <string name="validFromSentence">Érvényesség kezdete: <xliff:g>%s</xliff:g></string>
+    <string name="storageReadPermissionRequired">A művelethez tárolóolvasási engedély szükséges…</string>
+    <string name="cameraPermissionRequired">A művelethez a kamera-hozzáférési engedély szükséges…</string>
+    <string name="height">Magasság:</string>
+    <string name="switchToFrontImage">Elölnézeti képre váltás</string>
+    <string name="switchToBackImage">Hátulnézeti képre váltás</string>
+    <string name="switchToBarcode">Vonalkódra váltás</string>
+    <string name="donate">Adományozás</string>
+    <string name="openImageInGallery">Kép megnyitása a galéria alkalmazásban</string>
+    <string name="openBackImageInGalleryApp">Hátulnézeti kép megnyitása a galéria alkalmazásban</string>
+    <string name="openFrontImageInGalleryApp">Elölnézeti kép megnyitása a galéria alkalmazásban</string>
+    <string name="setBarcodeHeight">Vonalkód magasságának megadása</string>
 </resources>

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

@@ -161,7 +161,7 @@
     <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. 
 \nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
     <string name="importStocard">Impor dari Stocard</string>
-    <string name="importStocardMessage">Pilih ekspor <i>***-sync.zip</i> Anda dari Stocard untuk diimpor. 
+    <string name="importStocardMessage">Pilih ekspor <i>***.zip</i> Anda dari Stocard untuk diimpor. 
 \nDapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
     <string name="importVoucherVault">Impor dari Voucher Vault</string>
     <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. 
@@ -263,4 +263,13 @@
 \n<xliff:g>%s</xliff:g></string>
     <string name="anyDate">Kapan pun</string>
     <string name="chooseValidFromDate">Pilih valid dari tanggal</string>
+    <string name="height">Tinggi:</string>
+    <string name="switchToFrontImage">Ubah ke depan gambar</string>
+    <string name="switchToBackImage">Ubah ke belakang gambar</string>
+    <string name="switchToBarcode">Ubah ke kode batang</string>
+    <string name="openImageInGallery">Buka gambar dari galeri app</string>
+    <string name="openFrontImageInGalleryApp">Buka gambar didepan di galeri app</string>
+    <string name="openBackImageInGalleryApp">Buka gambar dibelakang di galeri app</string>
+    <string name="setBarcodeHeight">Atur tinggi kode batang</string>
+    <string name="donate">Donasi</string>
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="backImageDescription">Immagine posteriore</string>
     <string name="frontImageDescription">Immagine frontale</string>
     <string name="passwordRequired">Si prega di inserire la password</string>
-    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***-sync.zip</i> da Stocard per importarlo.
+    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***.zip</i> da Stocard per importarlo.
 \nOttienilo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
     <string name="importStocard">Importa da Stocard</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
@@ -275,4 +275,13 @@
     <string name="chooseValidFromDate">Scegli la data di validità</string>
     <string name="validFromSentence">Valido da: <xliff:g>%s</xliff:g></string>
     <string name="anyDate">Qualsiasi data</string>
+    <string name="height">Altezza:</string>
+    <string name="switchToFrontImage">Passa all\'immagine frontale</string>
+    <string name="switchToBackImage">Passa all\'immagine dietro</string>
+    <string name="switchToBarcode">Passa al codice a barre</string>
+    <string name="openFrontImageInGalleryApp">Apri l\'immagine frontale nell\'app Galleria</string>
+    <string name="donate">Dona</string>
+    <string name="openImageInGallery">Apri l\'immagine nell\'app Galleria</string>
+    <string name="openBackImageInGalleryApp">Apri l\'immagine posteriore nell\'app Galleria</string>
+    <string name="setBarcodeHeight">Imposta l\'altezza del codice a barre</string>
 </resources>

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

@@ -151,7 +151,7 @@
     <string name="photos">フォト</string>
     <string name="backImageDescription">裏</string>
     <string name="frontImageDescription">表</string>
-    <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択してください。
+    <string name="importStocardMessage">Stocardでエクスポートした<i>***.zip</i>ファイルを選択してください。
 \nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
     <string name="importStocard">Stocardからインポート</string>
     <plurals name="selectedCardCount">

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

@@ -75,7 +75,7 @@
     <string name="setBarcodeId">Nustatyti brūkšninio kodo reikšmę</string>
     <string name="sameAsCardId">Tokia pat kaip ID</string>
     <string name="barcodeId">Brūkšninio kodo reikšmė</string>
-    <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
+    <string name="importStocardMessage">Pasirinkite <i>***.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
 \nGaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
     <string name="importStocard">Importuoti iš Stocard</string>
     <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
@@ -271,4 +271,17 @@
     <string name="importCards">Importuoti korteles</string>
     <string name="storageReadPermissionRequired">Šio veiksmo atlikimui reikalinga prieiga prie saugyklos…</string>
     <string name="cameraPermissionRequired">Šio veiksmo atlikimui reikalinga prieiga prie kameros…</string>
+    <string name="openBackImageInGalleryApp">Atidarykite galinį vaizdą galerijos programėlėje</string>
+    <string name="setBarcodeHeight">Nustatyti brūkšninio kodo aukštį</string>
+    <string name="validFromDate">Galioja nuo</string>
+    <string name="anyDate">Bet kuri data</string>
+    <string name="chooseValidFromDate">Pasirinkite datą, galiojančią nuo</string>
+    <string name="validFromSentence">Galioja nuo: <xliff:g>%s</xliff:g></string>
+    <string name="switchToBackImage">Perjungti į galinį vaizdą</string>
+    <string name="switchToBarcode">Perjungti į brūkšninį kodą</string>
+    <string name="openImageInGallery">Atidarykite paveikslėlį galerijos programėlėje</string>
+    <string name="height">Aukštis:</string>
+    <string name="switchToFrontImage">Perjungti į priekinį vaizdą</string>
+    <string name="openFrontImageInGalleryApp">Atidarykite priekinį vaizdą galerijos programėlėje</string>
+    <string name="donate">Aukoti</string>
 </resources>

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

@@ -2,7 +2,7 @@
 <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 dažus no ⋮ izvēlnes.</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="storeName">Nosaukums</string>
     <string name="note">Piezīme</string>
@@ -204,7 +204,7 @@
 \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>***-sync.zip</i> eksporta failu no Stocard.
+    <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.
@@ -256,4 +256,14 @@
     </plurals>
     <string name="failedToOpenUrl">Vispirms nepieciešams uzstādīt interneta pārlūku</string>
     <string name="welcome">Laipni lūgti Catima</string>
-</resources>
+    <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="storageReadPermissionRequired">Atļauja lasīt noliktavu ir nepieciešama šai darbībai…</string>
+    <string name="importCards">Importēt kartes</string>
+</resources>

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

@@ -146,7 +146,7 @@
     <string name="photos">Bilder</string>
     <string name="backImageDescription">Baksidebilde</string>
     <string name="frontImageDescription">Forsidebilde</string>
-    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
+    <string name="importStocardMessage">Velg din <i>***.zip</i>-eksport fra Stocard å importere.
 \nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
     <string name="passwordRequired">Skriv inn passordet</string>
     <string name="importStocard">Importer fra Stocard</string>

app/src/main/res/values-night/themes.xml

@@ -27,10 +27,18 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
 
         <item name="windowActionModeOverlay">true</item>
     </style>
 
+    <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="alertDialogStyle">@style/MaterialAlertDialog.Material3</item>
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="android:background">@drawable/dialog_bg_monet</item>
+    </style>
+
     <!-- note that this is not used directly, these are used to patch the active theme runtime with
     theme.applyStyle
     -->

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

@@ -149,7 +149,7 @@
     <string name="backImageDescription">Achterzijde van kaart</string>
     <string name="frontImageDescription">Voorzijde van kaart</string>
     <string name="passwordRequired">Voer het wachtwoord in</string>
-    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i>.
+    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***.zip</i>.
 \nStuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
     <string name="importStocard">Importeren uit Stocard</string>
     <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
@@ -268,4 +268,13 @@
     <string name="validFromDate">Geldig vanaf</string>
     <string name="validFromSentence">Geldig vanaf: <xliff:g>%s</xliff:g></string>
     <string name="chooseValidFromDate">Kies een geldige vanaf-datum</string>
+    <string name="setBarcodeHeight">Barcodehoogte instellen</string>
+    <string name="height">Hoogte:</string>
+    <string name="switchToFrontImage">Voorzijde tonen</string>
+    <string name="switchToBackImage">Achterzijde tonen</string>
+    <string name="switchToBarcode">Barcode tonen</string>
+    <string name="openImageInGallery">Afbeelding openen in galerij-app</string>
+    <string name="openFrontImageInGalleryApp">Voorzijde openen in galerij-app</string>
+    <string name="openBackImageInGalleryApp">Achterzijde openen in galerij-app</string>
+    <string name="donate">Doneren</string>
 </resources>

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

@@ -51,7 +51,7 @@
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interfàcia utilizaire</string>
     <string name="settings_theme">Tèma</string>
-    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o utilizatz lo menú ⋮ per n’importar una.</string>
+    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o n’importar una menú ⋮</string>
     <string name="noMatchingGiftCards">Cap de resultat. Ensajatz de modificar vòstra recèrca.</string>
     <string name="settings_light_theme">Clar</string>
     <string name="settings_dark_theme">Escur</string>
@@ -66,4 +66,5 @@
     <string name="settings_max_font_size_scale">Talha max. de la poliça</string>
     <string name="settings_theme_color">Color del tèma</string>
     <string name="settings_locale">Lenga</string>
+    <string name="noGiftCardsGroup">Creatz de cartas puèi ligatz-las al grop aicí.</string>
 </resources>

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

@@ -115,7 +115,7 @@
     <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
 \nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
     <string name="importVoucherVault">Importuj z Voucher Vault</string>
-    <string name="importStocardMessage">Wybierz swój <i>***-sync.zip</i> z Stocard, aby zaimportować.
+    <string name="importStocardMessage">Wybierz swój <i>***.zip</i> z Stocard, aby zaimportować.
 \nUzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
     <string name="importStocard">Importuj z Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.

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

@@ -97,7 +97,7 @@
     <string name="sameAsCardId">Igual ao identificador</string>
     <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
 \nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
+    <string name="importStocardMessage">Selecione a exportação <i>***.zip</i> do Stocard para importar.
 \nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
     <string name="barcodeId">Valor do código de barras</string>
     <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>

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

@@ -94,9 +94,9 @@
     <string name="moveBarcodeToTopOfScreen">Переместить штрих-код в верхнюю часть экрана</string>
     <string name="moveBarcodeToCenterOfScreen">Центрировать штрих-код на экране</string>
     <string name="currency">Валюта</string>
-    <string name="chooseExpiryDate">Указать срок действия</string>
+    <string name="chooseExpiryDate">Выбор срока действия</string>
     <string name="never">Никогда</string>
-    <string name="expiryDate">Окончание срока действия</string>
+    <string name="expiryDate">Срок действия</string>
     <string name="editBarcode">Изменить штрих-код</string>
     <string name="barcode">Штрих-код</string>
     <string name="card">Карта</string>
@@ -150,7 +150,7 @@
     <string name="backImageDescription">Задняя сторона</string>
     <string name="frontImageDescription">Лицевая сторона</string>
     <string name="photos">Фото</string>
-    <string name="importStocardMessage">Выберите для импортирования файл <i>***-sync.zip</i>.
+    <string name="importStocardMessage">Выберите для импортирования файл <i>***.zip</i>.
 \nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
     <string name="passwordRequired">Введите пароль</string>
     <string name="importStocard">Импорт из Stocard</string>
@@ -280,6 +280,15 @@
     <string name="cameraPermissionRequired">Для этого действия необходимо разрешение на доступ к камере…</string>
     <string name="validFromDate">Действует с</string>
     <string name="anyDate">Любая дата</string>
-    <string name="chooseValidFromDate">Выберите дату действия</string>
+    <string name="chooseValidFromDate">Выбор даты действия</string>
     <string name="validFromSentence">Действует с: <xliff:g>%s</xliff:g></string>
+    <string name="setBarcodeHeight">Указать высоту штрих-кода</string>
+    <string name="height">Высота:</string>
+    <string name="switchToBarcode">Переключить на штрих-код</string>
+    <string name="switchToFrontImage">Переключить на лицевую сторону</string>
+    <string name="switchToBackImage">Переключить на заднюю сторону</string>
+    <string name="openImageInGallery">Открыть изображение в приложении галереи</string>
+    <string name="openFrontImageInGalleryApp">Открыть лицевое изображение в приложении галереи</string>
+    <string name="openBackImageInGalleryApp">Открыть заднее изображение в приложении галереи</string>
+    <string name="donate">Пожертвовать</string>
 </resources>

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

@@ -265,7 +265,7 @@
     <string name="settings_landscape_orientation">Na šírku</string>
     <string name="importFidmeMessage">Vyberte svoj <i>fidme-export-request-xxxxxx.zip</i> export zo služby FidMe pre import a potom vyberte typy čiarových kódov ručne.
 \nVytvorte ho z profilu FidMe tak, že najprv vyberiete položku Ochrana údajov a potom stlačíte tlačidlo Extrahovať moje údaje.</string>
-    <string name="importStocardMessage">Vyberte svoj <i>***-sync.zip</i> export zo Stocard pre import.
+    <string name="importStocardMessage">Vyberte svoj <i>***.zip</i> export zo Stocard pre import.
 \nZískate ho zaslaním e-mailu na adresu support@stocardapp.com, v ktorom požiadate o export svojich údajov.</string>
     <string name="currentBalanceSentence">Aktuálny zostatok: <xliff:g>%s</xliff:g></string>
     <string name="copy_to_clipboard_multiple_toast">ID skopírované do schránky</string>

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

@@ -221,7 +221,7 @@
     <string name="moveBarcodeToCenterOfScreen">Postavi črtno kodo na sredino zaslona</string>
     <string name="importCatimaMessage">Izberi svoj obstoječ Catima <i>catima.zip</i> izvoz podatkov za uvoz v aplikacijo.
 \nNajprej izvozi podatke v meniju \"Uvozi/Izvozi\" v drugi aplikaciji Catima s pritiskom na izbiro izvozi.</string>
-    <string name="importStocardMessage">Izberi svoj <i>***-sync.zip</i> Stocard izvoz podatkov za uvoz.
+    <string name="importStocardMessage">Izberi svoj <i>***.zip</i> Stocard izvoz podatkov za uvoz.
 \nIzvoz podatkov dobiš s pošiljanjem elektronske pošte na support@stocardapp.com, kjer povprašaš za izvoz svojih podatkov.</string>
     <string name="importVoucherVaultMessage">Izberi svoj <i>vouchervault.json</i> Voucher Vault izvoz podatkov za uvoz.
 \nIzvoz podatkov dobiš s pritiskom na gumb \"Export\" v Voucher Vault first.</string>

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

@@ -24,7 +24,7 @@
 \nSkapa den från Import/Export-menyn i Loyalty Card Keychain först genom att trycka på Exportera.</string>
     <string name="importVoucherVaultMessage">Välj den exporterade <i>vouchervault.json</i> från Voucher Vault som du vill importera.
 \nSkapa den först genom att trycka på Exportera i Voucher Vault.</string>
-    <string name="importStocardMessage">Välj den exporterade <i>***-sync.zip</i> från Stocard som du vill importera.
+    <string name="importStocardMessage">Välj den exporterade <i>***.zip</i> från Stocard som du vill importera.
 \nSkaffa den först genom att skicka e-post till support@stocardapp.com och be om att få dina data exporterade.</string>
     <string name="enter_group_name">Ange gruppnamn</string>
     <string name="groups">Grupper</string>

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

@@ -39,7 +39,7 @@
     <string name="importVoucherVaultMessage">İçe aktarmak için Voucher Vault\'tan dışa aktardığınız <i>vouchervault.json</i> dosyasını seçin.
 \nÖnce Voucher Vault\'ta \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importVoucherVault">Voucher Vault\'tan içe aktar</string>
-    <string name="importStocardMessage">İçe aktarmak için Stocard\'dan dışa aktardığınız <i>***-sync.zip</i> dosyasını seçin.
+    <string name="importStocardMessage">İçe aktarmak için Stocard\'dan dışa aktardığınız <i>***.zip</i> dosyasını seçin.
 \nsupport@stocardapp.com adresine e-posta göndererek verilerinizin dışa aktarılmasını isteyerek edinin.</string>
     <string name="importStocard">Stocard\'dan içe aktar</string>
     <string name="importLoyaltyCardKeychainMessage">İçe aktarmak için Loyalty Card Keychain\'den dışa aktardığınız <i>LoyaltyCardKeychain.csv</i> dosyasını seçin.
@@ -268,4 +268,13 @@
     <string name="anyDate">Herhangi bir tarih</string>
     <string name="validFromDate">Geçerlilik başlangıcı</string>
     <string name="validFromSentence"><xliff:g>%s</xliff:g> tarihinden itibaren geçerlidir</string>
+    <string name="height">Yükseklik:</string>
+    <string name="switchToBackImage">Arka resme geç</string>
+    <string name="switchToBarcode">Barkoda geç</string>
+    <string name="openImageInGallery">Resmi galeri uygulamasında aç</string>
+    <string name="donate">Bağış yap</string>
+    <string name="switchToFrontImage">Ön resme geç</string>
+    <string name="setBarcodeHeight">Barkod yüksekliğini ayarla</string>
+    <string name="openFrontImageInGalleryApp">Ön resmi galeri uygulamasında aç</string>
+    <string name="openBackImageInGalleryApp">Arka resmi galeri uygulamasında aç</string>
 </resources>

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

@@ -154,7 +154,7 @@
     <string name="photos">Світлини</string>
     <string name="backImageDescription">Тильна сторона</string>
     <string name="frontImageDescription">Лицьова сторона</string>
-    <string name="importStocardMessage">Виберіть експорт <i> ***-sync.zip </i> зі Stocard для імпорту.
+    <string name="importStocardMessage">Виберіть експорт <i> ***.zip </i> зі Stocard для імпорту.
 \nОтримайте його, надіславши електронного листа support@stocardapp.com з проханням експортувати ваші дані.</string>
     <string name="importStocard">Імпорт із Stocard</string>
     <plurals name="selectedCardCount">

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

@@ -140,7 +140,7 @@
     <string name="deleteConfirmation">删除此卡？</string>
     <string name="deleteTitle">移除卡片</string>
     <string name="starImage">最喜欢的星星</string>
-    <string name="importStocardMessage">选择 Stocard 导出文件 <i>****-sync.zip</i>来导入。
+    <string name="importStocardMessage">选择 Stocard 导出文件 <i>****.zip</i>来导入。
 \n发电子邮件给 support@stocardapp.com 请求获得数据导出文件。</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="other">确定永久删除 <xliff:g>%d</xliff:g> 这些卡片？</item>
@@ -261,4 +261,13 @@
     <string name="chooseValidFromDate">选择有效日期</string>
     <string name="validFromSentence">有效期自: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionRequired">此操作所需的访问相机的权限…</string>
+    <string name="height">高度：</string>
+    <string name="switchToFrontImage">选择正面图像</string>
+    <string name="switchToBackImage">选择背面图像</string>
+    <string name="switchToBarcode">选择条形码</string>
+    <string name="openImageInGallery">使用图库软件打开图像</string>
+    <string name="openFrontImageInGalleryApp">使用图库软件打开正面图像</string>
+    <string name="openBackImageInGalleryApp">使用图库软件打开背面图像</string>
+    <string name="setBarcodeHeight">设置条形码高度</string>
+    <string name="donate">捐赠</string>
 </resources>

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

@@ -172,7 +172,7 @@
     <string name="importVoucherVaultMessage">選取您自 Voucher Vault 匯出的 <i>vouchervault.json</i> 檔案以進行匯入。
 \n請您先透過 Voucher Vault 進行匯出。</string>
     <string name="importStocard">自 Stocard 中匯入</string>
-    <string name="importStocardMessage">&gt;選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
+    <string name="importStocardMessage">&gt;選取您自 Stocard 匯出的  <i>***.zip</i> 檔案以進行匯入。
 \n請您寫封 Email 至 support@stocardapp.com 索取您的資料。</string>
     <string name="importLoyaltyCardKeychain">自 Loyalty Card Keychain 中匯入</string>
     <string name="importLoyaltyCardKeychainMessage">選取您自 Loyalty Card Keychain <i>LoyaltyCardKeychain.csv</i> 檔案以進行匯入。

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

@@ -194,7 +194,7 @@
     <string name="importLoyaltyCardKeychainMessage">Select your <i>LoyaltyCardKeychain.csv</i> export from Loyalty Card Keychain to import.
 \nCreate it from the Import/Export menu in Loyalty Card Keychain by pressing Export there first.</string>
     <string name="importStocard">Import from Stocard</string>
-    <string name="importStocardMessage">Select your <i>***-sync.zip</i> export from Stocard to import.
+    <string name="importStocardMessage">Select your <i>***.zip</i> export from Stocard to import.
 \nGet it by e-mailing support@stocardapp.com asking for an export of your data.</string>
     <string name="importVoucherVault">Import from Voucher Vault</string>
     <string name="importVoucherVaultMessage">Select your <i>vouchervault.json</i> export from Voucher Vault to import.
@@ -313,4 +313,13 @@
     <string name="anyDate">Any date</string>
     <string name="chooseValidFromDate">Choose valid from date</string>
     <string name="validFromSentence">Valid from: <xliff:g>%s</xliff:g></string>
+    <string name="height">Height:</string>
+    <string name="switchToFrontImage">Switch to front image</string>
+    <string name="switchToBackImage">Switch to back image</string>
+    <string name="switchToBarcode">Switch to barcode</string>
+    <string name="openImageInGallery">Open image in gallery app</string>
+    <string name="openFrontImageInGalleryApp">Open front image in gallery app</string>
+    <string name="openBackImageInGalleryApp">Open back image in gallery app</string>
+    <string name="setBarcodeHeight">Set barcode height</string>
+    <string name="donate">Donate</string>
 </resources>

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

@@ -27,8 +27,17 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
 
         <item name="windowActionModeOverlay">true</item>
+
+    </style>
+
+    <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="alertDialogStyle">@style/MaterialAlertDialog.Material3</item>
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="android:background">@drawable/dialog_bg_monet</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">

app/src/main/res/xml/preferences.xml

@@ -25,6 +25,7 @@
             app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="false"
             android:key="@string/settings_key_oled_dark"
             android:title="@string/settings_oled_dark"
@@ -52,6 +53,7 @@
             app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="true"
             android:key="@string/settings_key_display_barcode_max_brightness"
             android:title="@string/settings_display_barcode_max_brightness"
@@ -68,6 +70,7 @@
             app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="true"
             android:key="@string/settings_key_keep_screen_on"
             android:title="@string/settings_keep_screen_on"
@@ -75,11 +78,14 @@
             app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="true"
             android:key="@string/settings_key_disable_lockscreen_while_viewing_card"
             android:title="@string/settings_disable_lockscreen_while_viewing_card"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
+
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>
+

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

@@ -11,7 +11,6 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import static org.junit.Assert.assertEquals;
@@ -21,7 +20,6 @@ import static org.robolectric.Shadows.shadowOf;
 
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class BarcodeSelectorActivityTest {
     @Test
     public void emptyStateTest() {

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

@@ -27,7 +27,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class DatabaseTest {
     private SQLiteDatabase mDatabase;
     private Activity mActivity;

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

@@ -13,13 +13,11 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class ImportExportActivityTest {
     private void registerIntentHandler(String handler) {
         // Add something that will 'handle' the given intent type

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

@@ -6,20 +6,16 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Environment;
 import android.os.Looper;
-import android.util.DisplayMetrics;
 
 import com.google.zxing.BarcodeFormat;
 
-import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowLooper;
@@ -34,8 +30,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,7 +38,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.core.content.res.ResourcesCompat;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
@@ -59,7 +52,6 @@ import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class ImportExportTest {
     private Activity activity;
     private SQLiteDatabase mDatabase;
@@ -517,7 +509,7 @@ public class ImportExportTest {
     }
 
     @Test
-    public void corruptedImportNothingSaved() throws IOException {
+    public void corruptedImportNothingSaved() {
         final int NUM_CARDS = 10;
 
         for (DataFormat format : DataFormat.values()) {
@@ -538,7 +530,7 @@ public class ImportExportTest {
             //             ^ after the quote there should only be a , \n or EOF
             String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat,\"\"a";
 
-            ByteArrayInputStream inData = new ByteArrayInputStream((outData.toString() + corruptEntry).getBytes());
+            ByteArrayInputStream inData = new ByteArrayInputStream((outData + corruptEntry).getBytes());
 
             // Attempt to import the data
             result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, format, null);
@@ -617,18 +609,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithoutColorsV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,0";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithoutColorsV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_no_colors.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -653,20 +635,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithoutNullColorsV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,,,0";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithoutNullColorsV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_empty_colors.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -691,20 +661,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithoutInvalidColorsV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,type,not a number,invalid,0";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithoutInvalidColorsV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_invalid_colors.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -715,20 +673,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithNoBarcodeTypeV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,,1,1,0";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithNoBarcodeTypeV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_no_barcode_type.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -753,20 +699,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithStarredFieldV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,1,1,1";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithStarredFieldV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_starred_field.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -791,20 +725,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithNoStarredFieldV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,1,1,";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithNoStarredFieldV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_no_starred_field.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -829,39 +751,15 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importWithInvalidStarFieldV1() throws IOException {
-        String csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,1,1,2";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+    public void importWithInvalidStarFieldV1() {
+        InputStream inputStream = getClass().getResourceAsStream("catima_v1_invalid_starred_field.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
         assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        csvText = "";
-        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                DBHelper.LoyaltyCardDbIds.STORE + "," +
-                DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
-
-        csvText += "1,store,note,12345,AZTEC,1,1,text";
-
-        inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        inputStream = getClass().getResourceAsStream("catima_v1_invalid_starred_field_2.csv");
 
         // Import the CSV data
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -888,11 +786,8 @@ public class ImportExportTest {
     @Test
     public void exportImportV2Zip() throws FileNotFoundException {
         // Prepare images
-        BitmapDrawable launcher = (BitmapDrawable) ResourcesCompat.getDrawableForDensity(activity.getResources(), R.mipmap.ic_launcher, DisplayMetrics.DENSITY_XXXHIGH, activity.getTheme());
-        BitmapDrawable roundLauncher = (BitmapDrawable) ResourcesCompat.getDrawableForDensity(activity.getResources(), R.mipmap.ic_launcher_round, DisplayMetrics.DENSITY_XXXHIGH, activity.getTheme());
-
-        Bitmap launcherBitmap = launcher.getBitmap();
-        Bitmap roundLauncherBitmap = roundLauncher.getBitmap();
+        Bitmap bitmap1 = new LetterBitmap(activity.getApplicationContext(), "1", "1", 12, 64, 64, Color.BLACK, Color.YELLOW).getLetterTile();
+        Bitmap bitmap2 = new LetterBitmap(activity.getApplicationContext(), "2", "2", 12, 64, 64, Color.GREEN, Color.WHITE).getLetterTile();
 
         // Set up cards and groups
         HashMap<Integer, LoyaltyCard> loyaltyCardHashMap = new HashMap<>();
@@ -908,12 +803,12 @@ public class ImportExportTest {
         List<Group> groups = Arrays.asList(DBHelper.getGroup(mDatabase, "One"));
         DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, groups);
         loyaltyCardGroups.put(loyaltyCardId, groups);
-        Utils.saveCardImage(activity.getApplicationContext(), launcherBitmap, loyaltyCardId, ImageLocationType.front);
-        Utils.saveCardImage(activity.getApplicationContext(), roundLauncherBitmap, loyaltyCardId, ImageLocationType.back);
-        Utils.saveCardImage(activity.getApplicationContext(), launcherBitmap, loyaltyCardId, ImageLocationType.icon);
-        loyaltyCardFrontImages.put(loyaltyCardId, launcherBitmap);
-        loyaltyCardBackImages.put(loyaltyCardId, roundLauncherBitmap);
-        loyaltyCardIconImages.put(loyaltyCardId, launcherBitmap);
+        Utils.saveCardImage(activity.getApplicationContext(), bitmap1, loyaltyCardId, ImageLocationType.front);
+        Utils.saveCardImage(activity.getApplicationContext(), bitmap2, loyaltyCardId, ImageLocationType.back);
+        Utils.saveCardImage(activity.getApplicationContext(), bitmap1, loyaltyCardId, ImageLocationType.icon);
+        loyaltyCardFrontImages.put(loyaltyCardId, bitmap1);
+        loyaltyCardBackImages.put(loyaltyCardId, bitmap2);
+        loyaltyCardIconImages.put(loyaltyCardId, bitmap1);
 
         // Create card 2
         loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, 2, 1, null,0);
@@ -997,32 +892,7 @@ public class ImportExportTest {
 
     @Test
     public void importV2CSV() {
-        String csvText = "2\n" +
-                "\n" +
-                "_id\n" +
-                "Health\n" +
-                "Food\n" +
-                "Fashion\n" +
-                "\n" +
-                "_id,store,note,validfrom,expiry,balance,balancetype,cardid,barcodeid,headercolor,barcodetype,starstatus\n" +
-                "1,Card 1,Note 1,1601510400,1618053234,100,USD,1234,5432,1,QR_CODE,0,\r\n" +
-                "8,Clothes Store,Note about store,,,0,,a,,-5317,,0,\n" +
-                "2,Department Store,,,1618041729,0,,A,,-9977996,,0,\n" +
-                "3,Grocery Store,\"Multiline note about grocery store\n" +
-                "\n" +
-                "with blank line\",,,150,,dhd,,-9977996,,0,\n" +
-                "4,Pharmacy,,,,0,,dhshsvshs,,-10902850,,1,\n" +
-                "5,Restaurant,Note about restaurant here,,,0,,98765432,23456,-10902850,CODE_128,0,\n" +
-                "6,Shoe Store,,,,12.50,EUR,a,-5317,,AZTEC,0,\n" +
-                "\n" +
-                "cardId,groupId\n" +
-                "8,Fashion\n" +
-                "3,Food\n" +
-                "4,Health\n" +
-                "5,Food\n" +
-                "6,Fashion\n";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStream inputStream = getClass().getResourceAsStream("catima_v2.csv");
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
@@ -1221,7 +1091,11 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importStocard() throws IOException {
+    public void importStocard() {
+        // FIXME: The provided stocard.zip is a very old export (8 July 2021) manually edited to
+        // look more like the Stocard files provided by users for #1242. It is not an up-to-date
+        // export and the test is possibly unreliable. This should be replaced by an up-to-date
+        // export.
         InputStream inputStream = getClass().getResourceAsStream("stocard.zip");
 
         // Import the Stocard data
@@ -1271,8 +1145,7 @@ public class ImportExportTest {
 
         card = DBHelper.getLoyaltyCard(mDatabase, 3);
 
-        // I don't think we can know this one, but falling back to an unique store name is at least something
-        assertEquals("63536738-d64b-48ae-aeb8-82761523fa67", card.store);
+        assertEquals("jö", card.store);
         assertEquals("", card.note);
         assertEquals(null, card.validFrom);
         assertEquals(null, card.expiry);
@@ -1291,33 +1164,8 @@ public class ImportExportTest {
     }
 
     @Test
-    public void importVoucherVault() throws IOException, FormatException, JSONException, ParseException {
-        String jsonText = "[\n" +
-                "  {\n" +
-                "    \"uuid\": \"ae1ae525-3f27-481e-853a-8c30b7fa12d8\",\n" +
-                "    \"description\": \"Clothes Store\",\n" +
-                "    \"code\": \"123456\",\n" +
-                "    \"codeType\": \"CODE128\",\n" +
-                "    \"expires\": null,\n" +
-                "    \"removeOnceExpired\": true,\n" +
-                "    \"balance\": null,\n" +
-                "    \"balanceMilliunits\": null,\n" +
-                "    \"color\": \"GREY\"\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"uuid\": \"29a5d3b3-eace-4311-a15c-4c7e6a010531\",\n" +
-                "    \"description\": \"Department Store\",\n" +
-                "    \"code\": \"26846363\",\n" +
-                "    \"codeType\": \"CODE39\",\n" +
-                "    \"expires\": \"2021-03-26T00:00:00.000\",\n" +
-                "    \"removeOnceExpired\": true,\n" +
-                "    \"balance\": null,\n" +
-                "    \"balanceMilliunits\": 3500,\n" +
-                "    \"color\": \"PURPLE\"\n" +
-                "  }\n" +
-                "]";
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(jsonText.getBytes(StandardCharsets.UTF_8));
+    public void importVoucherVault() {
+        InputStream inputStream = getClass().getResourceAsStream("vouchervault.json");
 
         // Import the Voucher Vault data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.VoucherVault, null);

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

@@ -12,7 +12,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
@@ -25,7 +24,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class ImportURITest {
     private ImportURIHelper importURIHelper;
     private SQLiteDatabase mDatabase;
@@ -111,10 +109,11 @@ public class ImportURITest {
 
     @Test
     public void failToParseBadData() {
-        String[] urls = new String[3];
+        String[] urls = new String[4];
         urls[0] = "https://brarcher.github.io/loyalty-card-locker/share?stare=store&note=note&cardid=12345&barcodetype=ITF&headercolor=-416706";
         urls[1] = "https://thelastproject.github.io/Catima/share#stare%3Dstore%26note%3Dnote%26balance%3D0%26cardid%3D12345%26barcodetype%3DITF%26headercolor%3D-416706";
         urls[2] = "https://catima.app/share#stare%3Dstore%26note%3Dnote%26balance%3D0%26cardid%3D12345%26barcodetype%3DITF%26headercolor%3D-416706";
+        urls[3] = "https://catima.app/share#";
 
         for (String url : urls) {
             try {

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

@@ -15,7 +15,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
 
 import java.math.BigDecimal;
@@ -32,7 +31,6 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class LoyaltyCardCursorAdapterTest {
     private Activity activity;
     private SQLiteDatabase mDatabase;
@@ -62,25 +60,13 @@ public class LoyaltyCardCursorAdapterTest {
         return viewHolder.itemView;
     }
 
-    private void checkView(final View view, final String store, final String note, final String validFrom, final String expiry, final String balance, boolean checkFontSizes) {
-        final TextView storeField = view.findViewById(R.id.store);
+    private void checkView(final View view, final String store, final String note, final String validFrom, final String expiry, final String balance) {
+        final TextView storeField = view.findViewById(R.id.thumbnail_text);
         final TextView noteField = view.findViewById(R.id.note);
         final TextView validFromField = view.findViewById(R.id.validFrom);
         final TextView expiryField = view.findViewById(R.id.expiry);
         final TextView balanceField = view.findViewById(R.id.balance);
 
-        if (checkFontSizes) {
-            Settings preferences = new Settings(activity.getApplicationContext());
-            int mediumFontSize = preferences.getFontSizeMax(preferences.getMediumFont());
-            int smallFontSize = preferences.getFontSizeMax(preferences.getSmallFont());
-
-            assertEquals(mediumFontSize, (int) storeField.getTextSize());
-            assertEquals(smallFontSize, (int) noteField.getTextSize());
-            assertEquals(smallFontSize, (int) validFromField.getTextSize());
-            assertEquals(smallFontSize, (int) expiryField.getTextSize());
-        }
-
-        assertEquals(store, storeField.getText().toString());
         if (!note.isEmpty()) {
             assertEquals(View.VISIBLE, noteField.getVisibility());
             assertEquals(note, noteField.getText().toString());
@@ -121,7 +107,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "", false);
+        checkView(view, card.store, card.note, "", "", "");
 
         cursor.close();
     }
@@ -136,30 +122,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "", false);
-
-        cursor.close();
-    }
-
-    @Test
-    public void TestCursorAdapterFontSizes() {
-        Date date = new Date();
-        String dateString = DateFormat.getDateInstance(DateFormat.LONG).format(date);
-
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", date, date, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
-        LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
-
-        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
-        cursor.moveToFirst();
-
-        setFontScale(50);
-        View view = createView(cursor);
-
-        checkView(view, card.store, card.note, dateString, dateString, "", true);
-
-        setFontScale(200);
-        view = createView(cursor);
-        checkView(view, card.store, card.note, dateString, dateString, "", true);
+        checkView(view, card.store, card.note, "", "", "");
 
         cursor.close();
     }
@@ -225,7 +188,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "", false);
+        checkView(view, card.store, card.note, "", "", "");
 
         cursor.close();
     }
@@ -240,7 +203,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "", false);
+        checkView(view, card.store, card.note, "", "", "");
 
         cursor.close();
     }
@@ -255,7 +218,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "100 points", false);
+        checkView(view, card.store, card.note, "", "", "100 points");
 
         cursor.close();
     }
@@ -270,7 +233,7 @@ public class LoyaltyCardCursorAdapterTest {
 
         View view = createView(cursor);
 
-        checkView(view, card.store, card.note, "", "", "$10.00", false);
+        checkView(view, card.store, card.note, "", "", "$10.00");
 
         cursor.close();
     }

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

@@ -19,6 +19,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
@@ -57,11 +59,13 @@ import java.util.Currency;
 import java.util.Date;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.TextViewCompat;
 import androidx.preference.PreferenceManager;
 
 import static android.os.Looper.getMainLooper;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -69,7 +73,6 @@ import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class LoyaltyCardViewActivityTest {
     private final String BARCODE_DATA = "428311627547";
     private final CatimaBarcode BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A);
@@ -307,7 +310,7 @@ public class LoyaltyCardViewActivityTest {
                                 final String barcodeId, final String barcodeType,
                                 final Bitmap frontImage, final Bitmap backImage) {
         if (mode == ViewMode.VIEW_CARD) {
-            checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId, FieldTypeView.TextView);
+            checkFieldProperties(activity, R.id.card_id_view, View.VISIBLE, cardId, FieldTypeView.TextView);
         } else {
             int editVisibility = View.VISIBLE;
 
@@ -619,7 +622,7 @@ public class LoyaltyCardViewActivityTest {
     }
 
     @Test
-    public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException {
+    public void startWithLoyaltyCardViewModeCheckDisplay() {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
         Activity activity = (Activity) activityController.get();
         final Context context = activity.getApplicationContext();
@@ -1129,40 +1132,6 @@ public class LoyaltyCardViewActivityTest {
         database.close();
     }
 
-    @Test
-    public void startCheckFontSizes() {
-        ActivityController activityController = createActivityWithLoyaltyCard(false);
-
-        Activity activity = (Activity) activityController.get();
-        SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
-
-        final int LARGE_FONT_SIZE = 40;
-
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
-        settings.edit()
-                .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), 100)
-                .apply();
-
-        activityController.start();
-        activityController.visible();
-        activityController.resume();
-
-        assertEquals(false, activity.isFinishing());
-
-        TextView storeName = activity.findViewById(R.id.storeName);
-        TextView cardIdFieldView = activity.findViewById(R.id.cardIdView);
-
-        TextViewCompat.getAutoSizeMaxTextSize(storeName);
-        TextViewCompat.getAutoSizeMaxTextSize(storeName);
-        assertEquals(LARGE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
-
-        shadowOf(activity).clickMenuItem(android.R.id.home);
-        assertEquals(true, activity.isFinishing());
-
-        database.close();
-    }
-
     @Test
     public void checkPushStarIcon() {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
@@ -1209,94 +1178,84 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        assertEquals(false, activity.isFinishing());
+        assertFalse(activity.isFinishing());
 
-        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
         BottomAppBar bottomAppBar = activity.findViewById(R.id.bottom_app_bar);
-        ImageButton maximizeButton = activity.findViewById(R.id.maximizeButton);
-        ImageButton minimizeButton = activity.findViewById(R.id.minimizeButton);
-        LinearLayout dotIndicator = activity.findViewById(R.id.dotIndicator);
+        ImageView mainImage = activity.findViewById(R.id.main_image);
+        LinearLayout container = activity.findViewById(R.id.container);
+        ConstraintLayout fullScreenLayout = activity.findViewById(R.id.fullscreen_layout);
+        ImageButton minimizeButton = activity.findViewById(R.id.fullscreen_button_minimize);
         FloatingActionButton editButton = activity.findViewById(R.id.fabEdit);
-        SeekBar barcodeScaler = activity.findViewById(R.id.barcodeScaler);
 
         // Android should not be in fullscreen mode
-        int uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.statusBars()));
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.navigationBars()));
+        assertEquals(WindowInsetsController.BEHAVIOR_DEFAULT, activity.getWindow().getInsetsController().getSystemBarsBehavior());
 
         // Elements should be visible (except minimize button and scaler)
-        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
         assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
-        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
-        assertEquals(View.GONE, minimizeButton.getVisibility());
+        assertEquals(View.VISIBLE, container.getVisibility());
+        assertEquals(View.GONE, fullScreenLayout.getVisibility());
         assertEquals(View.VISIBLE, editButton.getVisibility());
-        assertEquals(View.GONE, barcodeScaler.getVisibility());
-        assertEquals(View.GONE, dotIndicator.getVisibility()); // We have no images, only a barcode
 
         // Click maximize button to activate fullscreen
-        maximizeButton.performClick();
+        mainImage.performClick();
         shadowOf(getMainLooper()).idle();
 
         // Android should be in fullscreen mode
-        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
-        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
-        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+        assertFalse(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.statusBars()));
+        assertFalse(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.navigationBars()));
+        assertEquals(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE, activity.getWindow().getInsetsController().getSystemBarsBehavior());
 
         // Elements should not be visible (except minimize button and scaler)
-        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
         assertEquals(View.GONE, bottomAppBar.getVisibility());
-        assertEquals(View.GONE, maximizeButton.getVisibility());
-        assertEquals(View.VISIBLE, minimizeButton.getVisibility());
+        assertEquals(View.GONE, container.getVisibility());
+        assertEquals(View.VISIBLE, fullScreenLayout.getVisibility());
         assertEquals(View.GONE, editButton.getVisibility());
-        assertEquals(View.VISIBLE, barcodeScaler.getVisibility());
-        assertEquals(View.GONE, dotIndicator.getVisibility()); // We have no images, only a barcode
 
         // Clicking minimize button should deactivate fullscreen mode
         minimizeButton.performClick();
         shadowOf(getMainLooper()).idle();
-        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
-        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.statusBars()));
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.navigationBars()));
+        assertEquals(WindowInsetsController.BEHAVIOR_DEFAULT, activity.getWindow().getInsetsController().getSystemBarsBehavior());
+
         assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
-        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
-        assertEquals(View.GONE, minimizeButton.getVisibility());
+        assertEquals(View.VISIBLE, container.getVisibility());
+        assertEquals(View.GONE, fullScreenLayout.getVisibility());
         assertEquals(View.VISIBLE, editButton.getVisibility());
-        assertEquals(View.GONE, barcodeScaler.getVisibility());
-        assertEquals(View.GONE, dotIndicator.getVisibility()); // We have no images, only a barcode
 
         // Another click back to fullscreen
-        maximizeButton.performClick();
+        mainImage.performClick();
         shadowOf(getMainLooper()).idle();
-        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
-        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
-        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
-        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
+
+        assertFalse(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.statusBars()));
+        assertFalse(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.navigationBars()));
+        assertEquals(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE, activity.getWindow().getInsetsController().getSystemBarsBehavior());
+
         assertEquals(View.GONE, bottomAppBar.getVisibility());
-        assertEquals(View.GONE, maximizeButton.getVisibility());
-        assertEquals(View.VISIBLE, minimizeButton.getVisibility());
+        assertEquals(View.GONE, container.getVisibility());
+        assertEquals(View.VISIBLE, fullScreenLayout.getVisibility());
         assertEquals(View.GONE, editButton.getVisibility());
-        assertEquals(View.VISIBLE, barcodeScaler.getVisibility());
-        assertEquals(View.GONE, dotIndicator.getVisibility()); // We have no images, only a barcode
 
         // In full screen mode, back button should disable fullscreen
         activity.onBackPressed();
         shadowOf(getMainLooper()).idle();
-        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
-        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
-        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.statusBars()));
+        assertTrue(activity.getWindow().getDecorView().getRootWindowInsets().isVisible(WindowInsets.Type.navigationBars()));
+        assertEquals(WindowInsetsController.BEHAVIOR_DEFAULT, activity.getWindow().getInsetsController().getSystemBarsBehavior());
+
         assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
-        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
-        assertEquals(View.GONE, minimizeButton.getVisibility());
+        assertEquals(View.VISIBLE, container.getVisibility());
+        assertEquals(View.GONE, fullScreenLayout.getVisibility());
         assertEquals(View.VISIBLE, editButton.getVisibility());
-        assertEquals(View.GONE, barcodeScaler.getVisibility());
-        assertEquals(View.GONE, dotIndicator.getVisibility()); // We have no images, only a barcode
 
         // Pressing back when not in full screen should finish activity
         activity.onBackPressed();
         shadowOf(getMainLooper()).idle();
-        assertEquals(true, activity.isFinishing());
+        assertTrue(activity.isFinishing());
 
         database.close();
     }
@@ -1315,12 +1274,10 @@ public class LoyaltyCardViewActivityTest {
 
         assertEquals(false, activity.isFinishing());
 
-        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
         BottomAppBar bottomAppBar = activity.findViewById(R.id.bottom_app_bar);
-        ImageButton maximizeButton = activity.findViewById(R.id.maximizeButton);
-        ImageButton minimizeButton = activity.findViewById(R.id.minimizeButton);
+        ImageView mainImage = activity.findViewById(R.id.main_image);
+        ConstraintLayout fullScreenLayout = activity.findViewById(R.id.fullscreen_layout);
         FloatingActionButton editButton = activity.findViewById(R.id.fabEdit);
-        SeekBar barcodeScaler = activity.findViewById(R.id.barcodeScaler);
 
         // Android should not be in fullscreen mode
         int uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
@@ -1328,12 +1285,10 @@ public class LoyaltyCardViewActivityTest {
         assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
 
         // Elements should be visible (except minimize/maximize buttons and barcode and scaler)
-        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
         assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
-        assertEquals(View.GONE, maximizeButton.getVisibility());
-        assertEquals(View.GONE, minimizeButton.getVisibility());
+        assertEquals(View.GONE, mainImage.getVisibility());
+        assertEquals(View.GONE, fullScreenLayout.getVisibility());
         assertEquals(View.VISIBLE, editButton.getVisibility());
-        assertEquals(View.GONE, barcodeScaler.getVisibility());
 
         // Pressing back when not in full screen should finish activity
         activity.onBackPressed();

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

@@ -33,7 +33,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
 public class MainActivityTest {
     private SharedPreferences prefs;
 
@@ -154,10 +153,10 @@ public class MainActivityTest {
         list.measure(0, 0);
         list.layout(0, 0, 100, 1000);
 
-        assertEquals("storeC", ((TextView) list.findViewHolderForAdapterPosition(0).itemView.findViewById(R.id.store)).getText());
-        assertEquals("storeD", ((TextView) list.findViewHolderForAdapterPosition(1).itemView.findViewById(R.id.store)).getText());
-        assertEquals("storeA", ((TextView) list.findViewHolderForAdapterPosition(2).itemView.findViewById(R.id.store)).getText());
-        assertEquals("storeB", ((TextView) list.findViewHolderForAdapterPosition(3).itemView.findViewById(R.id.store)).getText());
+        assertEquals("storeC", ((TextView) list.findViewHolderForAdapterPosition(0).itemView.findViewById(R.id.thumbnail_text)).getText());
+        assertEquals("storeD", ((TextView) list.findViewHolderForAdapterPosition(1).itemView.findViewById(R.id.thumbnail_text)).getText());
+        assertEquals("storeA", ((TextView) list.findViewHolderForAdapterPosition(2).itemView.findViewById(R.id.thumbnail_text)).getText());
+        assertEquals("storeB", ((TextView) list.findViewHolderForAdapterPosition(3).itemView.findViewById(R.id.thumbnail_text)).getText());
 
         database.close();
     }

app/src/test/res/protect/card_locker/catima_v1_empty_colors.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,AZTEC,,,0

app/src/test/res/protect/card_locker/catima_v1_invalid_colors.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,type,not a number,invalid,0

app/src/test/res/protect/card_locker/catima_v1_invalid_starred_field.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,AZTEC,1,1,2

app/src/test/res/protect/card_locker/catima_v1_invalid_starred_field_2.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,AZTEC,1,1,text

app/src/test/res/protect/card_locker/catima_v1_no_barcode_type.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,,1,1,0

app/src/test/res/protect/card_locker/catima_v1_no_colors.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,starstatus
+1,store,note,12345,AZTEC,0

app/src/test/res/protect/card_locker/catima_v1_no_starred_field.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,AZTEC,1,1,

app/src/test/res/protect/card_locker/catima_v1_starred_field.csv

@@ -0,0 +1,2 @@
+_id,store,note,cardid,barcodetype,headercolor,headertextcolor,starstatus
+1,store,note,12345,AZTEC,1,1,1

app/src/test/res/protect/card_locker/catima_v2.csv

@@ -0,0 +1,24 @@
+2
+
+_id
+Health
+Food
+Fashion
+
+_id,store,note,validfrom,expiry,balance,balancetype,cardid,barcodeid,headercolor,barcodetype,starstatus
+1,Card 1,Note 1,1601510400,1618053234,100,USD,1234,5432,1,QR_CODE,0,
+8,Clothes Store,Note about store,,,0,,a,,-5317,,0,
+2,Department Store,,,1618041729,0,,A,,-9977996,,0,
+3,Grocery Store,"Multiline note about grocery store
+
+with blank line",,,150,,dhd,,-9977996,,0,
+4,Pharmacy,,,,0,,dhshsvshs,,-10902850,,1,
+5,Restaurant,Note about restaurant here,,,0,,98765432,23456,-10902850,CODE_128,0,
+6,Shoe Store,,,,12.50,EUR,a,-5317,,AZTEC,0,
+
+cardId,groupId
+8,Fashion
+3,Food
+4,Health
+5,Food
+6,Fashion

app/src/test/res/protect/card_locker/vouchervault.json

@@ -0,0 +1,24 @@
+[
+  {
+    "uuid": "ae1ae525-3f27-481e-853a-8c30b7fa12d8",
+    "description": "Clothes Store",
+    "code": "123456",
+    "codeType": "CODE128",
+    "expires": null,
+    "removeOnceExpired": true,
+    "balance": null,
+    "balanceMilliunits": null,
+    "color": "GREY"
+  },
+  {
+    "uuid": "29a5d3b3-eace-4311-a15c-4c7e6a010531",
+    "description": "Department Store",
+    "code": "26846363",
+    "codeType": "CODE39",
+    "expires": "2021-03-26T00:00:00.000",
+    "removeOnceExpired": true,
+    "balance": null,
+    "balanceMilliunits": 3500,
+    "color": "PURPLE"
+  }
+]

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '7.0.4' apply false
-    id 'com.github.spotbugs' version "4.7.5" apply false
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.github.spotbugs' version "5.0.14" apply false
 }
 
 allprojects {

build.sh

@@ -11,13 +11,13 @@ if [ -z "${ANDROID_SDK_ROOT:-}" ]; then
 fi
 
 if [ -z "${JAVA_HOME:-}" ]; then
-  echo "JAVA_HOME is not set, setting to Java 11 (like F-Droid)"
+  echo "JAVA_HOME is not set, setting to Java 17"
   if [ -f "/etc/debian_version" ]; then
-    echo "Debian-based distro, Java 11 is /usr/lib/jvm/java-11-openjdk-amd64"
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+    echo "Debian-based distro, Java 17 is /usr/lib/jvm/java-17-openjdk-amd64"
+    export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
   else
-    echo "Not Debian-based, assuming Fedora and setting Java 11 as /usr/lib/jvm/java-11-openjdk"
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+    echo "Not Debian-based, assuming Fedora and setting Java 17 as /usr/lib/jvm/java-17-openjdk"
+    export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
   fi
 fi
 

docs/RELEASE_STEPS.md

@@ -0,0 +1,11 @@
+**This documentation is for maintainers. If you're an user, please ignore it.**
+
+# When releasing, do the following:
+1. Press "Commit" and "Push" on Weblate to ensure all translations are up to date
+2. Merge Weblate pull request
+3. Update `CHANGELOG.md` with the new version name
+4. Update `app/build.gradle` with the new `versionCode` and `versionName`
+5. Build a new .apk: `KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh`
+6. Upload the APK to Google Play Open Testing
+7. Push the version update: `git add CHANGELOG.md app/build.gradle && git commit -m "Release Catima <VERSION>" && git push`
+8. Create a new release on GitHub and attach the `app-release.apk` and `SHA256SUMS` files

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

@@ -1 +1,2 @@
 - Podpora nastavení začátku platnosti karty
+- Oprava importu Stocard (změnil se formát exportu Stocard)

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

@@ -0,0 +1 @@
+- Použít barvy motivu Material You na více zařízeních (aktualizace knihovny Google)

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

@@ -0,0 +1,3 @@
+- Kompletní přepracování hlavní obrazovky a obrazovek věrnostních karet
+- Motiv Material You pro obrazovku Nastavení
+- Oprava havárie při použití „Pořídit fotografii“ při zakázaném fotoaparátu

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

@@ -1,2 +1,2 @@
 - Dlouhé kliknutí na kartu vyvolá možnost zkopírovat ID karty do schránky. (pull #49 (https://github.com/brarcher/loyalty-card-locker/issues/49))
-- Tlačítko Zpět v zobrazení Vstup/Export nyní funguje a přesune uživatele do hlavního zobrazení
+- Tlačítko Zpět v zobrazení Import/Export nyní funguje a přesune uživatele do hlavního zobrazení

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

@@ -1 +1,2 @@
-- Support setting start of card validity
+- Support setting start of card validity
+- Fix Stocard import (Stocard's export format changed)