WIP

Bump robolectric from 4.8.2 to 4.9

CHANGELOG.md

@@ -1,5 +1,55 @@
 # Changelog
 
+## Unreleased - 115
+
+- Open image in gallery on long-press
+
+## v2.20.0 - 114
+
+- Add Monochrome icon for Android 13
+- Improve first launch screen
+- Fidme import fixes
+
+## v2.19.0 - 113
+
+- Add previous and next buttons to the loyalty card view
+- Fix foreground colour on edit button
+- Replace floppy disk save icon with checkmark
+
+## v2.18.2 - 112
+
+- Make the possibility to set a custom header more visible
+
+## v2.18.1 - 111
+
+- Arabic language support
+- Display archived card count in group overview
+- Fix balance parsing bugs (made cards not savable in Arabic and other language with non-Western numbers)
+- Fix custom theme not applying to main screen correctly
+- Improve display of selected cards
+- Fix crash when leaving cardview in RTL layouts for cards with expiry or balance
+- Fix back arrow in card view pointing the wrong way in RTL layouts
+
+## v2.17.1 - 109
+
+- Fix incorrect text colour on "No barcode" button
+
+## v2.17.0 - 108
+
+- Add card duplication feature
+- Don't allow choosing expiry before 1970 (they never worked anyway)
+- Add support for archiving cards
+- Move delete from edit to view
+- Remove rotation lock icon in favour of a new rotation lock setting
+
+## v2.16.3 - 107 (2022-04-15)
+
+- Stocard import fixes
+
+## v2.16.2 - 106 (2022-03-31)
+
+- Fix some character sequences being shown as a single character
+
 ## v2.16.1 - 105 (2022-03-25)
 
 - Fix gray block appearing on invalid value for barcode

CONTRIBUTING.md

@@ -8,7 +8,20 @@ to the rules described here, but by following the instructions below you
 should have a much easier time getting your work merged with the upstream
 project.
 
-## Test Your Code
+## Translation Changes
+
+Translation changes are managed through [Weblate](https://hosted.weblate.org/projects/catima/).
+Please do not supply translation updates directly through GitHub.
+
+Weblate requires an account to translate changes, so please log in before
+you start translating.
+
+While using Weblate, please do not ignore any of its warnings. They exist
+for good reason.
+
+## Code Changes
+
+### Test Your Code
 
 There are four possible tests you can run to verify your code.  The first
 is unit tests, which check the basic functionality of the application, and
@@ -28,14 +41,14 @@ and SpotBugs, run using:
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
 
-## Make Sure Your Code is Tested
+### Make Sure Your Code is Tested
 
 The Catima code uses a fair number of unit tests to verify that
 the basic functionality is working. Submissions which add functionality
 or significantly change the existing code should include additional tests
 to verify the proper operation of the proposed changes.
 
-## Explain Your Work
+### Explain Your Work
 
 At the top of every patch you should include a description of the problem you
 are trying to solve, how you solved it, and why you chose the solution you
@@ -44,7 +57,7 @@ if you can describe/include a reproducer for the problem in the description as
 well as instructions on how to test for the bug and verify that it has been
 fixed.
 
-## Sign Your Work
+### Sign Your Work
 
 The sign-off is a simple line at the end of the patch description, which
 certifies that you wrote it or otherwise have the right to pass it on as an
@@ -82,7 +95,7 @@ your real name, saying:
 
 	Signed-off-by: Random J Developer <random@developer.example.org>
 
-## Submit Patch(es) for Review
+### Submit Patch(es) for Review
 
 Finally, you will need to submit your patches so that they can be reviewed
 and potentially merged into the main Catima repository. The preferred

Gemfile.lock

@@ -1,29 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.5)
+      rexml
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.501.0)
-    aws-sdk-core (3.121.0)
+    aws-partitions (1.597.0)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.102.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -34,18 +35,19 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.7.2)
+    emoji_regex (3.2.3)
+    excon (0.92.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -54,14 +56,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.193.1)
+    fastimage (2.2.6)
+    fastlane (2.206.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -101,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.21.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.5.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -112,53 +117,53 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.7.0)
+    google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
+    google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.14.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.2.0)
+    google-cloud-storage (1.36.2)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.3)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)
-    os (1.1.1)
+    os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -168,9 +173,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -179,7 +184,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -187,8 +192,8 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.21.0)

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 105
-        versionName "2.16.1"
+        versionCode 114
+        versionName "2.20.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -80,25 +80,25 @@ android {
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.google.zxing:core:3.5.0'
     implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.9.1'
+    implementation 'net.lingala.zip4j:zip4j:2.11.2'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
@@ -106,7 +106,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.7.3'
+    testImplementation 'org.robolectric:robolectric:4.9'
 }
 
 tasks.withType(SpotBugsTask) {

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -9,6 +10,7 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -63,6 +65,7 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
@@ -166,7 +169,12 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
 
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(Uri.parse(url));
-        startActivity(intent);
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.failedToOpenUrl, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
     }
 
 }

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

@@ -17,6 +17,7 @@ import com.google.zxing.common.BitMatrix;
 import java.lang.ref.WeakReference;
 
 import protect.card_locker.async.CompatCallable;
+import protect.card_locker.barcodes.Barcode;
 
 /**
  * This task will generate a barcode and load it into an ImageView.
@@ -38,7 +39,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
     private String cardId;
-    private final CatimaBarcode format;
+    private final Barcode format;
     private final int imageHeight;
     private final int imageWidth;
     private final boolean showFallback;
@@ -46,7 +47,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, TextView textView,
+            Barcode barcodeFormat, TextView textView,
             boolean showFallback, Runnable callback, boolean roundCornerPadding
     ) {
         mContext = context;
@@ -90,68 +91,8 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         this.showFallback = showFallback;
     }
 
-    private int getMaxWidth(CatimaBarcode format) {
-        switch (format.format()) {
-            // 2D barcodes
-            case AZTEC:
-            case DATA_MATRIX:
-            case MAXICODE:
-            case PDF_417:
-            case QR_CODE:
-                return MAX_WIDTH_2D;
-
-            // 1D barcodes:
-            case CODABAR:
-            case CODE_39:
-            case CODE_93:
-            case CODE_128:
-            case EAN_8:
-            case EAN_13:
-            case ITF:
-            case UPC_A:
-            case UPC_E:
-            case RSS_14:
-            case RSS_EXPANDED:
-            case UPC_EAN_EXTENSION:
-            default:
-                return MAX_WIDTH_1D;
-        }
-    }
-
-    private String getFallbackString(CatimaBarcode format) {
-        switch (format.format()) {
-            // 2D barcodes
-            case AZTEC:
-                return "AZTEC";
-            case DATA_MATRIX:
-                return "DATA_MATRIX";
-            case PDF_417:
-                return "PDF_417";
-            case QR_CODE:
-                return "QR_CODE";
-
-            // 1D barcodes:
-            case CODABAR:
-                return "C0C";
-            case CODE_39:
-                return "CODE_39";
-            case CODE_93:
-                return "CODE_93";
-            case CODE_128:
-                return "CODE_128";
-            case EAN_8:
-                return "32123456";
-            case EAN_13:
-                return "5901234123457";
-            case ITF:
-                return "1003";
-            case UPC_A:
-                return "123456789012";
-            case UPC_E:
-                return "0123456";
-            default:
-                throw new IllegalArgumentException("No fallback known for this barcode type");
-        }
+    private int getMaxWidth(Barcode format) {
+        return format.is2D() ? MAX_WIDTH_2D : MAX_WIDTH_1D;
     }
 
     private Bitmap generate() {
@@ -227,7 +168,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
                 if (showFallback && !Thread.currentThread().isInterrupted()) {
                     Log.i(TAG, "Barcode generation failed, generating fallback...");
-                    cardId = getFallbackString(format);
+                    cardId = format.exampleValue();
                     bitmap = generate();
                     return bitmap;
                 }

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

@@ -18,6 +18,9 @@ import java.util.ArrayList;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
+import protect.card_locker.barcodes.Barcode;
+import protect.card_locker.barcodes.BarcodeFactory;
+import protect.card_locker.barcodes.BarcodeWithValue;
 
 /**
  * This activity is callable and will allow a user to enter
@@ -86,10 +89,10 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
 
     private void generateBarcodes(String value) {
         // Update barcodes
-        ArrayList<CatimaBarcodeWithValue> barcodes = new ArrayList<>();
-        for (BarcodeFormat barcodeFormat : CatimaBarcode.barcodeFormats) {
-            CatimaBarcode catimaBarcode = CatimaBarcode.fromBarcode(barcodeFormat);
-            barcodes.add(new CatimaBarcodeWithValue(catimaBarcode, value));
+        ArrayList<BarcodeWithValue> barcodes = new ArrayList<>();
+        for (BarcodeFormat barcodeFormat : BarcodeFactory.getAllFormats()) {
+            Barcode catimaBarcode = BarcodeFactory.fromBarcode(barcodeFormat);
+            barcodes.add(new BarcodeWithValue(catimaBarcode, value));
         }
         mAdapter.setBarcodes(barcodes);
     }
@@ -118,7 +121,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
 
     @Override
     public void onRowClicked(int inputPosition, View view) {
-        CatimaBarcodeWithValue barcodeWithValue = mAdapter.getItem(inputPosition);
+        BarcodeWithValue barcodeWithValue = mAdapter.getItem(inputPosition);
         CatimaBarcode catimaBarcode = barcodeWithValue.catimaBarcode();
 
         if (!mAdapter.isValid(view)) {

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

@@ -13,8 +13,11 @@ import android.widget.TextView;
 import java.util.ArrayList;
 
 import protect.card_locker.async.TaskHandler;
+import protect.card_locker.barcodes.Barcode;
+import protect.card_locker.barcodes.BarcodeFactory;
+import protect.card_locker.barcodes.BarcodeWithValue;
 
-public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue> {
+public class BarcodeSelectorAdapter extends ArrayAdapter<BarcodeWithValue> {
     private static final String TAG = "Catima";
 
     private final TaskHandler mTasks = new TaskHandler();
@@ -29,12 +32,12 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         void onRowClicked(int inputPosition, View view);
     }
 
-    public BarcodeSelectorAdapter(Context context, ArrayList<CatimaBarcodeWithValue> barcodes, BarcodeSelectorListener barcodeSelectorListener) {
+    public BarcodeSelectorAdapter(Context context, ArrayList<BarcodeWithValue> barcodes, BarcodeSelectorListener barcodeSelectorListener) {
         super(context, 0, barcodes);
         mListener = barcodeSelectorListener;
     }
 
-    public void setBarcodes(ArrayList<CatimaBarcodeWithValue> barcodes) {
+    public void setBarcodes(ArrayList<BarcodeWithValue> barcodes) {
         clear();
         addAll(barcodes);
         notifyDataSetChanged();
@@ -43,9 +46,9 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        CatimaBarcodeWithValue catimaBarcodeWithValue = getItem(position);
-        CatimaBarcode catimaBarcode = catimaBarcodeWithValue.catimaBarcode();
-        String value = catimaBarcodeWithValue.value();
+        BarcodeWithValue barcodeWithValue = getItem(position);
+        Barcode catimaBarcode = barcodeWithValue.barcode();
+        String value = barcodeWithValue.value();
 
         ViewHolder viewHolder;
         if (convertView == null) {
@@ -73,7 +76,7 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
     }
 
     private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
-        final CatimaBarcode format = CatimaBarcode.fromName(formatType);
+        final Barcode format = BarcodeFactory.fromName(formatType);
 
         image.setImageBitmap(null);
         image.setClipToOutline(true);

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

@@ -8,7 +8,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
@@ -39,24 +38,31 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
         setSupportActionBar(toolbar);
 
         // If there are no cards, bail
-        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
+        int cardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+        if (cardCount == 0) {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
+        // If all cards are archived, bail
+        if (DBHelper.getArchivedCardsCount(mDatabase) == cardCount) {
+            Toast.makeText(this, R.string.noUnarchivedCardsMessage, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
         final RecyclerView cardList = findViewById(R.id.list);
         GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
         if (layoutManager != null) {
             layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
         }
 
-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
         mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
         cardList.setAdapter(mAdapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 

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

@@ -16,13 +16,13 @@ import android.service.controls.actions.ControlAction;
 import android.service.controls.templates.StatelessTemplate;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 @RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {
 
@@ -40,7 +40,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
     @NonNull
     @Override
     public Flow.Publisher<Control> createPublisherForAllAvailable() {
-        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
         return subscriber -> {
             while (loyaltyCardCursor.moveToNext()) {
                 LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);

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

@@ -19,10 +19,7 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // XXX splash screen activity has to do this after installing splash screen before view inflate
-        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
-            Utils.patchColors(this);
-        }
+        Utils.patchColors(this);
     }
 
     @Override

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

@@ -1,97 +0,0 @@
-package protect.card_locker;
-
-import com.google.zxing.BarcodeFormat;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class CatimaBarcode {
-    public static final List<BarcodeFormat> barcodeFormats = Collections.unmodifiableList(Arrays.asList(
-            BarcodeFormat.AZTEC,
-            BarcodeFormat.CODE_39,
-            BarcodeFormat.CODE_93,
-            BarcodeFormat.CODE_128,
-            BarcodeFormat.CODABAR,
-            BarcodeFormat.DATA_MATRIX,
-            BarcodeFormat.EAN_8,
-            BarcodeFormat.EAN_13,
-            BarcodeFormat.ITF,
-            BarcodeFormat.PDF_417,
-            BarcodeFormat.QR_CODE,
-            BarcodeFormat.UPC_A,
-            BarcodeFormat.UPC_E
-    ));
-
-    public static final List<String> barcodePrettyNames = Collections.unmodifiableList(Arrays.asList(
-            "Aztec",
-            "Code 39",
-            "Code 93",
-            "Code 128",
-            "Codabar",
-            "Data Matrix",
-            "EAN 8",
-            "EAN 13",
-            "ITF",
-            "PDF 417",
-            "QR Code",
-            "UPC A",
-            "UPC E"
-    ));
-
-    private final BarcodeFormat mBarcodeFormat;
-
-    private CatimaBarcode(BarcodeFormat barcodeFormat) {
-        mBarcodeFormat = barcodeFormat;
-    }
-
-    public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
-        return new CatimaBarcode(barcodeFormat);
-    }
-
-    public static CatimaBarcode fromName(String name) {
-        return new CatimaBarcode(BarcodeFormat.valueOf(name));
-    }
-
-    public static CatimaBarcode fromPrettyName(String prettyName) {
-        try {
-            return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
-        } catch (IndexOutOfBoundsException e) {
-            throw new IllegalArgumentException("No barcode type with pretty name " + prettyName + " known!");
-        }
-    }
-
-    public boolean isSupported() {
-        return barcodeFormats.contains(mBarcodeFormat);
-    }
-
-    public boolean isSquare() {
-        return mBarcodeFormat == BarcodeFormat.AZTEC
-                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
-                || mBarcodeFormat == BarcodeFormat.MAXICODE
-                || mBarcodeFormat == BarcodeFormat.QR_CODE;
-    }
-
-    public boolean hasInternalPadding() {
-        return mBarcodeFormat == BarcodeFormat.PDF_417
-                || mBarcodeFormat == BarcodeFormat.QR_CODE;
-    }
-
-    public BarcodeFormat format() {
-        return mBarcodeFormat;
-    }
-
-    public String name() {
-        return mBarcodeFormat.name();
-    }
-
-    public String prettyName() {
-        int index = barcodeFormats.indexOf(mBarcodeFormat);
-
-        if (index == -1 || index >= barcodePrettyNames.size()) {
-            return mBarcodeFormat.name();
-        }
-
-        return barcodePrettyNames.get(index);
-    }
-}

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

@@ -1,19 +0,0 @@
-package protect.card_locker;
-
-public class CatimaBarcodeWithValue {
-    private final CatimaBarcode mCatimaBarcode;
-    private final String mValue;
-
-    public CatimaBarcodeWithValue(CatimaBarcode catimaBarcode, String value) {
-        mCatimaBarcode = catimaBarcode;
-        mValue = value;
-    }
-
-    public CatimaBarcode catimaBarcode() {
-        return mCatimaBarcode;
-    }
-
-    public String value() {
-        return mValue;
-    }
-}

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

@@ -18,10 +18,12 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
+import protect.card_locker.barcodes.Barcode;
+
 public class DBHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 14;
+    public static final int DATABASE_VERSION = 15;
 
     public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
@@ -45,6 +47,7 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
         public static final String ZOOM_LEVEL = "zoomlevel";
+        public static final String ARCHIVE_STATUS = "archive";
     }
 
     public static class LoyaltyCardDbIdsGroups {
@@ -71,6 +74,12 @@ public class DBHelper extends SQLiteOpenHelper {
         Descending
     }
 
+    public enum LoyaltyCardArchiveFilter {
+        All,
+        Archived,
+        Unarchived
+    }
+
     public DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -97,7 +106,8 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100', " +
+                LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
 
         // create associative table for cards in groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
@@ -302,6 +312,10 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' ");
         }
+        if (oldVersion < 15 && newVersion >= 15) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' ");
+        }
     }
 
     private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -348,8 +362,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final String store, final String note, final Date expiry,
             final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
-            final int starStatus, final Long lastUsed) {
+            final String barcodeId, final Barcode barcodeType, final Integer headerColor,
+            final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -365,6 +379,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
         long id = database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
@@ -379,8 +394,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final int id, final String store, final String note,
             final Date expiry, final BigDecimal balance, final Currency balanceType,
-            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
-            final Integer headerColor, final int starStatus, final Long lastUsed) {
+            final String cardId, final String barcodeId, final Barcode barcodeType,
+            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -397,6 +412,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
         database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
@@ -411,8 +427,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public static boolean updateLoyaltyCard(
             SQLiteDatabase database, final int id, final String store, final String note,
             final Date expiry, final BigDecimal balance, final Currency balanceType,
-            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
-            final Integer headerColor) {
+            final String cardId, final String barcodeId, final Barcode barcodeType,
+            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -426,6 +442,10 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
+
         int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
 
@@ -438,6 +458,15 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsUpdated == 1);
     }
 
+    public static boolean updateLoyaltyCardArchiveStatus(SQLiteDatabase database, final int id, final int archiveStatus) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(id));
+        return (rowsUpdated == 1);
+    }
+
     public static boolean updateLoyaltyCardStarStatus(SQLiteDatabase database, final int id, final int starStatus) {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
@@ -549,9 +578,35 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsDeleted == 1);
     }
 
+    public static int getArchivedCardsCount(SQLiteDatabase database) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIds.TABLE,
+                whereAttrs(LoyaltyCardDbIds.ARCHIVE_STATUS), withArgs(1));
+    }
+
+    public static int getArchivedCardsCount(SQLiteDatabase database, final String groupName) {
+        Cursor data = database.rawQuery(
+                "select * from " + LoyaltyCardDbIds.TABLE + " c " +
+                        " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " cg " +
+                        " ON c." + LoyaltyCardDbIds.ID + " = cg." + LoyaltyCardDbIdsGroups.cardID +
+                " where " + LoyaltyCardDbIds.ARCHIVE_STATUS + " = 1" +
+                " AND " + LoyaltyCardDbIdsGroups.groupID + "= ?",
+                withArgs(groupName)
+        );
+
+        int count = data.getCount();
+
+        data.close();
+        return count;
+    }
+
     public static Cursor getLoyaltyCardCursor(SQLiteDatabase database) {
         // An empty string will match everything
-        return getLoyaltyCardCursor(database, "");
+        return getLoyaltyCardCursor(database, LoyaltyCardArchiveFilter.All);
+    }
+
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, LoyaltyCardArchiveFilter archiveFilter) {
+        // An empty string will match everything
+        return getLoyaltyCardCursor(database, "", archiveFilter);
     }
 
     /**
@@ -560,8 +615,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param filter
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter) {
-        return getLoyaltyCardCursor(database, filter, null);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, LoyaltyCardArchiveFilter archiveFilter) {
+        return getLoyaltyCardCursor(database, filter, null, archiveFilter);
     }
 
     /**
@@ -571,8 +626,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param group
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group) {
-        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group, LoyaltyCardArchiveFilter archiveFilter) {
+        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending, archiveFilter);
     }
 
     /**
@@ -583,7 +638,7 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param order
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction, LoyaltyCardArchiveFilter archiveFilter) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
@@ -606,6 +661,11 @@ public class DBHelper extends SQLiteOpenHelper {
             }
         }
 
+        String archiveFilterString = "";
+        if (archiveFilter != LoyaltyCardArchiveFilter.All) {
+            archiveFilterString = " AND " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " = " + (archiveFilter.equals(LoyaltyCardArchiveFilter.Unarchived) ? 0 : 1);
+        }
+
         String orderField = getFieldForOrder(order);
 
         return database.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
@@ -613,7 +673,9 @@ public class DBHelper extends SQLiteOpenHelper {
                 " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
                 (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                archiveFilterString +
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " ASC, " +
+                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
                 " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
                 LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
                 LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +

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

@@ -1,6 +1,7 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
@@ -43,8 +44,18 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         inputHolder.mName.setText(group._id);
 
         int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
-        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
+        int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id);
 
+        Resources resources = mContext.getResources();
+
+        String cardCountText;
+        if (archivedCardCount > 0) {
+            cardCountText = resources.getQuantityString(R.plurals.groupCardCountWithArchived, groupCardCount, groupCardCount, archivedCardCount);
+        }  else {
+            cardCountText = resources.getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount);
+        }
+
+        inputHolder.mCardCount.setText(cardCountText);
         inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
         inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
 

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

@@ -16,6 +16,12 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.ActionBar;
@@ -23,15 +29,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;

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

@@ -15,6 +15,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import protect.card_locker.barcodes.Barcode;
+import protect.card_locker.barcodes.BarcodeFactory;
+
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
     private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
@@ -61,7 +64,7 @@ public class ImportURIHelper {
 
         try {
             // These values are allowed to be null
-            CatimaBarcode barcodeType = null;
+            Barcode barcodeType = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
             Currency balanceType = null;
@@ -95,7 +98,7 @@ public class ImportURIHelper {
 
             String unparsedBarcodeType = kv.get(BARCODE_TYPE);
             if (unparsedBarcodeType != null && !unparsedBarcodeType.equals("")) {
-                barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
+                barcodeType = BarcodeFactory.fromName(unparsedBarcodeType);
             }
 
             String unparsedBalance = kv.get(BALANCE);
@@ -116,7 +119,7 @@ public class ImportURIHelper {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100);
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100,0);
         } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }

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

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

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

@@ -9,6 +9,8 @@ import java.util.Currency;
 import java.util.Date;
 
 import androidx.annotation.Nullable;
+import protect.card_locker.barcodes.Barcode;
+import protect.card_locker.barcodes.BarcodeFactory;
 
 public class LoyaltyCard implements Parcelable {
     public final int id;
@@ -23,19 +25,21 @@ public class LoyaltyCard implements Parcelable {
     public final String barcodeId;
 
     @Nullable
-    public final CatimaBarcode barcodeType;
+    public final Barcode barcodeType;
 
     @Nullable
     public final Integer headerColor;
 
     public final int starStatus;
+    public final int archiveStatus;
     public final long lastUsed;
     public int zoomLevel;
 
     public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                        final BigDecimal balance, final Currency balanceType, final String cardId,
-                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel) {
+                       @Nullable final String barcodeId, @Nullable final Barcode barcodeType,
+                       @Nullable final Integer headerColor, final int starStatus,
+                       final long lastUsed, final int zoomLevel, final int archiveStatus) {
         this.id = id;
         this.store = store;
         this.note = note;
@@ -49,6 +53,7 @@ public class LoyaltyCard implements Parcelable {
         this.starStatus = starStatus;
         this.lastUsed = lastUsed;
         this.zoomLevel = zoomLevel;
+        this.archiveStatus = archiveStatus;
     }
 
     protected LoyaltyCard(Parcel in) {
@@ -62,12 +67,13 @@ public class LoyaltyCard implements Parcelable {
         cardId = in.readString();
         barcodeId = in.readString();
         String tmpBarcodeType = in.readString();
-        barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
+        barcodeType = !tmpBarcodeType.isEmpty() ? BarcodeFactory.fromName(tmpBarcodeType) : null;
         int tmpHeaderColor = in.readInt();
         headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
         starStatus = in.readInt();
         lastUsed = in.readLong();
         zoomLevel = in.readInt();
+        archiveStatus = in.readInt();
     }
 
     @Override
@@ -85,6 +91,7 @@ public class LoyaltyCard implements Parcelable {
         parcel.writeInt(starStatus);
         parcel.writeLong(lastUsed);
         parcel.writeInt(zoomLevel);
+        parcel.writeInt(archiveStatus);
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
@@ -98,18 +105,19 @@ public class LoyaltyCard implements Parcelable {
         int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
         long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
         int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
+        int archived = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS));
 
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
 
-        CatimaBarcode barcodeType = null;
+        Barcode barcodeType = null;
         Currency balanceType = null;
         Date expiry = null;
         Integer headerColor = null;
 
         if (cursor.isNull(barcodeTypeColumn) == false) {
-            barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
+            barcodeType = BarcodeFactory.fromName(cursor.getString(barcodeTypeColumn));
         }
 
         if (cursor.isNull(balanceTypeColumn) == false) {
@@ -124,7 +132,7 @@ public class LoyaltyCard implements Parcelable {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel,archived);
     }
 
     @Override

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

@@ -16,12 +16,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.BlendModeColorFilterCompat;
-import androidx.core.graphics.BlendModeCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.card.MaterialCardView;
 
 import java.math.BigDecimal;
@@ -30,6 +24,10 @@ import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
@@ -131,7 +129,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         }
         inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
 
-        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
+        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -170,14 +168,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
         if (itemSelected(inputPosition)) {
-            inputHolder.mCardIcon.setVisibility(View.GONE);
             inputHolder.mTickIcon.setVisibility(View.VISIBLE);
             if (mCurrentSelectedIndex == inputPosition) {
                 resetCurrentIndex();
             }
         } else {
             inputHolder.mTickIcon.setVisibility(View.GONE);
-            inputHolder.mCardIcon.setVisibility(View.VISIBLE);
             if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
                 resetCurrentIndex();
             }
@@ -232,13 +228,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
         public MaterialCardView mRow, mIconLayout;
-        public ConstraintLayout mStar;
+        public ConstraintLayout mStar, mArchived;
         public View mDivider;
 
         private int mIconBackgroundColor;
 
+
+
         protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
             super(inputView);
             mRow = inputView.findViewById(R.id.row);
@@ -247,12 +245,13 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mNoteField = inputView.findViewById(R.id.note);
             mBalanceField = inputView.findViewById(R.id.balance);
             mExpiryField = inputView.findViewById(R.id.expiry);
-
             mIconLayout = inputView.findViewById(R.id.icon_layout);
             mCardIcon = inputView.findViewById(R.id.thumbnail);
             mStar = inputView.findViewById(R.id.star);
             mStarBackground = inputView.findViewById(R.id.star_background);
             mStarBorder = inputView.findViewById(R.id.star_border);
+            mArchived = inputView.findViewById(R.id.archivedIcon);
+            mArchivedBackground = inputView.findViewById(R.id.archive_background);
             mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
             inputView.setOnLongClickListener(view -> {
                 inputListener.onRowClicked(getAdapterPosition());
@@ -287,10 +286,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 mDivider.setVisibility(View.VISIBLE);
                 mBalanceField.setVisibility(View.VISIBLE);
                 Drawable balanceIcon = mBalanceField.getCompoundDrawables()[0];
-                balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
-                mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
-                if (mDarkModeEnabled) {
-                    balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                if (balanceIcon != null) {
+                    balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
+                    mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
+                    if (mDarkModeEnabled) {
+                        balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                    }
                 }
                 mBalanceField.setText(Utils.formatBalance(mContext, balance, balanceType));
                 mBalanceField.setTextSize(size);
@@ -307,21 +308,25 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 mDivider.setVisibility(View.VISIBLE);
                 mExpiryField.setVisibility(View.VISIBLE);
                 Drawable expiryIcon = mExpiryField.getCompoundDrawables()[0];
-                expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
-                mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
-                if (Utils.hasExpired(expiry)) {
-                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
-                    mExpiryField.setTextColor(Color.RED);
-                } else if (mDarkModeEnabled) {
-                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                if (expiryIcon != null) {
+                    expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
+                    mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+                    if (Utils.hasExpired(expiry)) {
+                        expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                    } else if (mDarkModeEnabled) {
+                        expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                    }
                 }
                 mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+                if (Utils.hasExpired(expiry)) {
+                    mExpiryField.setTextColor(Color.RED);
+                }
                 mExpiryField.setTextSize(size);
             }
             mExpiryField.requestLayout();
         }
 
-        public void toggleStar(boolean enable, boolean colorByTheme) {
+        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, boolean colorByTheme) {
             /* the below code does not work in android 5! hence the change of drawable instead
             boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
             Drawable borderDrawable = mStarBorder.getDrawable().mutate();
@@ -335,20 +340,33 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             if (colorByTheme) {
                 dark = !mDarkModeEnabled;
             }
+
             if (dark) {
                 mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
                 mStarBackground.setImageResource(R.drawable.ic_starred_black);
+                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24_black);
             } else {
                 mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
                 mStarBackground.setImageResource(R.drawable.ic_starred_white);
+                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24);
             }
-            if (enable) {
+
+            if (enableStar) {
                 mStar.setVisibility(View.VISIBLE);
-            } else {
+            } else{
                 mStar.setVisibility(View.GONE);
             }
+
+            if (enableArchive) {
+                mArchived.setVisibility(View.VISIBLE);
+            } else{
+                mArchived.setVisibility(View.GONE);
+            }
+
             mStarBorder.invalidate();
             mStarBackground.invalidate();
+            mArchivedBackground.invalidate();
+
         }
 
         public void setIconBackgroundColor(int color) {

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

@@ -5,10 +5,10 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -51,6 +51,7 @@ import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -75,9 +76,9 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.fragment.app.DialogFragment;
-import androidx.palette.graphics.Palette;
-
 import protect.card_locker.async.TaskHandler;
+import protect.card_locker.barcodes.Barcode;
+import protect.card_locker.barcodes.BarcodeFactory;
 
 public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
@@ -108,6 +109,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private static final int PERMISSION_REQUEST_CAMERA_IMAGE_ICON = 102;
 
     public static final String BUNDLE_ID = "id";
+    public static final String BUNDLE_DUPLICATE_ID = "duplicateId";
     public static final String BUNDLE_UPDATE = "update";
     public static final String BUNDLE_CARDID = "cardId";
     public static final String BUNDLE_BARCODEID = "barcodeId";
@@ -117,6 +119,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     TabLayout tabs;
 
     ImageView thumbnail;
+    ImageView thumbnailEditIcon;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
     ChipGroup groupsChips;
@@ -140,6 +143,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    boolean duplicateFromLoyaltyCardId;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -202,10 +206,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 (Currency) (fieldName == LoyaltyCardField.balanceType ? value : loyaltyCard.balanceType),
                 (String) (fieldName == LoyaltyCardField.cardId ? value : loyaltyCard.cardId),
                 (String) (fieldName == LoyaltyCardField.barcodeId ? value : loyaltyCard.barcodeId),
-                (CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
+                (Barcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
                 (Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
                 (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus),
-                Utils.getUnixTime(), 100
+                0, // Unimportant, always set to null in doSave so the DB updates it to the current timestamp
+                100, // Unimportant, not updated in doSave, defaults to 100 for new cards
+                (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
         );
     }
 
@@ -223,6 +229,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt(BUNDLE_ID) : 0;
         updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
+        duplicateFromLoyaltyCardId = b != null && b.getBoolean(BUNDLE_DUPLICATE_ID, false);
 
         cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
         barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
@@ -313,6 +320,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         tabs = findViewById(R.id.tabs);
         thumbnail = findViewById(R.id.thumbnail);
+        thumbnailEditIcon = findViewById(R.id.thumbnailEditIcon);
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
         groupsChips = findViewById(R.id.groupChips);
@@ -398,11 +406,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 try {
-                    BigDecimal balance = Utils.parseCurrency(s.toString(), Utils.currencyHasDecimals(tempLoyaltyCard.balanceType));
+                    BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
                     updateTempState(LoyaltyCardField.balance, balance);
                     validBalance = true;
-
-                } catch (NumberFormatException e) {
+                } catch (ParseException e) {
                     validBalance = false;
                     e.printStackTrace();
                 }
@@ -548,13 +555,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                         updateTempState(LoyaltyCardField.barcodeType, null);
                     } else {
                         try {
-                            CatimaBarcode barcodeFormat = CatimaBarcode.fromPrettyName(s.toString());
-
-                            updateTempState(LoyaltyCardField.barcodeType, barcodeFormat);
-
-                            if (!barcodeFormat.isSupported()) {
-                                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
-                            }
+                            updateTempState(LoyaltyCardField.barcodeType, barcodeTypeField.getTag());
                         } catch (IllegalArgumentException e) {
                         }
                     }
@@ -749,9 +750,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         onResuming = true;
 
-
         if (tempLoyaltyCard == null) {
-            if (updateLoyaltyCard) {
+            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
                 tempLoyaltyCard = DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId);
                 if (tempLoyaltyCard == null) {
                     Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
@@ -769,7 +769,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 }
             } else {
                 // New card, use default values
-                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100);
+                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100,0);
 
             }
         }
@@ -777,7 +777,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         if (!initDone) {
             if (updateLoyaltyCard) {
                 setTitle(R.string.editCardTitle);
+            } else {
+                setTitle(R.string.addCardTitle);
+            }
 
+            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
                 if (!mFrontImageUnsaved && !croppedFrontImage() && !mFrontImageRemoved) {
                     setCardImage(cardImageFront, Utils.retrieveCardImage(this, tempLoyaltyCard.id, ImageLocationType.front), true);
                 }
@@ -812,7 +816,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
         cardIdFieldView.setText(tempLoyaltyCard.cardId);
         barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
-        barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.prettyName() : getString(R.string.noBarcode));
+        setbarcodeTypeField(tempLoyaltyCard.barcodeType);
 
         if (groupsChips.getChildCount() == 0) {
             List<Group> existingGroups = DBHelper.getGroups(mDatabase);
@@ -858,18 +862,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
         }
 
-        // It can't be null because we set it in updateTempState but SpotBugs insists it can be
-        // NP_NULL_ON_SOME_PATH: Possible null pointer dereference
-        if (tempLoyaltyCard.headerColor != null) {
-            thumbnail.setOnClickListener(new ChooseCardImage());
-        }
-
         // Update from intent
         if (barcodeType != null) {
             try {
-                barcodeTypeField.setText(CatimaBarcode.fromName(barcodeType).prettyName());
+                Barcode barcode = BarcodeFactory.fromName(barcodeType);
+                setbarcodeTypeField(barcode);
             } catch (IllegalArgumentException e) {
-                barcodeTypeField.setText(getString(R.string.noBarcode));
+                setbarcodeTypeField(null);
             }
         }
 
@@ -910,13 +909,28 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         generateIcon(storeFieldEdit.getText().toString());
 
+        // It can't be null because we set it in updateTempState but SpotBugs insists it can be
+        // NP_NULL_ON_SOME_PATH: Possible null pointer dereference and
+        // NP_NULL_PARAM_DEREF: Method call passes null for non-null parameter
+        Integer headerColor = tempLoyaltyCard.headerColor;
+        if (headerColor != null) {
+            thumbnail.setOnClickListener(new ChooseCardImage());
+            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
+        }
+
         onResuming = false;
     }
 
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            updateTempState(LoyaltyCardField.headerColor, Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary));
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary);
+
+            updateTempState(LoyaltyCardField.headerColor, headerColor);
+
+            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
         } else {
             Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
         }
@@ -932,6 +946,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
     }
 
+    private void setbarcodeTypeField(Barcode barcode) {
+        barcodeTypeField.setTag(barcode);
+        barcodeTypeField.setText(barcode != null ? barcode.prettyName() : getString(R.string.noBarcode));
+    }
+
     protected static void formatExpiryField(Context context, EditText expiryField, Date expiry) {
         expiryField.setTag(expiry);
 
@@ -960,16 +979,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
         if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            try {
-                if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
-                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
-                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+            if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
+            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
+            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
             }
         }
     }
@@ -1098,6 +1113,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                         public void onColorSelected(int dialogId, int color) {
                             updateTempState(LoyaltyCardField.headerColor, color);
 
+                            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE);
+                            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK);
+
                             // Unset image if set
                             thumbnail.setTag(null);
 
@@ -1165,7 +1183,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
                 Intent i = new Intent(Intent.ACTION_PICK);
                 i.setType("image/*");
-                mPhotoPickerLauncher.launch(i);
+
+                try {
+                    mPhotoPickerLauncher.launch(i);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "No activity found to handle intent", e);
+                }
+
                 return null;
             });
 
@@ -1195,6 +1220,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             callable.call();
                         } catch (Exception e) {
                             e.printStackTrace();
+
+                            // Rethrow as NoSuchElementException
+                            // This isn't really true, but a View.OnClickListener doesn't allow throwing other types
+                            throw new NoSuchElementException(e.getMessage());
                         }
                     })
                     .show();
@@ -1228,7 +1257,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             int day = c.get(Calendar.DAY_OF_MONTH);
 
             // Create a new instance of DatePickerDialog and return it
-            return new DatePickerDialog(getActivity(), this, year, month, day);
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(), this, year, month, day);
+            datePickerDialog.getDatePicker().setMinDate(getMinDateOfDatePicker());
+            return datePickerDialog;
+        }
+
+        private long getMinDateOfDatePicker()
+        {
+            Calendar minDateCalendar = Calendar.getInstance();
+            minDateCalendar.set(1970, 0, 1);
+            return minDateCalendar.getTimeInMillis();
         }
 
         public void onDateSet(DatePicker view, int year, int month, int day) {
@@ -1282,41 +1320,40 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             selectedGroups.add((Group) chip.getTag());
         }
 
-        if (updateLoyaltyCard) {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
-            try {
-                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
-                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
-                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
+        // Both update and new card save with lastUsed set to null
+        // This makes the DBHelper set it to the current date
+        // So that new and edited card are always on top when sorting by recently used
+        if (updateLoyaltyCard) {
+            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, tempLoyaltyCard.starStatus, null, tempLoyaltyCard.archiveStatus);
         } else {
-            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed);
-            try {
-                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
-                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
-                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
+            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, null, 0);
         }
 
+        try {
+            Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
+            Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
+            Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        Log.i(TAG, "Set " + loyaltyCardId + " to " + cardId + " (update: " + updateLoyaltyCard + ")");
+
         DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, selectedGroups);
 
         ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
 
+        if (duplicateFromLoyaltyCardId) {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            startActivity(intent);
+        }
+
         finish();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (updateLoyaltyCard) {
-            getMenuInflater().inflate(R.menu.card_update_menu, menu);
-        } else {
-            getMenuInflater().inflate(R.menu.card_add_menu, menu);
-        }
+        getMenuInflater().inflate(R.menu.card_add_menu, menu);
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -1325,30 +1362,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch (id) {
-            case android.R.id.home:
-                askBeforeQuitIfChanged();
-                break;
-
-            case R.id.action_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.deleteTitle);
-                builder.setMessage(R.string.deleteConfirmation);
-                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    Log.e(TAG, "Deleting card: " + loyaltyCardId);
-
-                    DBHelper.deleteLoyaltyCard(mDatabase, LoyaltyCardEditActivity.this, loyaltyCardId);
-
-                    ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
-
-                    finish();
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
+        if (id == android.R.id.home) {
+            askBeforeQuitIfChanged();
+            return true;
         }
 
         return super.onOptionsItemSelected(item);

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

@@ -11,5 +11,6 @@ public enum LoyaltyCardField {
     barcodeId,
     barcodeType,
     headerColor,
-    starStatus
+    starStatus,
+    archiveStatus
 }

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

@@ -3,9 +3,6 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
-
-import com.google.android.material.color.DynamicColors;
-
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
@@ -8,10 +9,15 @@ 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;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
@@ -19,7 +25,6 @@ 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;
@@ -31,11 +36,26 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+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.widget.TextViewCompat;
+
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.color.MaterialColors;
+import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -43,21 +63,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-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.ContextCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.NestedScrollView;
-import androidx.core.widget.TextViewCompat;
-
 import protect.card_locker.async.TaskHandler;
+import protect.card_locker.barcodes.Barcode;
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements GestureDetector.OnGestureListener {
@@ -68,14 +75,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     CoordinatorLayout coordinatorLayout;
     ConstraintLayout mainLayout;
     TextView cardIdFieldView;
-    BottomSheetBehavior behavior;
-    LinearLayout bottomSheet;
-    NestedScrollView bottomSheetContentWrapper;
-    ImageView bottomSheetButton;
-    TextView noteView;
-    TextView groupsView;
-    TextView balanceView;
-    TextView expiryView;
+    BottomAppBar bottomAppBar;
+    ImageButton bottomAppBarInfoButton;
+    ImageButton bottomAppBarPreviousButton;
+    ImageButton bottomAppBarNextButton;
     AppCompatTextView storeName;
     ImageButton maximizeButton;
     ImageView mainImage;
@@ -84,10 +87,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     View collapsingToolbarLayout;
     AppBarLayout appBarLayout;
     ImageView iconImage;
+    Toolbar portraitToolbar;
     Toolbar landscapeToolbar;
 
     int loyaltyCardId;
+    ArrayList<Integer> cardList;
+
     LoyaltyCard loyaltyCard;
+    List<Group> loyaltyCardGroups;
     boolean rotationEnabled;
     SQLiteDatabase database;
     ImportURIHelper importURIHelper;
@@ -95,7 +102,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     String cardIdString;
     String barcodeIdString;
-    CatimaBarcode format;
+    Barcode format;
 
     FloatingActionButton editButton;
 
@@ -111,13 +118,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     int mainImageIndex = 0;
     List<ImageType> imageTypes;
     private ImageView[] dots;
-    boolean isBarcodeSupported = true;
-
-    int bottomSheetState;
 
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
-    static final String STATE_BOTTOMSHEET = "bottomSheetState";
 
     private final int HEADER_FILTER_ALPHA = 127;
 
@@ -150,8 +153,45 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     @Override
     public void onLongPress(MotionEvent e) {
-        // Also switch on long-press for accessibility
-        setMainImage(true, true);
+        openCurrentMainImageInGallery();
+    }
+
+    private void openCurrentMainImageInGallery() {
+        ImageType wantedImageType = imageTypes.get(mainImageIndex);
+
+        File file = null;
+
+        switch (wantedImageType) {
+            case IMAGE_FRONT:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
+                break;
+            case IMAGE_BACK:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.back);
+                break;
+            case BARCODE:
+                Toast.makeText(this, R.string.barcodeLongPressMessage, Toast.LENGTH_SHORT).show();
+                return;
+            default:
+                // Empty default case for now to keep the spotBugsRelease job happy
+        }
+
+        // Do nothing if there is no file
+        if (file == null) {
+            Toast.makeText(this, R.string.failedToRetrieveImageFile, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW)
+                    .setDataAndType(FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID, file), "image/*")
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            startActivity(intent);
+        }
+        catch (ActivityNotFoundException e) {
+            // Display a toast message if an image viewer is not installed on device
+            Toast.makeText(this, R.string.failedLaunchingPhotoPicker, Toast.LENGTH_SHORT).show();
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -207,6 +247,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
+        cardList = b != null ? b.getIntegerArrayList("cardList") : null;
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
@@ -227,6 +268,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
         assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        wrappedIcon.mutate();
         if (dark) {
             DrawableCompat.setTint(wrappedIcon, Color.BLACK);
         } else {
@@ -249,16 +291,45 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            Bundle incomingIntentExtras = getIntent().getExtras();
+
+            if (incomingIntentExtras == null) {
+                Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            int transitionRight = incomingIntentExtras.getInt("transition_right", -1);
+            if (transitionRight == 1) {
+                // right side transition
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+            } else if (transitionRight == 0) {
+                // left side transition
+                overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+            }
+        }
+
         super.onCreate(savedInstanceState);
 
+        settings = new Settings(this);
+
+        String cardOrientation = settings.getCardViewOrientation();
+        if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_landscape_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        }
+
         if (savedInstanceState != null) {
             mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
             isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
-            bottomSheetState = savedInstanceState.getInt(STATE_BOTTOMSHEET);
         }
 
-        settings = new Settings(this);
-
         extractIntentFields(getIntent());
 
         setContentView(R.layout.loyalty_card_view_layout);
@@ -269,13 +340,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         coordinatorLayout = findViewById(R.id.coordinator_layout);
         mainLayout = findViewById(R.id.mainLayout);
         cardIdFieldView = findViewById(R.id.cardIdView);
-        bottomSheet = findViewById(R.id.bottom_sheet);
-        bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
-        bottomSheetButton = findViewById(R.id.bottomSheetButton);
-        noteView = findViewById(R.id.noteView);
-        groupsView = findViewById(R.id.groupsView);
-        balanceView = findViewById(R.id.balanceView);
-        expiryView = findViewById(R.id.expiryView);
         storeName = findViewById(R.id.storeName);
         maximizeButton = findViewById(R.id.maximizeButton);
         mainImage = findViewById(R.id.mainImage);
@@ -284,9 +348,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
         appBarLayout = findViewById(R.id.app_bar_layout);
+        bottomAppBar = findViewById(R.id.bottom_app_bar);
         iconImage = findViewById(R.id.icon_image);
+        portraitToolbar = findViewById(R.id.toolbar);
         landscapeToolbar = findViewById(R.id.toolbar_landscape);
 
+        bottomAppBarInfoButton = findViewById(R.id.button_show_info);
+        bottomAppBarPreviousButton = findViewById(R.id.button_previous);
+        bottomAppBarNextButton = findViewById(R.id.button_next);
+
         barcodeImageGenerationFinishedCallback = () -> {
             if (!(boolean) mainImage.getTag()) {
                 mainImage.setVisibility(View.GONE);
@@ -351,33 +421,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         });
         editButton.bringToFront();
 
-        behavior = BottomSheetBehavior.from(bottomSheet);
-        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-            @Override
-            public void onStateChanged(@NonNull View bottomSheet, int newState) {
-                changeUiToBottomSheetState(newState);
-            }
-
-            @Override
-            public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-            }
-        });
-
-        bottomSheetButton.setOnClickListener(v -> {
-            if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
-                behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            } else {
-                behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-            }
-        });
-
-        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) {
-                adjustLayoutHeights();
-            }
-        });
-
         appBarLayout.setOutlineProvider(new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
@@ -386,61 +429,144 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             }
         });
 
+        bottomAppBarInfoButton.setOnClickListener(view -> showInfoDialog());
+        bottomAppBarPreviousButton.setOnClickListener(view -> prevNextCard(false));
+        bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
+
         mGestureDetector = new GestureDetector(this, this);
         View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
         mainImage.setOnTouchListener(gestureTouchListener);
-    }
 
-    private void changeUiToBottomSheetState(int newState) {
-        if (newState == BottomSheetBehavior.STATE_DRAGGING) {
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
-            bottomSheetButton.setContentDescription(getString(R.string.hideMoreInfo));
-            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
-            bottomSheetButton.setContentDescription(getString(R.string.showMoreInfo));
-            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
-            if (!isFullscreen) {
-                editButton.show();
-            }
-
-            // Scroll bottomsheet content back to top
-            bottomSheetContentWrapper.setScrollY(0);
-        }
-        bottomSheetState = newState;
-    }
-
-    private void adjustLayoutHeights() {
-        // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
-        if (appBarLayout.getHeight() != 0 && iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
-            Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
-            iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
-                    CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
-            );
-        }
-        int bottomSheetHeight = getResources().getDisplayMetrics().heightPixels - appBarLayout.getHeight() - bottomSheetButton.getLayoutParams().height;
-        ViewGroup.LayoutParams params = bottomSheetContentWrapper.getLayoutParams();
-        if (params.height != bottomSheetHeight || params.width != LinearLayout.LayoutParams.MATCH_PARENT) {
-            // XXX android 5 - 9 has so much quirks with setting bottomSheetContent height
-            // just invalidate the wrapper works on 10 onward
-            // bottomSheetContentWrapper.invalidate();
-            // The below worked on android 5 but not 6, reloading the card then it breaks again on 6, entirely random :(
-            // for (int i = 0; i < bottomSheetContentWrapper.getChildCount(); i++) {
-            //     bottomSheetContentWrapper.getChildAt(i).invalidate();
-            // }
-            // since it's basically allergic to getting enlarged then shrunk again, and setting it at all when fullscreen makes no sense
-            if (!isFullscreen) {
-                Log.d("adjustLayoutHeights", "setting bottomSheet height from: " + params.height + " to: " + bottomSheetHeight);
-                bottomSheetContentWrapper.setLayoutParams(
-                        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, bottomSheetHeight)
+        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));
             }
+        });
+    }
+
+    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
+        if (spannableStringBuilder.length() > 0) {
+            spannableStringBuilder.append("\n\n");
+        }
+
+        return spannableStringBuilder;
+    }
+
+    private boolean hasBalance(LoyaltyCard loyaltyCard) {
+        return !loyaltyCard.balance.equals(new BigDecimal(0));
+    }
+
+    private void showInfoDialog() {
+        AlertDialog.Builder infoDialog = new AlertDialog.Builder(this);
+
+        TextView infoTitleView = new TextView(this);
+        infoTitleView.setPadding(20, 20, 20, 20);
+        infoTitleView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        infoTitleView.setText(loyaltyCard.store);
+        infoDialog.setCustomTitle(infoTitleView);
+        infoDialog.setTitle(loyaltyCard.store);
+
+        TextView infoTextview = new TextView(this);
+        infoTextview.setPadding(20, 0, 20, 0);
+        infoTextview.setAutoLinkMask(Linkify.ALL);
+        infoTextview.setTextIsSelectable(true);
+
+        SpannableStringBuilder infoText = new SpannableStringBuilder();
+        if (!loyaltyCard.note.isEmpty()) {
+            infoText.append(loyaltyCard.note);
+        }
+
+        if (loyaltyCardGroups.size() > 0) {
+            List<String> groupNames = new ArrayList<>();
+            for (Group group : loyaltyCardGroups) {
+                groupNames.add(group._id);
+            }
+
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
+        }
+
+        if (hasBalance(loyaltyCard)) {
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+        }
+
+        if (loyaltyCard.expiry != null) {
+            String formattedExpiry = DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry);
+
+            padSpannableString(infoText);
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
+                int start = infoText.length();
+
+                infoText.append(getString(R.string.expiryStateSentenceExpired, formattedExpiry));
+                infoText.setSpan(new ForegroundColorSpan(Color.RED), start, infoText.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+            } else {
+                infoText.append(getString(R.string.expiryStateSentence, formattedExpiry));
+            }
+        }
+
+        infoTextview.setText(infoText);
+
+        infoDialog.setView(infoTextview);
+        infoDialog.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+        infoDialog.create().show();
+    }
+
+    private void setBottomAppBarButtonState() {
+        if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.expiry != null) {
+            bottomAppBarInfoButton.setVisibility(View.VISIBLE);
+        } else {
+            bottomAppBarInfoButton.setVisibility(View.GONE);
+        }
+
+        if (cardList == null || cardList.size() == 1) {
+            bottomAppBarPreviousButton.setVisibility(View.GONE);
+            bottomAppBarNextButton.setVisibility(View.GONE);
+        } else {
+            bottomAppBarPreviousButton.setVisibility(View.VISIBLE);
+            bottomAppBarNextButton.setVisibility(View.VISIBLE);
         }
     }
 
+    private void prevNextCard(boolean next) {
+        // If we're in RTL layout, we want the "left" button to be "next" instead of "previous"
+        // So we swap next around
+        boolean transitionRight = next;
+        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+            next = !next;
+        }
+
+        int cardListPosition = cardList.indexOf(loyaltyCardId);
+
+        if (next) {
+            if (cardListPosition == cardList.size() - 1) {
+                cardListPosition = 0;
+            } else {
+                cardListPosition = cardListPosition + 1;
+            }
+        } else {
+            if (cardListPosition == 0) {
+                cardListPosition = cardList.size() - 1;
+            } else {
+                cardListPosition = cardListPosition - 1;
+            }
+        }
+
+        loyaltyCardId = cardList.get(cardListPosition);
+
+        // Restart activity with new card id and index
+        Intent intent = getIntent();
+        Bundle b = intent.getExtras();
+        b.putInt("id", loyaltyCardId);
+        b.putInt("transition_right", transitionRight ? 1 : 0);
+        intent.putExtras(b);
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
+    }
 
     @Override
     public void onNewIntent(Intent intent) {
@@ -454,7 +580,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     public void onSaveInstanceState(Bundle savedInstanceState) {
         savedInstanceState.putInt(STATE_IMAGEINDEX, mainImageIndex);
         savedInstanceState.putBoolean(STATE_FULLSCREEN, isFullscreen);
-        savedInstanceState.putInt(STATE_BOTTOMSHEET, bottomSheetState);
         super.onSaveInstanceState(savedInstanceState);
     }
 
@@ -496,6 +621,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
+
         setupOrientation();
 
         format = loyaltyCard.barcodeType;
@@ -507,56 +634,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                 1, TypedValue.COMPLEX_UNIT_SP);
 
-        if (loyaltyCard.note.length() > 0) {
-            noteView.setVisibility(View.VISIBLE);
-            noteView.setText(loyaltyCard.note);
-            noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            noteView.setVisibility(View.GONE);
-        }
-
-        List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
-
-        if (loyaltyCardGroups.size() > 0) {
-            List<String> groupNames = new ArrayList<>();
-            for (Group group : loyaltyCardGroups) {
-                groupNames.add(group._id);
-            }
-
-            groupsView.setVisibility(View.VISIBLE);
-            groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
-            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            groupsView.setVisibility(View.GONE);
-        }
-
-        if (!loyaltyCard.balance.equals(new BigDecimal(0))) {
-            balanceView.setVisibility(View.VISIBLE);
-            balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-            balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            balanceView.setVisibility(View.GONE);
-        }
-
-        if (loyaltyCard.expiry != null) {
-            expiryView.setVisibility(View.VISIBLE);
-
-            int expiryString = R.string.expiryStateSentence;
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(Color.RED);
-            }
-            expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            expiryView.setVisibility(View.GONE);
-        }
-        expiryView.setTag(loyaltyCard.expiry);
-
-        if (!isFullscreen) {
-            makeBottomSheetVisibleIfUseful();
-        }
-
         storeName.setText(loyaltyCard.store);
         storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
         TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
@@ -588,22 +665,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
         maximizeButton.setBackgroundColor(darkenedColor);
         minimizeButton.setBackgroundColor(darkenedColor);
-        bottomSheetButton.setBackgroundColor(darkenedColor);
+        bottomAppBar.setBackgroundColor(darkenedColor);
         maximizeButton.setColorFilter(textColor);
         minimizeButton.setColorFilter(textColor);
-        bottomSheetButton.setColorFilter(textColor);
         int complementaryColor = Utils.getComplementaryColor(darkenedColor);
         editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
         Drawable editButtonIcon = editButton.getDrawable();
         editButtonIcon.mutate();
-        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));
-        boolean darkMode = Utils.isDarkModeEnabled(this);
-        if (Utils.needsDarkForeground(complementaryColor)) {
-            editButtonIcon.setTint(darkMode ? colorOnPrimary : colorPrimary);
-        } else {
-            editButtonIcon.setTint(darkMode ? colorPrimary : colorOnPrimary);
-        }
+        editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
         editButton.setImageDrawable(editButtonIcon);
 
         Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
@@ -624,9 +693,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
+            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.home_arrow_back_white, backgroundNeedsDarkIcons));
         }
 
+        fixImageButtonColor(bottomAppBarInfoButton);
+        fixImageButtonColor(bottomAppBarPreviousButton);
+        fixImageButtonColor(bottomAppBarNextButton);
+        setBottomAppBarButtonState();
+
         // Make notification area light if dark icons are needed
         if (Build.VERSION.SDK_INT >= 23) {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
@@ -639,17 +713,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         // 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;
-
-            Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
-        } else if (format == null) {
-            isBarcodeSupported = false;
-        }
-
         imageTypes = new ArrayList<>();
 
-        if (isBarcodeSupported) {
+        if (format != null) {
             imageTypes.add(ImageType.BARCODE);
         }
 
@@ -663,16 +729,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.IMAGE_BACK);
         }
 
-        setDotIndicator(darkMode);
+        setDotIndicator(Utils.isDarkModeEnabled(this));
 
         setFullscreen(isFullscreen);
 
-        // restore bottomSheet UI states from changing orientation
-        changeUiToBottomSheetState(bottomSheetState);
-
         DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
     }
 
+    private void fixImageButtonColor(ImageButton imageButton) {
+        imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
+    }
+
     @Override
     public void onBackPressed() {
         if (isFullscreen) {
@@ -686,18 +753,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
-
-        // Always calculate lockscreen icon, it may need a black color
-        boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation();
-        MenuItem item = menu.findItem(R.id.action_lock_unlock);
-        setOrientatonLock(item, lockBarcodeScreenOrientation);
-        if (lockBarcodeScreenOrientation) {
-            item.setVisible(false);
-        }
-
-        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
         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);
@@ -721,46 +787,78 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch (id) {
-            case android.R.id.home:
+        if (id == android.R.id.home) {
+            finish();
+        } else if (id == R.id.action_share) {
+            try {
+                importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
+            } catch (UnsupportedEncodingException e) {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                e.printStackTrace();
+            }
+
+            return true;
+        } else if (id == R.id.action_duplicate) {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt("id", loyaltyCardId);
+            bundle.putBoolean("duplicateId", true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+
+            return true;
+        } else if (id == R.id.action_star_unstar) {
+            starred = !starred;
+            DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_archive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_unarchive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 0);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.unarchived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_delete) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.deleteTitle);
+            builder.setMessage(R.string.deleteConfirmation);
+            builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+                Log.e(TAG, "Deleting card: " + loyaltyCardId);
+
+                DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
+
+                ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
                 finish();
-                break;
+                dialog.dismiss();
+            });
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();
 
-            case R.id.action_share:
-                try {
-                    importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
-                } catch (UnsupportedEncodingException e) {
-                    Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-                return true;
-
-            case R.id.action_lock_unlock:
-                if (rotationEnabled) {
-                    setOrientatonLock(item, true);
-                } else {
-                    setOrientatonLock(item, false);
-                }
-                rotationEnabled = !rotationEnabled;
-                return true;
-
-            case R.id.action_star_unstar:
-                starred = !starred;
-                DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
-                invalidateOptionsMenu();
-                return true;
+            return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
     private void setupOrientation() {
-        Toolbar portraitToolbar = findViewById(R.id.toolbar);
-
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             Log.d(TAG, "Detected landscape mode");
-
             setTitle(loyaltyCard.store);
 
             collapsingToolbarLayout.setVisibility(View.GONE);
@@ -786,27 +884,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    private void setOrientatonLock(MenuItem item, boolean lock) {
-        if (lock) {
-
-            item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
-            item.setTitle(R.string.unlockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
-        } else {
-            item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
-            item.setTitle(R.string.lockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        }
-    }
-
-    private void makeBottomSheetVisibleIfUseful() {
-        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
-            bottomSheet.setVisibility(View.VISIBLE);
-        } else {
-            bottomSheet.setVisibility(View.GONE);
-        }
-    }
-
     private void drawBarcode(boolean addPadding) {
         mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
@@ -947,10 +1024,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             }
 
             // Hide toolbars
-            //
-            // Appbar needs to be invisible and have padding removed
-            // Or the barcode will be centered instead of on top of the screen
-            // Don't ask me why...
             appBarLayout.setVisibility(View.INVISIBLE);
             iconImage.setVisibility(View.INVISIBLE);
             collapsingToolbarLayout.setVisibility(View.GONE);
@@ -958,12 +1031,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Hide other UI elements
             cardIdFieldView.setVisibility(View.GONE);
-            bottomSheet.setVisibility(View.GONE);
-            behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            editButton.hide();
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            coordinatorLayout.removeView(bottomSheet);
+            bottomAppBar.setVisibility(View.GONE);
+            editButton.setVisibility(View.GONE);
 
             // Set Android to fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
@@ -991,15 +1060,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             }
 
             // Show appropriate toolbar
-            // And restore 24dp paddingTop for appBarLayout
             appBarLayout.setVisibility(View.VISIBLE);
             setupOrientation();
             iconImage.setVisibility(View.VISIBLE);
 
             // Show other UI elements
             cardIdFieldView.setVisibility(View.VISIBLE);
-            makeBottomSheetVisibleIfUseful();
-            editButton.show();
+            editButton.setVisibility(View.VISIBLE);
+            bottomAppBar.setVisibility(View.VISIBLE);
 
             // Unset fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
@@ -1007,11 +1075,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                             & ~View.SYSTEM_UI_FLAG_FULLSCREEN
             );
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            if (bottomSheet.getParent() != coordinatorLayout) {
-                coordinatorLayout.addView(bottomSheet);
-            }
         }
 
         Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + barcodeScaler.getProgress());

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

@@ -17,10 +17,20 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
@@ -32,6 +42,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -54,10 +65,13 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
     protected int selectedTab = 0;
     private RecyclerView mCardList;
-    private View mHelpText;
+    private View mHelpSection;
     private View mNoMatchingCardsText;
     private View mNoGroupCardsText;
 
+    private boolean mArchiveMode;
+    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";
+
     private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
     private ActivityResultLauncher<Intent> mSettingsLauncher;
 
@@ -142,7 +156,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
                 builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
                     for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                        Log.e(TAG, "Deleting card: " + loyaltyCard.id);
+                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);
 
                         DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
 
@@ -162,6 +176,44 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
                 return true;
             }
+            else if(inputItem.getItemId() == R.id.action_archive){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Archiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id,1);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_unarchive){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unarchiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id,0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_star){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Starring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_unstar){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unstarring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            }
 
             return false;
         }
@@ -175,15 +227,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
-        super.onCreate(inputSavedInstanceState);
+        extractIntentFields(getIntent());
         SplashScreen.installSplashScreen(this);
-        setTitle(R.string.app_name);
-        // XXX color patching has to be done again after setting splash screen
-        Utils.patchColors(this);
-        setContentView(R.layout.main_activity);
+        super.onCreate(inputSavedInstanceState);
+        if(!mArchiveMode) {
+            setTitle(R.string.app_name);
+            setContentView(R.layout.main_activity);
+        }
+        else{
+            setTitle(R.string.archiveList);
+            setContentView(R.layout.archive_activity);
+        }
+
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        if(mArchiveMode){
+            ActionBar actionBar = getSupportActionBar();
+            if (actionBar != null) {
+                actionBar.setDisplayHomeAsUpEnabled(true);
+            }
+        }
+
         mDatabase = new DBHelper(this).getWritableDatabase();
 
         TabLayout groupsTabLayout = findViewById(R.id.groups);
@@ -218,12 +283,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
 
-        mHelpText = findViewById(R.id.helpText);
+        mHelpSection = findViewById(R.id.helpSection);
         mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
         mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
         mCardList = findViewById(R.id.list);
 
-        mHelpText.setOnTouchListener(gestureTouchListener);
         mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
         mCardList.setOnTouchListener(gestureTouchListener);
         mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
@@ -342,21 +406,25 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         updateLoyaltyCardList(true);
         // End of active tab logic
 
-        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(v -> {
-            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
-            Bundle bundle = new Bundle();
-            if (selectedTab != 0) {
-                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
-            }
-            intent.putExtras(bundle);
-            mBarcodeScannerLauncher.launch(intent);
-        });
-        addButton.bringToFront();
+        if (!mArchiveMode) {
+            FloatingActionButton addButton = findViewById(R.id.fabAdd);
+
+            addButton.setOnClickListener(v -> {
+                Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
+                Bundle bundle = new Bundle();
+                if (selectedTab != 0) {
+                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+                }
+                intent.putExtras(bundle);
+                mBarcodeScannerLauncher.launch(intent);
+            });
+            addButton.bringToFront();
+        }
     }
 
     @Override
     public void onBackPressed() {
+
         if (!mSearchView.isIconified()) {
             mSearchView.setIconified(true);
             return;
@@ -381,7 +449,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             group = (Group) mGroup;
         }
 
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mArchiveMode ? DBHelper.LoyaltyCardArchiveFilter.Archived : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
 
         if (updateCount) {
             updateLoyaltyCardCount();
@@ -393,7 +461,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
-            mHelpText.setVisibility(View.GONE);
+            mHelpSection.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
 
             if (mAdapter.getItemCount() > 0) {
@@ -412,8 +480,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             }
         } else {
+            if (mArchiveMode) {
+                // If an user deletes the last card in archive mode, we should close the activity
+                // This will move us back to the main view
+                finish();
+            }
+
             mCardList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
+            mHelpSection.setVisibility(View.VISIBLE);
 
             mNoMatchingCardsText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
@@ -424,6 +498,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
+    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
+    }
+
     public void updateTabGroups(TabLayout groupsTabLayout) {
         List<Group> newGroups = DBHelper.getGroups(mDatabase);
 
@@ -448,11 +527,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         groupsTabLayout.setVisibility(View.VISIBLE);
+
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        if(!mArchiveMode)
+            getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        else{
+            getMenuInflater().inflate(R.menu.archive_menu, inputMenu);
+        }
 
         Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
         displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
@@ -488,6 +572,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             });
         }
+
+        if(!mArchiveMode) {
+            if (DBHelper.getArchivedCardsCount(mDatabase) == 0) {
+                inputMenu.findItem(R.id.action_archived).setVisible(false);
+            } else {
+                inputMenu.findItem(R.id.action_archived).setVisible(true);
+            }
+        }
+
         return super.onCreateOptionsMenu(inputMenu);
     }
 
@@ -495,6 +588,10 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
+        if (id == android.R.id.home) {
+            onBackPressed();
+        }
+
         if (id == R.id.action_unfold) {
             mAdapter.showDetails(!mAdapter.showingDetails());
             invalidateOptionsMenu();
@@ -518,17 +615,21 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
             builder.setView(customLayout);
 
-            CheckBox ch = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
-            ch.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+            CheckBox showReversed = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
+
+
+            showReversed.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+
 
             builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
 
             builder.setPositiveButton(R.string.sort, (dialog, which) -> {
-                if (ch.isChecked()) {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
-                } else {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
-                }
+
+                setSort(
+                        loyaltyCardOrders.get(currentIndex.get()),
+                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
+                );
+
                 dialog.dismiss();
             });
 
@@ -546,6 +647,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
+        if (id == R.id.action_archived) {
+            Intent i = new Intent(getApplicationContext(), MainActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("archiveMode", true);
+            i.putExtras(bundle);
+            startActivity(i);
+            return true;
+        }
+
         if (id == R.id.action_import_export) {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
             startActivity(i);
@@ -564,6 +674,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
+
         return super.onOptionsItemSelected(inputItem);
     }
 
@@ -685,10 +796,47 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));
 
             MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
+            MenuItem archiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_archive);
+            MenuItem unarchiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_unarchive);
+            MenuItem starItem = mCurrentActionMode.getMenu().findItem(R.id.action_star);
+            MenuItem unstarItem = mCurrentActionMode.getMenu().findItem(R.id.action_unstar);
+
+            boolean hasStarred = false;
+            boolean hasUnstarred = false;
+
+            if(!mArchiveMode) {
+                unarchiveItem.setVisible(false);
+                archiveItem.setVisible(true);
+            }
+            else{
+                unarchiveItem.setVisible(true);
+                archiveItem.setVisible(false);
+            }
+
+            for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+
+                if (loyaltyCard.starStatus == 1) {
+                    hasStarred = true;
+                } else {
+                    hasUnstarred = true;
+                }
+
+                if (hasStarred && hasUnstarred) {
+                    hasStarred = true;
+                    hasUnstarred = true;
+                    break;
+                }
+            }
+
             if (count == 1) {
+                starItem.setVisible(!hasStarred);
+                unstarItem.setVisible(!hasUnstarred);
                 editItem.setVisible(true);
                 editItem.setEnabled(true);
             } else {
+                starItem.setVisible(hasUnstarred);
+                unstarItem.setVisible(hasStarred);
+
                 editItem.setVisible(false);
                 editItem.setEnabled(false);
             }
@@ -697,6 +845,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
+
     @Override
     public void onRowClicked(int inputPosition) {
         if (mAdapter.getSelectedItemCount() > 0) {
@@ -718,15 +867,22 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 return;
             }
 
-            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
-            i.setAction("");
+            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
+            intent.setAction("");
             final Bundle b = new Bundle();
             b.putInt("id", loyaltyCard.id);
-            i.putExtras(b);
+
+            ArrayList<Integer> cardList = new ArrayList<>();
+            for (int i = 0; i < mAdapter.getItemCount(); i++) {
+                cardList.add(mAdapter.getCard(i).id);
+            }
+
+            b.putIntegerArrayList("cardList", cardList);
+            intent.putExtras(b);
 
             ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
 
-            startActivity(i);
+            startActivity(intent);
         }
     }
 }

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

@@ -35,7 +35,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
     protected Group mGroup = null;
     private RecyclerView mCardList;
-    private TextView mHelpText;
+    private TextView noGroupCardsText;
     private EditText mGroupNameText;
 
     private boolean mGroupNameNotInUse;
@@ -49,7 +49,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
         mDatabase = new DBHelper(this).getWritableDatabase();
 
-        mHelpText = findViewById(R.id.helpText);
+        noGroupCardsText = findViewById(R.id.noGroupCardsText);
         mCardList = findViewById(R.id.list);
         FloatingActionButton saveButton = findViewById(R.id.fabSave);
 
@@ -133,7 +133,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
             finish();
         });
         // this setText is here because content_main.xml is reused from main activity
-        mHelpText.setText(getResources().getText(R.string.noGiftCardsGroup));
+        noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
         updateLoyaltyCardList();
     }
 
@@ -191,10 +191,10 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
         if (mAdapter.getItemCount() == 0) {
             mCardList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
+            noGroupCardsText.setVisibility(View.VISIBLE);
         } else {
             mCardList.setVisibility(View.VISIBLE);
-            mHelpText.setVisibility(View.GONE);
+            noGroupCardsText.setVisibility(View.GONE);
         }
     }
 

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

@@ -8,8 +8,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
     private HashMap<Integer, Integer> mIndexCardMap;
     private HashMap<Integer, Boolean> mInGroupOverlay;

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

@@ -1,6 +1,7 @@
 package protect.card_locker;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -206,6 +207,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
     public void addFromImage(View view) {
         Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
         photoPickerIntent.setType("image/*");
-        photoPickerLauncher.launch(photoPickerIntent);
+        try {
+            photoPickerLauncher.launch(photoPickerIntent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
     }
 }

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

@@ -10,15 +10,15 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 
-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.textview.MaterialTextView;
-import com.yalantis.ucrop.UCropActivity;
-
 public class UCropWrapper extends UCropActivity {
     public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
 

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

@@ -16,7 +16,6 @@ import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
@@ -37,6 +36,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
@@ -48,7 +48,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.exifinterface.media.ExifInterface;
-
 import androidx.palette.graphics.Palette;
 import protect.card_locker.preferences.Settings;
 
@@ -239,32 +238,19 @@ public class Utils {
         return numberFormat.format(value);
     }
 
-    static public Boolean currencyHasDecimals(Currency currency) {
+    static public BigDecimal parseBalance(String value, Currency currency) throws ParseException {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+
         if (currency == null) {
-            return false;
+            numberFormat.setMaximumFractionDigits(0);
+        } else {
+            numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
+            numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
         }
 
-        return currency.getDefaultFractionDigits() != 0;
-    }
+        Log.d(TAG, numberFormat.parse(value).toString());
 
-    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
-        // If there are no decimals expected, remove all separators before parsing
-        if (!hasDecimals) {
-            value = value.replaceAll("[^0-9]", "");
-            return new BigDecimal(value);
-        }
-
-        // There are many ways users can write a currency, so we fix it up a bit
-        // 1. Replace all non-numbers with dots
-        value = value.replaceAll("[^0-9]", ".");
-
-        // 2. Remove all but the last dot
-        while (value.split("\\.").length > 2) {
-            value = value.replaceFirst("\\.", "");
-        }
-
-        // Parse as BigDecimal
-        return new BigDecimal(value);
+        return new BigDecimal(numberFormat.parse(value).toString());
     }
 
     static public byte[] bitmapToByteArray(Bitmap bitmap) {
@@ -359,6 +345,14 @@ public class Utils {
         saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, type));
     }
 
+    public static File retrieveCardImageAsFile(Context context, String fileName) {
+        return context.getFileStreamPath(fileName);
+    }
+
+    public static File retrieveCardImageAsFile(Context context, int loyaltyCardId, ImageLocationType type) {
+        return retrieveCardImageAsFile(context, getCardImageFileName(loyaltyCardId, type));
+    }
+
     static public Bitmap retrieveCardImage(Context context, String fileName) {
         FileInputStream in;
         try {

app/src/main/java/protect/card_locker/barcodes/AztecBarcode.java

@@ -0,0 +1,35 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class AztecBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Aztec";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.AZTEC;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "AZTEC";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return true;
+    }
+
+    @Override
+    public boolean is2D() {
+        return true;
+    }
+
+    @Override
+    public boolean hasInternalPadding() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Barcode.java

@@ -0,0 +1,22 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+/**
+ * Abstract barcode class
+ */
+public abstract class Barcode {
+    public String name() {
+        return format().name();
+    };
+    abstract public String prettyName();
+    abstract public BarcodeFormat format();
+    abstract public String exampleValue();
+
+    abstract public boolean isSquare();
+    abstract public boolean is2D();
+    public boolean hasInternalPadding() {
+        return false;
+    };
+    public boolean isSupported() { return true; };
+}

app/src/main/java/protect/card_locker/barcodes/BarcodeFactory.java

@@ -0,0 +1,62 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class BarcodeFactory {
+    public static final Map<String, BarcodeFormat> barcodeNames = new HashMap<>() {{
+        put(BarcodeFormat.AZTEC.name(), BarcodeFormat.AZTEC);
+        put(BarcodeFormat.CODE_39.name(), BarcodeFormat.CODE_39);
+        put(BarcodeFormat.CODE_93.name(), BarcodeFormat.CODE_93);
+        put(BarcodeFormat.CODE_128.name(), BarcodeFormat.CODE_128);
+        put(BarcodeFormat.CODABAR.name(), BarcodeFormat.CODABAR);
+        put(BarcodeFormat.DATA_MATRIX.name(), BarcodeFormat.DATA_MATRIX);
+        put(BarcodeFormat.EAN_8.name(), BarcodeFormat.EAN_8);
+        put(BarcodeFormat.EAN_13.name(), BarcodeFormat.EAN_13);
+        put(BarcodeFormat.ITF.name(), BarcodeFormat.ITF);
+        put(BarcodeFormat.PDF_417.name(), BarcodeFormat.PDF_417);
+        put(BarcodeFormat.QR_CODE.name(), BarcodeFormat.QR_CODE);
+        put(BarcodeFormat.UPC_A.name(), BarcodeFormat.UPC_A);
+        put(BarcodeFormat.UPC_E.name(), BarcodeFormat.UPC_E);
+    }};
+
+    public static Barcode fromBarcode(BarcodeFormat barcodeFormat) {
+        switch (barcodeFormat) {
+            case AZTEC: return new AztecBarcode();
+            case CODE_39: return new Code39Barcode();
+            case CODE_93: return new Code93Barcode();
+            case CODE_128: return new Code128Barcode();
+            case CODABAR: return new CodabarBarcode();
+            case DATA_MATRIX: return new DataMatrixBarcode();
+            case EAN_8: return new Ean8Barcode();
+            case EAN_13: return new Ean13Barcode();
+            case ITF: return new ItfBarcode();
+            case PDF_417: return new Pdf417Barcode();
+            case QR_CODE: return new QrCodeBarcode();
+            case UPC_A: return new UpcABarcode();
+            case UPC_E: return new UpcEBarcode();
+            default: throw new IllegalArgumentException();
+        }
+    }
+
+    public static Barcode fromName(String name) {
+        return fromBarcode(Objects.requireNonNull(barcodeNames.get(name)));
+    }
+
+    public static boolean isSupported(BarcodeFormat barcodeFormat) {
+        return barcodeNames.containsValue(barcodeFormat);
+    }
+
+    public static boolean isSupported(String name) {
+        return barcodeNames.containsKey(name);
+    }
+
+    public static Collection<BarcodeFormat> getAllFormats() {
+        return barcodeNames.values();
+    }
+}

app/src/main/java/protect/card_locker/barcodes/BarcodeWithValue.java

@@ -0,0 +1,19 @@
+package protect.card_locker.barcodes;
+
+public class BarcodeWithValue {
+    private final Barcode mBarcode;
+    private final String mValue;
+
+    public BarcodeWithValue(Barcode barcode, String value) {
+        mBarcode = barcode;
+        mValue = value;
+    }
+
+    public Barcode barcode() {
+        return mBarcode;
+    }
+
+    public String value() {
+        return mValue;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/CodabarBarcode.java

@@ -0,0 +1,35 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class CodabarBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Codabar";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.CODABAR;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "C0C";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+
+    @Override
+    public boolean hasInternalPadding() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Code128Barcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Code128Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Code 128";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.CODE_128;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "CODE_128";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Code39Barcode.java

@@ -0,0 +1,35 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Code39Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Code 39";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.CODE_39;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "CODE_39";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+
+    @Override
+    public boolean hasInternalPadding() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Code93Barcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Code93Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Code 93";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.CODE_93;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "CODE_93";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/DataMatrixBarcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class DataMatrixBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "Data Matrix";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.DATA_MATRIX;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "DATA_MATRIX";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return true;
+    }
+
+    @Override
+    public boolean is2D() {
+        return true;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Ean13Barcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Ean13Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "EAN 13";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.EAN_13;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "5901234123457";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Ean8Barcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Ean8Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "EAN 8";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.EAN_8;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "32123456";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/ItfBarcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class ItfBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "ITF";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.ITF;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "1003";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/Pdf417Barcode.java

@@ -0,0 +1,35 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class Pdf417Barcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "PDF 417";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.PDF_417;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "PDF_417";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return true;
+    }
+
+    @Override
+    public boolean hasInternalPadding() {
+        return true;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/QrCodeBarcode.java

@@ -0,0 +1,35 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class QrCodeBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "QR Code";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.QR_CODE;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "QR_CODE";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return true;
+    }
+
+    @Override
+    public boolean is2D() {
+        return true;
+    }
+
+    @Override
+    public boolean hasInternalPadding() {
+        return true;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/UpcABarcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class UpcABarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "UPC A";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.UPC_A;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "123456789012";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

app/src/main/java/protect/card_locker/barcodes/UpcEBarcode.java

@@ -0,0 +1,30 @@
+package protect.card_locker.barcodes;
+
+import com.google.zxing.BarcodeFormat;
+
+public class UpcEBarcode extends Barcode {
+    @Override
+    public String prettyName() {
+        return "UPC E";
+    }
+
+    @Override
+    public BarcodeFormat format() {
+        return BarcodeFormat.UPC_E;
+    }
+
+    @Override
+    public String exampleValue() {
+        return "0123456";
+    }
+
+    @Override
+    public boolean isSquare() {
+        return false;
+    }
+
+    @Override
+    public boolean is2D() {
+        return false;
+    }
+}

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

@@ -135,7 +135,8 @@ public class CatimaExporter implements Exporter {
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
-                DBHelper.LoyaltyCardDbIds.LAST_USED);
+                DBHelper.LoyaltyCardDbIds.LAST_USED,
+                DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS);
 
         Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
 
@@ -153,7 +154,8 @@ public class CatimaExporter implements Exporter {
                     card.barcodeType != null ? card.barcodeType.name() : "",
                     card.headerColor,
                     card.starStatus,
-                    card.lastUsed);
+                    card.lastUsed,
+                    card.archiveStatus);
 
             if (Thread.currentThread().isInterrupted()) {
                 throw new InterruptedException();

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

@@ -25,7 +25,6 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
-import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.Group;
@@ -321,6 +320,15 @@ public class CatimaImporter implements Importer {
         }
         if (starStatus != 1) starStatus = 0;
 
+        int archiveStatus = 0;
+        try {
+            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record, false);
+        } 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
+        }
+        if (archiveStatus != 1) archiveStatus = 0;
+
         Long lastUsed = 0L;
         try {
             lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
@@ -329,7 +337,7 @@ public class CatimaImporter implements Importer {
             // We catch this exception so we can still import old backups
         }
 
-        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
+        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed,archiveStatus);
     }
 
     /**

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

@@ -18,9 +18,9 @@ import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 
-import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.Utils;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -56,7 +56,7 @@ public class FidmeImporter implements Importer {
 
         try {
             for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, record);
+                importLoyaltyCard(context, database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -75,7 +75,7 @@ public class FidmeImporter implements Importer {
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
             throws FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
@@ -109,7 +109,10 @@ public class FidmeImporter implements Importer {
         // The ID is called reference
         String cardId = CSVHelpers.extractString("Reference", record, "");
         if (cardId.isEmpty()) {
-            throw new FormatException("No card ID listed, but is required");
+            // Fidme deletes the card id if a card is expired
+            // Because Catima considers the card id a required field, we ignore these expired cards
+            // https://github.com/CatimaLoyalty/Android/issues/1005
+            return;
         }
 
         // Sadly, Fidme exports don't contain the card type
@@ -117,11 +120,13 @@ public class FidmeImporter implements Importer {
         // TODO: Hook this into our own loyalty card DB if we ever get one
         CatimaBarcode barcodeType = null;
 
-        // No favourite data in the export either
+        // No favourite data or colour in the export either
         int starStatus = 0;
+        int archiveStatus = 0;
+        int headerColor = Utils.getRandomHeaderColor(context);
 
         // TODO: Front and back image
 
-        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
+        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, null,archiveStatus);
     }
 }

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
-import java.io.IOException;
 import java.io.OutputStream;
 
 public class MultiFormatExporter {

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

@@ -6,13 +6,7 @@ import android.util.Log;
 
 import net.lingala.zip4j.exception.ZipException;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
-
-import protect.card_locker.FormatException;
 
 public class MultiFormatImporter {
     private static final String TAG = "Catima";
@@ -54,8 +48,13 @@ public class MultiFormatImporter {
                 database.setTransactionSuccessful();
                 return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
-                return new ImportExportResult(ImportExportResultType.BadPassword);
-            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
+                if (e.getType().equals(ZipException.Type.WRONG_PASSWORD)) {
+                    return new ImportExportResult(ImportExportResultType.BadPassword);
+                } else {
+                    Log.e(TAG, "Failed to import data", e);
+                    error = e.toString();
+                }
+            } catch (Exception e) {
                 Log.e(TAG, "Failed to import data", e);
                 error = e.toString();
             } finally {

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

@@ -3,6 +3,7 @@ package protect.card_locker.importexport;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import com.google.zxing.BarcodeFormat;
 
@@ -23,7 +24,6 @@ import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.HashMap;
 
-import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.ImageLocationType;
@@ -39,6 +39,8 @@ import protect.card_locker.ZipUtils;
  * A header is expected for the each table showing the names of the columns.
  */
 public class StocardImporter implements Importer {
+    private static final String TAG = "Catima";
+
     public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
         HashMap<String, HashMap<String, Object>> providers = new HashMap<>();
@@ -201,6 +203,12 @@ public class StocardImporter implements Importer {
 
         for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
             String providerId = (String) loyaltyCardData.get("_providerId");
+
+            if (providerId == null) {
+                Log.d(TAG, "Missing providerId for card " + loyaltyCardData + ", ignoring...");
+                continue;
+            }
+
             HashMap<String, Object> providerData = providers.get(providerId);
 
             String store = providerData != null ? providerData.get("name").toString() : providerId;
@@ -211,6 +219,8 @@ public class StocardImporter implements Importer {
             if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
                 if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
                     barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
+                } else if (barcodeTypeString.equals("GS1_128")) {
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
                 } else {
                     barcodeType = CatimaBarcode.fromName(barcodeTypeString);
                 }
@@ -223,7 +233,7 @@ public class StocardImporter implements Importer {
                 headerColor = Utils.getHeaderColorFromImage(cardIcon, headerColor);
             }
 
-            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null);
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null,0);
 
             if (cardIcon != null) {
                 Utils.saveCardImage(context, cardIcon, (int) loyaltyCardInternalId, ImageLocationType.icon);

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

@@ -23,7 +23,6 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.TimeZone;
 
-import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.Utils;
@@ -126,7 +125,7 @@ public class VoucherVaultImporter implements Importer {
                     throw new FormatException("Unknown colour type found: " + colorFromJSON);
             }
 
-            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
+            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(),0);
         }
 
         bufferedReader.close();

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

@@ -9,7 +9,6 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
-
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 
@@ -92,8 +91,8 @@ public class Settings {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }
 
-    public boolean getLockBarcodeScreenOrientation() {
-        return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
+    public String getCardViewOrientation() {
+        return getString(R.string.settings_key_card_orientation, getResString(R.string.settings_key_follow_system_orientation));
     }
 
     public boolean getKeepScreenOn() {

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

@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import com.google.android.material.color.DynamicColors;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -18,9 +20,6 @@ import androidx.fragment.app.DialogFragment;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-
-import com.google.android.material.color.DynamicColors;
-
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;

app/src/main/res/anim/slide_in_left.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="-100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>

app/src/main/res/anim/slide_in_right.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>

app/src/main/res/anim/slide_out_left.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>

app/src/main/res/anim/slide_out_right.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="100%"
+        android:toYDelta="0%" />
+</set>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:autoMirrored="true" 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="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

app/src/main/res/drawable/ic_baseline_archive_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="@android:color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_archive_24_black.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="@android:color/black">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>

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

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="#FFFFFF"
       android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

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

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M53.26,40.92l14.35,-6.39l2.86,6.42"
+      android:strokeAlpha="0.4"
+      android:fillAlpha="0.4"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M36.14,40.95l2.86,-6.42l14.24,6.34"
+      android:strokeAlpha="0.4"
+      android:fillAlpha="0.4"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M40.01,37.17l7.73,3.44H38.48l1.53,-3.44m26.58,0 l1.53,3.44H58.86l7.73,-3.44M39,34.53l-2.86,6.42v1.66H70.47V40.95L67.61,34.53 53.27,40.92l-0.02,-0.05L39,34.53Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M74.07,51.23l4.93,1.41l-6.44,22.48l-37.61,-10.79l39.13,0l0,-13.11z"
+      android:strokeAlpha="0.7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M34.94,40.95C31.66,40.95 29,46.19 29,52.64s2.66,11.69 5.94,11.69L74.07,64.34L74.07,40.95ZM41.21,51.08 L40.15,50.02 44.43,45.74 48.71,50.02 47.65,51.08 44.43,47.86ZM58.02,56.56a3.11,3.11 0,0 1,-2.93 2.05,3.15 3.15,0 0,1 -0.55,-0.05 3.11,3.11 0,0 1,-1.83 -1.04,3.12 3.12,0 0,1 -5.3,-0.96 0.75,0.75 0,0 1,1.41 -0.51,1.62 1.62,0 0,0 3.14,-0.55 0.75,0.75 0,0 1,1.5 0,1.62 1.62,0 0,0 3.14,0.55 0.75,0.75 0,0 1,1.41 0.51ZM64.14,51.08 L60.92,47.86L57.71,51.08l-1.06,-1.06 4.28,-4.28 4.28,4.28Z"/>
+</vector>

app/src/main/res/drawable/ic_overflow_menu.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="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>

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

@@ -1,5 +0,0 @@
-<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="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
-</vector>

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

@@ -7,14 +7,15 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     tools:context="protect.card_locker.ManageGroupActivity">
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabSave"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
         android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/groups"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabMode="scrollable"
+            android:visibility="gone"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -74,7 +74,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:text="@string/barcodeNoBarcode"
-            android:textColor="#FFFFFF"
             android:enabled="false" />
         <ListView
             android:id="@+id/barcodes"

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

@@ -9,14 +9,33 @@
     tools:context="protect.card_locker.MainActivity"
     tools:showIn="@layout/main_activity">
 
-    <TextView
-        style="@style/AppTheme.TextView.NoData"
-        android:id="@+id/helpText"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/noGiftCards"
-        android:visibility="gone"/>
+    <LinearLayout
+        android:id="@+id/helpSection"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="184dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_launcher_foreground" />
+
+        <TextView
+            style="@style/TextAppearance.Material3.HeadlineLarge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/welcome" />
+
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/noGiftCards"/>
+    </LinearLayout>
 
     <TextView
         style="@style/AppTheme.TextView.NoData"
@@ -26,7 +45,7 @@
         android:gravity="center"
         android:text="@string/noMatchingGiftCards"
         android:visibility="gone"/>
-    
+
     <TextView
         style="@style/AppTheme.TextView.NoData"
         android:id="@+id/noGroupCardsText"

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

@@ -12,9 +12,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
         android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -82,6 +82,17 @@
                             android:contentDescription="@string/thumbnailDescription"
                             android:src="@mipmap/ic_launcher"/>
 
+                        <com.google.android.material.imageview.ShapeableImageView
+                            android:id="@+id/thumbnailEditIcon"
+                            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Material3.FloatingActionButton"
+                            android:layout_width="@dimen/cardThumbnailEditOverlaySize"
+                            android:layout_height="@dimen/cardThumbnailEditOverlaySize"
+                            android:layout_gravity="bottom|end"
+                            android:layout_margin="4dp"
+                            app:contentPadding="4dp"
+                            android:alpha="0.8"
+                            android:src="@drawable/ic_mode_edit_white_24dp"/>
+
                     </com.google.android.material.card.MaterialCardView>
 
                     <com.google.android.material.textfield.TextInputLayout

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

@@ -47,13 +47,15 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_done" />
+                app:srcCompat="@drawable/ic_done"
+                android:background="@color/md_theme_dark_onSelected" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end">
+                android:layout_gravity="end"
+                tools:ignore="ExtraText">
 
                 <ImageView
                     android:id="@+id/star_background"
@@ -86,6 +88,33 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/archivedIcon"
+                android:layout_width="match_parent"
+                android:layout_height="149dp"
+                android:layout_gravity="end"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/thumbnail"
+                tools:layout_editor_absoluteX="355dp">
+
+                <ImageView
+                    android:id="@+id/archive_background"
+                    android:layout_width="41dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="end"
+                    android:alpha="0.5"
+                    android:contentDescription="@string/archived"
+                    android:elevation="4dp"
+                    android:rotationX="2"
+                    android:visibility="visible"
+                    app:srcCompat="@drawable/ic_baseline_archive_24"
+                    tools:ignore="ImageContrastCheck,MissingConstraints"
+                    tools:layout_editor_absoluteX="0dp"
+                    tools:layout_editor_absoluteY="-1dp" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </com.google.android.material.card.MaterialCardView>
 
         <TextView
@@ -171,5 +200,6 @@
             app:layout_constraintStart_toStartOf="parent"
             tools:visibility="visible"
             tools:text="Tomorrow"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>

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

@@ -8,239 +8,6 @@
     android:layout_height="fill_parent"
     android:fitsSystemWindows="true">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabEdit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
-        android:layout_margin="16dp" />
-
-    <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:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-                android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                app:tint="?attr/colorOnPrimary"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:background="?attr/colorPrimary" />
-
-            <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:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                app:tint="?attr/colorOnPrimary"
-                app:layout_constraintTop_toBottomOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:background="?attr/colorPrimary" />
-
-            <LinearLayout
-                android:id="@+id/dotIndicator"
-                android:visibility="gone"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>
-
-            <SeekBar
-                android:contentDescription="@string/set_scale"
-                android:id="@+id/barcodeScaler"
-                android:visibility="gone"
-                android:max="100"
-                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"
-                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <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>
-
-    <LinearLayout
-        android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
-        android:orientation="vertical"
-        android:paddingTop="0px"
-        android:visibility="gone"
-        app:behavior_hideable="false"
-        app:behavior_peekHeight="80dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="visible">
-
-        <ImageButton
-            android:id="@+id/bottomSheetButton"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_gravity="top|start"
-            android:contentDescription="@string/showMoreInfo"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            app:tint="?attr/colorOnPrimary"
-            android:background="?attr/colorPrimary" />
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/bottomSheetContentWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/noteView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autoLink="all"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/groupsView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/balanceView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/expiryView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
-
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:layout_width="fill_parent"
@@ -249,8 +16,7 @@
         android:clipChildren="false"
         android:clipToPadding="false"
         android:fitsSystemWindows="true"
-        android:weightSum="1.0"
-        >
+        android:weightSum="1.0">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_landscape"
@@ -310,5 +76,202 @@
         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>
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/bottom_app_bar"
+        style="@style/Widget.MaterialComponents.BottomAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?attr/colorPrimary"
+        app:contentInsetLeft="0dp"
+        app:contentInsetStart="0dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"
+        app:fabAlignmentMode="center">
+
+        <ImageButton
+            android:id="@+id/button_previous"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_left_24"
+            android:tooltipText="@string/previousCard"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_show_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_info_24"
+            android:tooltipText="@string/showMoreInfo"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_right_24"
+            android:tooltipText="@string/nextCard"
+            android:visibility="gone" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        app:layout_anchor="@id/bottom_app_bar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,24 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="protect.card_locker.MainActivity">
+    <item
+        android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always|collapseActionView"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_sort"
+        android:title="@string/sort"
+        android:icon="@drawable/ic_baseline_sort_24"
+        app:showAsAction="always"
+        android:visible="false"/>
+</menu>

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

@@ -2,20 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_copy_to_clipboard"
-        android:title="@string/copy_to_clipboard"
-        android:icon="@drawable/ic_copy"
-        android:titleCondensed="@string/copy_to_clipboard"
-        app:showAsAction="ifRoom"/>
-
-    <item
-        android:id="@+id/action_share"
-        android:title="@string/share"
-        android:icon="@drawable/ic_share"
-        android:titleCondensed="@string/share"
-        app:showAsAction="ifRoom"/>
-
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_edit"
@@ -23,11 +9,48 @@
         android:titleCondensed="@string/editCardTitle"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_copy_to_clipboard"
+        android:icon="@drawable/ic_copy"
+        android:title="@string/copy_to_clipboard"
+        android:titleCondensed="@string/copy_to_clipboard"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share"
+        android:title="@string/share"
+        android:titleCondensed="@string/share"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_star"
+        android:title="@string/star"
+        android:titleCondensed="@string/star"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unstar"
+        android:title="@string/unstar"
+        android:titleCondensed="@string/unstar"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_archive"
+        android:title="@string/archive"
+        android:titleCondensed="@string/archive"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unarchive"
+        android:title="@string/unarchive"
+        android:titleCondensed="@string/unarchive"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
         android:titleCondensed="@string/delete"
-        app:showAsAction="ifRoom"/>
-
+        app:showAsAction="never"/>
 </menu>

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

@@ -2,19 +2,46 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_lock_unlock"
-        android:icon="@drawable/ic_lock_open_white_24dp"
-        android:title="@string/lockScreen"
-        app:showAsAction="always"/>
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_white"
         android:title="@string/share"
         app:showAsAction="always"/>
+
     <item
         android:id="@+id/action_star_unstar"
         android:icon="@drawable/ic_unstarred_white"
         android:title="@string/star"
         app:showAsAction="always" />
-</menu>
+
+    <item
+        android:id="@+id/action_overflow"
+        android:title="@string/overflowMenu"
+        android:icon="@drawable/ic_overflow_menu"
+        app:showAsAction="always">
+
+        <menu>
+
+            <item
+                android:id="@+id/action_duplicate"
+                android:title="@string/duplicateCard"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/action_archive"
+                android:title="@string/archive"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/action_unarchive"
+                android:title="@string/unarchive"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/action_delete"
+                android:title="@string/delete"
+                app:showAsAction="never"/>
+
+        </menu>
+
+    </item>
+
+</menu>

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

@@ -26,6 +26,10 @@
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_archived"
+        android:title="@string/archiveList"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -2,77 +2,108 @@ Sylvia van Os
 Branden Archer
 J. Lavoie
 Allan Nordhøy
-Heimen Stoffels
 solokot
+Heimen Stoffels
+Oğuz Ersen
 Katharine Chui
 mondstern
-Oğuz Ersen
 IllusiveMan196
 Altonss
-Petr Novák
 StoyanDimitrov
+Petr Novák
 Joel A
+Michael Moroni
 Taco
+SlavekB
 Gediminas Murauskas
 Nyatsuki
-Michael Moroni
 Samantaz Fox
+laralem
 arno-github
 Ankit Tiwari
 Sergio Paredes
 huuhaa
-laralem
 arshbeerSingh
+Quentin PAGÈS
 Miha Frangež
 sr093906
+Freddo espresso
 mdvhimself
 Maciej Błędkowski
 Olivia (Zoe)
-Quentin PAGÈS
 betsythefc
 Silvério Santos
 waffshappen
 ati3
+Giovanni
 Jane Kong
 K. Herbert
+Magnitudee
 Still Hsu
 String E. Fighter
 Yurical
 rr-vesp
+alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
+Artem M.
+Astrohops1
 Clonewayx
 D. Domig
 Diego
+Fede Pujol
 Lukas Grassauer
 Marnick L'Eau
 Michalis
+Michał
+Neko Nekowazarashi
 Rosdyana Kusuma
 umoenks
 Thomas Bertels
+Wanath
+Runner
+ce i moa
 inesre
 lgasp
 phlostically
 Aditya Das
+Asier
 Kevin Sicong Jiang
+tfuxu
+Ahmed Saleh
 Airat
-Andreas Blaser
+Alexander Ivanov
+sNiXx
+Ashish Yadav
 BMN
 Biren
+Booc Sylvan
+Colgrave
+Csaba
 Mylou53
+danieluhrinyi
 Kasina Dheeraj
+Donno
 Eric
+Evgeniy Khramov
 Flav
 Franciszek Stefan
-Giovanni
+Grzegorz
+HowITsDone
 Izzy
-Karol Kosek
+Jean-Baptiste
+Jean-Luc Tibaux
+krkk
+Lisa
 bittin
+Manan Jhaveri
 Marco
 Mattia
 Michael Gangolf
+Moi Toi
+DivideEtImpera
 pbeckmann
 Peer Beckmann
 Quang Nguyen
@@ -81,15 +112,25 @@ Reza
 Rohan Babbar 
 Ronak Upadhyay
 Rose Liverman
+Samarth Asthan
 Simone Dotto
 Subhashish Anand
+Titas Pažereckas
+Tom Sawyer
+Tomer Ben-Rachel
+Tony C
 Tymofii Lytvynenko
-Tjipke van der Heide
+Vancha March
 Yevgeny M
-avikkundu
+Avik Kundu
+gbonaspetti
+mtrmirez
 opsik
+pooyanazari
 psa-jforestier
 Robin
 sergio
 Marcus
 techwebpd
+tygyh
+unstartdev

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

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_search">بحث</string>
+    <string name="action_add">اضف</string>
+    <string name="noGiftCards">اضغط علي زر + لاضافة بطاقة, او استورد بعض منهم من قائمة ال ⋮.</string>
+    <string name="noMatchingGiftCards">لا نتائج. حاول تغيير بحثك.</string>
+    <string name="storeName">اسم</string>
+    <string name="note">مذكرة</string>
+    <string name="cardId">بطاقة شخصية</string>
+    <string name="barcodeType">نوع الباركود</string>
+    <string name="barcodeNoBarcode">لا يوجد باركود</string>
+    <string name="noBarcode">لا يوجد باركود</string>
+    <string name="star">اضف الي المفضلة</string>
+    <string name="unstar">حذف من المفضلة</string>
+    <string name="cancel">الغاء</string>
+    <string name="save">حفظ</string>
+    <string name="edit">تعديل</string>
+    <string name="delete">مسح</string>
+    <string name="confirm">تأكيد</string>
+    <string name="deleteConfirmation">مسح هذة البطاقة نهائيا؟</string>
+    <string name="ok">حسنا</string>
+    <string name="copy_to_clipboard">نسخ البطاقة الشخصية الي الحافظة</string>
+    <string name="share">شارك</string>
+    <string name="sendLabel">ارسل…</string>
+    <string name="editCardTitle">عدل بطاقة</string>
+    <string name="addCardTitle">اضف بطاقة</string>
+    <string name="scanCardBarcode">مسح باركود</string>
+    <string name="cardShortcut">اختصار البطاقة</string>
+    <string name="noCardsMessage">اضف بطاقة أولا</string>
+    <string name="card_ids_copied">البطاقة(ات) الشخصية المنسوخة</string>
+    <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
+    <string name="noStoreError">لا يوجد اسم مدخل</string>
+    <string name="noCardIdError">لا يوجد بطاقة شخصية مدخلة</string>
+    <string name="noCardExistsError">لا يمكن العثور علي هذه البطاقة</string>
+    <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
+    <string name="importExport">استيراد/تصدير</string>
+    <string name="importExportHelp">عمل نسخ احتطياتي لبياناتك يسمح نقلها لجهاز اخر.</string>
+    <string name="importFailed">لا يمكن عمل الاستيراد</string>
+    <string name="exportSuccessfulTitle">متصدر</string>
+    <string name="exportFailedTitle">فشل التصدير</string>
+    <string name="exportFailed">لا يمكن عمل التصدير</string>
+    <string name="noExternalStoragePermissionError">امنح التخزين الخارجي اذن لاستيراد وتصدير البيانات</string>
+    <string name="exportOptionExplanation">ستتم كتابة البيانات في الموقع الذي تختاره.</string>
+    <string name="importOptionFilesystemButton">من نظام الملفات</string>
+    <string name="importOptionApplicationTitle">استخدم تطبيقًا آخر</string>
+    <string name="importOptionApplicationExplanation">استخدم أي تطبيق أو مدير الملفات المفضل لديك لفتح ملف.</string>
+    <string name="importOptionApplicationButton">استخدم تطبيقًا آخر</string>
+    <string name="about">حول</string>
+    <string name="app_copyright_old">بناء على Loyalty Card Keychain
+\nحقوق النشر © 2016-2020 Branden Archer</string>
+    <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
+    <string name="app_revision_fmt">معلومات المراجعة: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">اختار الباركود</string>
+    <string name="enterBarcodeInstructions">أدخل بطاقة هوية ، واختر نوع الباركود أدناه ، أو \"لا يوجد باركود\".</string>
+    <string name="copy_to_clipboard_toast">تم نسخ بطاقة الهوية إلى الحافظة</string>
+    <string name="thumbnailDescription">صورة مصغرة</string>
+    <string name="starImage">نجم مفضل</string>
+    <string name="settings">اعدادات</string>
+    <string name="settings_category_title_ui">واجهة المستخدم</string>
+    <string name="settings_light_theme">فاتح</string>
+    <string name="settings_dark_theme">داكن</string>
+    <string name="settings_card_orientation">اتجاه الباركود</string>
+    <string name="settings_portrait_orientation">الوضع الرأسي</string>
+    <string name="settings_landscape_orientation">الوضع الأفقي</string>
+    <string name="settings_theme">مظهر</string>
+    <string name="settings_max_font_size_scale">اقصي. حجم الخط</string>
+    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
+    <string name="importSuccessful">تم استيراد البيانات</string>
+    <string name="exportSuccessful">تم تصدير البيانات</string>
+    <string name="enter_group_name">أدخل اسم المجموعة</string>
+    <string name="group_edit">تعديل المجموعة</string>
+    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف.</string>
+    <string name="noGroupCards">هذه المجموعة فارغة</string>
+    <string name="group_name_already_in_use">اسم المجموعة قيد الاستخدام بالفعل</string>
+    <string name="group_name_is_empty">لا يمكن أن يكون اسم المجموعة فارغًا</string>
+    <string name="group_updated">تم تحديث المجموعة</string>
+    <string name="all">الكل</string>
+    <string name="deleteConfirmationGroup">هل تريد حذف المجموعة؟</string>
+    <string name="failedOpeningFileManager">قم بتثبيت مدير الملفات أولاً.</string>
+    <string name="moveUp">تحرك لأعلى</string>
+    <string name="addFromImage">حدد صورة من المعرض</string>
+    <string name="balance">الرصيد</string>
+    <string name="currency">العملة</string>
+    <string name="points">نقاط</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> لا يبدو أنه رصيد صالح.</string>
+    <string name="chooseImportType">استيراد البيانات من</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">سياسة الخصوصية</string>
+    <string name="accept">قبول</string>
+    <string name="importCatima">الاستيراد من Catima</string>
+    <string name="importCatimaMessage">حدد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد.
+\nقم بإنشائه من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
+    <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 للاستيراد.
+\nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
+    <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
+    <string name="importVoucherVaultMessage">حدد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.
+\nقم بإنشائه بالضغط على تصدير في Voucher Vault أولاً.</string>
+    <string name="barcodeId">قيمة الباركود</string>
+    <string name="sameAsCardId">نفس بطاقة الهوية</string>
+    <string name="setBarcodeId">قم بتعيين قيمة الباركود</string>
+    <string name="wrongValueForBarcodeType">القيمة غير صالحة لنوع الباركود المحدد</string>
+    <string name="copy_to_clipboard_multiple_toast">تم نسخ بطاقات الهوية إلى الحافظة</string>
+    <string name="intent_import_card_from_url_share_multiple_text">أريد مشاركة بعض البطاقات معك</string>
+    <string name="frontImageDescription">الصورة الأمامية</string>
+    <string name="backImageDescription">الصورة الخلفية</string>
+    <string name="photos">الصور</string>
+    <string name="setFrontImage">تعيين الصورة الأمامية</string>
+    <string name="setBackImage">الصورة الخلفية</string>
+    <string name="removeImage">إزالة الصورة</string>
+    <string name="takePhoto">التقاط صورة</string>
+    <string name="updateBarcodeQuestionTitle">هل تريد تحديث قيمة الباركود؟</string>
+    <string name="updateBarcodeQuestionText">لقد قمت بتغيير بطاقة الهوية. هل تريد أيضًا تحديث الباركود لاستخدام نفس القيمة؟</string>
+    <string name="yes">نعم</string>
+    <string name="no">لا</string>
+    <string name="passwordRequired">الرجاء إدخال كلمة المرور</string>
+    <string name="exportPassword">قم بتعيين كلمة مرور لحماية التصدير (اختياري)</string>
+    <string name="exportPasswordHint">أدخل كلمة المرور</string>
+    <string name="turn_flashlight_on">قم بتشغيل المصباح</string>
+    <string name="turn_flashlight_off">أطفئ المصباح</string>
+    <string name="settings_locale">لغة</string>
+    <string name="settings_system_locale">النظام</string>
+    <string name="setIcon">تعيين رمز</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">زهري</string>
+    <string name="settings_magenta_theme">أرجواني</string>
+    <string name="settings_violet_theme">البنفسجي</string>
+    <string name="settings_blue_theme">أزرق</string>
+    <string name="settings_sky_blue_theme">أزرق سماوي</string>
+    <string name="settings_green_theme">أخضر</string>
+    <string name="settings_grey_theme">رمادي</string>
+    <string name="settings_brown_theme">بني</string>
+    <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">فرز</string>
+    <string name="showMoreInfo">اظهر المعلومات</string>
+    <string name="hideMoreInfo">إخفاء المعلومات</string>
+    <string name="swipeToSwitchImages">اسحب أو اضغط لفترة طويلة لتبديل الصور</string>
+    <string name="sort_by_balance">الرصيد</string>
+    <string name="reverse">... بترتيب معكوس</string>
+    <string name="sort_by">صنف حسب</string>
+    <string name="settings_oled_dark">خلفية سوداء نقية لمظهر داكن</string>
+    <string name="credits">الاعتمادات</string>
+    <string name="source_repository">مستودع المصدر</string>
+    <string name="and_data_usage">واستخدام البيانات</string>
+    <string name="rate_this_app">قيم هذا التطبيق</string>
+    <string name="translate_platform">على Weblate</string>
+    <string name="shortcutSelectCard">اختر بطاقة</string>
+    <string name="options">خيارات</string>
+    <string name="starred">مميز بنجمة</string>
+    <string name="set_scale">ضبط النطاق</string>
+    <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم ، فقم بتضمين المعلومات التالية:</string>
+    <string name="duplicateCard">كرر</string>
+    <string name="archive">ضع الي الأرشيف</string>
+    <string name="unarchive">أخرج من الأرشيف</string>
+    <string name="archived">تمت أرشفة البطاقة</string>
+    <string name="unarchived">البطاقة غير مؤرشفة</string>
+    <string name="archiveList">أرشيف</string>
+    <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
+    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذة المجموعة.</string>
+    <string name="deleteTitle">مسح بطاقة</string>
+    <plurals name="selectedCardCount">
+        <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> محددة</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> محدد</item>
+    </plurals>
+    <string name="importing">جار الاستيراد…</string>
+    <string name="exportName">تصدير</string>
+    <string name="exporting">جار التصدير…</string>
+    <string name="importSuccessfulTitle">مستورد</string>
+    <string name="importFailedTitle">فشل الاستيراد</string>
+    <string name="sort_by_most_recently_used">الأكثر أستعمالا مؤخرا</string>
+    <string name="license">رخصة</string>
+    <string name="sort_by_name">اسم</string>
+    <string name="version_history">تاريخ النسخة</string>
+    <string name="action_hide_details">أخف التفاصيل</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="zero"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="one"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="two"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="zero">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="one">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="few">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="many">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="other">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="zero">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="one">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="two">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="few">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+        <item quantity="many">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+        <item quantity="other">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+    </plurals>
+    <string name="importOptionFilesystemTitle">الاستيراد من نظام الملفات</string>
+    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات.</string>
+    <string name="about_title_fmt">حول <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">نسخة: <xliff:g id="version">%s</xliff:g></string>
+    <string name="settings_system_theme">نظام</string>
+    <string name="settings_lock_on_opening_orientation">قفل على الاتجاه عند فتح البطاقة</string>
+    <string name="app_resources">موارد الطرف الثالث الحرة: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="settings_follow_system_orientation">نظام المتابعة</string>
+    <string name="groups">مجموعات</string>
+    <string name="barcode">باركود</string>
+    <string name="settings_keep_screen_on">حافظ على الشاشة قيد التشغيل</string>
+    <string name="intent_import_card_from_url_share_text">اريد مشاركة بطاقة معك</string>
+    <string name="groupsList">مجموعات: <xliff:g>%s</xliff:g></string>
+    <string name="settings_disable_lockscreen_while_viewing_card">منع قفل الشاشة</string>
+    <string name="leaveWithoutSaveTitle">خروج</string>
+    <string name="editGroup">مجموعة التعديل: <xliff:g>%s</xliff:g></string>
+    <plurals name="groupCardCount">
+        <item quantity="zero"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> بطاقات</item>
+    </plurals>
+    <string name="moveDown">تحرك لأسفل</string>
+    <string name="leaveWithoutSaveConfirmation">المغادرة دون حفظ؟</string>
+    <string name="addManually">أدخل بطاقة الهوية يدويًا</string>
+    <string name="moveBarcodeToTopOfScreen">انقل الباركود إلى أعلى الشاشة</string>
+    <string name="balanceSentence">الرصيد: <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="moveBarcodeToCenterOfScreen">قم بتوسيط الرمز الشريطي على الشاشة</string>
+    <plurals name="balancePoints">
+        <item quantity="zero"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="two"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> نقطات</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> نقطات</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> نقطات</item>
+    </plurals>
+    <string name="card">بطاقة</string>
+    <string name="selectColor">إختر لون</string>
+    <string name="editBarcode">تعديل الباركود</string>
+    <string name="expiryDate">تاريخ انتهاء الصلاحية</string>
+    <string name="never">أبداً</string>
+    <string name="chooseExpiryDate">اختر تاريخ انتهاء الصلاحية</string>
+    <string name="errorReadingImage">لا يمكن قراءة الصورة</string>
+    <string name="noBarcodeFound">لم يتم العثور على باركود</string>
+    <string name="on_github">على GitHub</string>
+    <string name="report_error">الإبلاغ عن خطأ</string>
+    <string name="sort_by_expiry">انقضاء</string>
+    <string name="noUnarchivedCardsMessage">لا توجد بطاقات غير مؤرشفة موجودة</string>
+    <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="importLoyaltyCardKeychainMessage">حدد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد.
+\nقم بإنشائه من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
+    <string name="importStocard">الاستيراد من Stocard</string>
+    <string name="privacy_policy_popup_text">إشعار سياسة الخصوصية (مطلوب من قبل بعض متاجر التطبيقات):
+\n
+\nلا يتم جمع أي بيانات على الإطلاق ، والتي يمكن لأي شخص تأكيدها لأن تطبيقنا هو برنامج حر.</string>
+    <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
+    <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
+    <string name="action_show_details">اظهر التفاصيل</string>
+    <string name="on_google_play">على Google Play</string>
+    <string name="settings_theme_color">لون المظهر</string>
+    <string name="previousCard">السابق</string>
+    <string name="nextCard">التالي</string>
+</resources>

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

@@ -10,7 +10,7 @@
     <string name="cancel">Отказ</string>
     <string name="unstar">Премахва от любими</string>
     <string name="star">Добавя към любими</string>
-    <string name="noBarcode">Без щрихкод</string>
+    <string name="noBarcode">Липсва щрихкод</string>
     <string name="barcodeNoBarcode">Липсва щрихкод</string>
     <string name="barcodeType">Вид на щрихкод</string>
     <string name="cardId">Идентификатор на карта</string>
@@ -87,7 +87,6 @@
     <string name="enter_group_name">Въведете име на списъка</string>
     <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
     <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
-    <string name="settings_lock_barcode_orientation">Без на завъртане на щрихкода</string>
     <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
     <string name="settings_max_font_size_scale">Максимален размер на шрифта</string>
@@ -139,8 +138,6 @@
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
     <string name="exportSuccessful">Данните са изнесени</string>
-    <string name="unlockScreen">Разрешава автоматичното завъртане</string>
-    <string name="lockScreen">Спира автоматичното завъртане</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> избрана</item>
         <item quantity="other"><xliff:g>%d</xliff:g> избрани</item>
@@ -151,7 +148,6 @@
     <string name="addFromImage">Избор от галерията</string>
     <string name="addManually">Ръчно въвеждане</string>
     <string name="leaveWithoutSaveConfirmation">Оставяте промените незапазени\?</string>
-    <string name="unsupportedBarcodeType">Щрихкод от този вид не може да бъде показан. Може да бъде поддържан в следващо издание.</string>
     <string name="importStocard">Внасяне от Stocard</string>
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
@@ -161,7 +157,7 @@
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
-    <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
+    <string name="failedGeneratingShareURL">Не може да бъде генериран адрес за споделяне. Изпратете доклад за дефект.</string>
     <string name="deleteTitle">Премахване на карта</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Изтриване на <xliff:g>%d</xliff:g> карта</item>
@@ -231,4 +227,29 @@
     </plurals>
     <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
     <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
+    <string name="settings_card_orientation">Положение на щрихкода</string>
+    <string name="settings_follow_system_orientation">Според системата</string>
+    <string name="settings_portrait_orientation">Портретно</string>
+    <string name="settings_landscape_orientation">Пейзажно</string>
+    <string name="settings_lock_on_opening_orientation">Използване на положението, използвано при отваряне на картата</string>
+    <string name="duplicateCard">Дублиране</string>
+    <string name="archive">Архивиране</string>
+    <string name="unarchive">Изваждане от архива</string>
+    <string name="archived">Картата е архивирана</string>
+    <string name="unarchived">Карта е извадена от архива</string>
+    <string name="archiveList">Архив</string>
+    <string name="noUnarchivedCardsMessage">Няма карти извън архива</string>
+    <string name="failedLaunchingPhotoPicker">Не е намерено поддържано приложение за галерия.</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> карта (<xliff:g id="archivedCount">%2$d</xliff:g> архивирана)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> карти (<xliff:g id="archivedCount">%2$d</xliff:g> архивирани)</item>
+    </plurals>
+    <string name="previousCard">Предишна</string>
+    <string name="nextCard">Следваща</string>
+    <string name="failedToOpenUrl">Първо инсталирайте уеб браузър</string>
+    <string name="welcome">Добре дошли при Катима</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>
 </resources>

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

@@ -21,7 +21,6 @@
     <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</string>
     <string name="settings_disable_lockscreen_while_viewing_card"> কার্ড দেখা কালিন লকস্ক্রিন নিষ্ক্রিয়</string>
     <string name="settings_keep_screen_on">সেটিংস পর্দা খোলা রাখুন</string>
-    <string name="settings_lock_barcode_orientation"> তালাবদ্ধ বার কোড অভিযোজন</string>
     <string name="settings_max_font_size_scale">সর্বোচ্চ হরফ আকার</string>
     <string name="settings_light_theme">সাদাটে থিম</string>
     <string name="settings_system_theme">যন্ত্রর থিম</string>
@@ -35,7 +34,6 @@
     <string name="barcodeId">বারকোড আইডি</string>
     <string name="sameAsCardId">কার্ড আইডির মতো</string>
     <string name="setBarcodeId">বারকোড আইডি সেট করুন</string>
-    <string name="unsupportedBarcodeType">অসমর্থিত বারকোড টাইপ</string>
     <string name="wrongValueForBarcodeType">বারকোড টাইপের জন্য ভুল মান</string>
     <string name="copy_to_clipboard_multiple_toast">ক্লিপবোর্ড একাধিক টোস্টে অনুলিপি করুন</string>
     <string name="intent_import_card_from_url_share_multiple_text">url থেকে ইন্টেন্ট ইম্পোর্ট কার্ড একাধিক টেক্সট শেয়ার করে</string>
@@ -82,7 +80,6 @@
     <string name="share">ভাগ</string>
     <string name="copy_to_clipboard">নকল করুন ক্লিপবোর্ড এ</string>
     <string name="deleteConfirmation">নিশ্চিতকরণ মুছে দিন</string>
-    <string name="unlockScreen">পর্দা আনলক করুন</string>
     <string name="confirm">নিশ্চিত করুন</string>
     <string name="delete">মুছে ফেলুন</string>
     <string name="edit">সম্পাদনা</string>

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

@@ -21,7 +21,6 @@
     <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
     <string name="settings_keep_screen_on">Zadrži ekran</string>
-    <string name="settings_lock_barcode_orientation">Zaključaj barcode orjentacija</string>
     <string name="settings_max_font_size_scale">Max. veliäťina fonta</string>
     <string name="settings_light_theme">Svjetlo</string>
     <string name="settings_system_theme">Sistem</string>
@@ -35,7 +34,6 @@
     <string name="barcodeId">Barcode vrijednost</string>
     <string name="sameAsCardId">Isto kao i kartica</string>
     <string name="setBarcodeId">Postavi vrijednost za bar kod</string>
-    <string name="unsupportedBarcodeType">Ovaj bar kod još nije prikazan. Ona može biti podržana u kasnijoj verziji app.</string>
     <string name="wrongValueForBarcodeType">Izabrana vrijednost nije izvršna</string>
     <string name="copy_to_clipboard_multiple_toast">IDs kartica kopiran u clipboard</string>
     <string name="intent_import_card_from_url_share_multiple_text">Želim podijeliti karte s tobom</string>
@@ -82,7 +80,6 @@
     <string name="share">Podijeli</string>
     <string name="copy_to_clipboard">Kopiraj ID u clipboard</string>
     <string name="deleteConfirmation">Izbriši trajno ovu karticu\?</string>
-    <string name="unlockScreen">Odblokalna Rotacija</string>
     <string name="confirm">Potvrdi</string>
     <string name="delete">Obriši</string>
     <string name="edit">Izmijeni</string>

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

@@ -13,40 +13,40 @@
     <string name="ok">Ano</string>
     <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
     <string name="sendLabel">Odeslat…</string>
-    <string name="editCardTitle">Editovat věrnostní kartu</string>
-    <string name="addCardTitle">Přidat věrnostní kartu</string>
+    <string name="editCardTitle">Editovat kartu</string>
+    <string name="addCardTitle">Přidat kartu</string>
     <string name="scanCardBarcode">Skenování čárového kódu</string>
-    <string name="noStoreError">Zadáno žádné jméno</string>
-    <string name="noCardIdError">ID nezadáno</string>
+    <string name="noStoreError">Nezadáno žádné jméno</string>
+    <string name="noCardIdError">Nezadáno ID</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování dat vám umožní přesunout je do jiného zařízení.</string>
     <string name="importSuccessfulTitle">Importováno</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Nelze provést import</string>
+    <string name="importFailed">Import nelze provést</string>
     <string name="exportSuccessfulTitle">Exportováno</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze provést export</string>
+    <string name="exportFailed">Export nelze provést</string>
     <string name="importing">Importuji…</string>
     <string name="exporting">Exportuji…</string>
     <string name="noExternalStoragePermissionError">Udělit oprávnění přístupu k externímu úložišti pro import nebo export dat</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
-    <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
+    <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v úložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
-    <string name="importOptionApplicationTitle">Použijte jinou aplikaci</string>
+    <string name="importOptionApplicationTitle">Použitím jiné aplikace</string>
     <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
-    <string name="importOptionApplicationButton">Použijte jinou aplikaci</string>
+    <string name="importOptionApplicationButton">Použít jinou aplikaci</string>
     <string name="about">O aplikaci</string>
     <string name="app_license">Copyleftovaný svobodný software s licencí GPLv3+</string>
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="copy_to_clipboard_toast">ID zkopírované do schránky</string>
+    <string name="copy_to_clipboard_toast">ID zkopírováno do schránky</string>
     <string name="deleteTitle">Smazat kartu</string>
-    <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
-    <string name="moveBarcodeToCenterOfScreen">Střed čárového kódu na obrazovce</string>
-    <string name="moveBarcodeToTopOfScreen">Přesuňte čárový kód do horní části obrazovky</string>
+    <string name="deleteConfirmation">Opravdu chcete smazat tuto kartu\?</string>
+    <string name="moveBarcodeToCenterOfScreen">Vycentrovat čárový kód na obrazovce</string>
+    <string name="moveBarcodeToTopOfScreen">Přesunout čárový kód do horní části obrazovky</string>
     <string name="chooseExpiryDate">Zvolte datum vypršení platnosti</string>
     <string name="never">Nikdy</string>
     <string name="expiryDate">Platnost</string>
@@ -58,12 +58,10 @@
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
     <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
-    <string name="noCardExistsError">Kartu nelze najít</string>
+    <string name="noCardExistsError">Takovou kartu nelze najít</string>
     <string name="noCardsMessage">Nejprve přidejte kartu</string>
-    <string name="cardShortcut">Zástupce Karty</string>
+    <string name="cardShortcut">Zástupce karty</string>
     <string name="share">Podíl</string>
-    <string name="unlockScreen">Odblokovat Rotaci</string>
-    <string name="lockScreen">Otáčení Bloku</string>
     <string name="unstar">Odebrat z oblíbených</string>
     <string name="star">Přidat do oblíbených</string>
     <string name="noBarcode">Žádný čárový kód</string>
@@ -72,26 +70,25 @@
     <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste změnit vyhledávání.</string>
     <string name="action_search">Vyhledávání</string>
     <string name="thumbnailDescription">Miniatura</string>
-    <string name="card_ids_copied">Zkopírované ID</string>
+    <string name="card_ids_copied">ID zkopírováno</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Opravdu chcete kartu <xliff:g>%d</xliff:g> trvale odstranit\?</item>
-        <item quantity="few">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
-        <item quantity="other">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
+        <item quantity="one">Opravdu chcete <xliff:g>%d</xliff:g> kartu trvale odstranit\?</item>
+        <item quantity="few">Opravdu chcete <xliff:g>%d</xliff:g> karty trvale odstranit\?</item>
+        <item quantity="other">Opravdu chcete <xliff:g>%d</xliff:g> karet trvale odstranit\?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Odstranit kartu <xliff:g>%d</xliff:g></item>
-        <item quantity="few">Odstranit karty <xliff:g>%d</xliff:g></item>
-        <item quantity="other">Odstranit karty <xliff:g>%d</xliff:g></item>
+        <item quantity="one">Odstranit <xliff:g>%d</xliff:g> kartu</item>
+        <item quantity="few">Odstranit <xliff:g>%d</xliff:g> karty</item>
+        <item quantity="other">Odstranit <xliff:g>%d</xliff:g> karet</item>
     </plurals>
     <string name="importSuccessful">Data importována</string>
     <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
     <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
-    <string name="settings_lock_barcode_orientation">Zamknout orientaci čárového kódu</string>
     <string name="settings_max_font_size_scale">Maximální velikost písma</string>
     <string name="settings_dark_theme">Tmavý</string>
     <string name="settings_light_theme">Světlý</string>
-    <string name="settings_system_theme">Systém</string>
+    <string name="settings_system_theme">Podle systému</string>
     <string name="settings_theme">Vzhled</string>
     <string name="settings_category_title_ui">Uživatelské rozhraní</string>
     <string name="settings">Nastavení</string>
@@ -101,7 +98,7 @@
     <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Přesunout dolů</string>
     <string name="moveUp">Přesunout nahoru</string>
-    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
+    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo „Tato karta nemá čárový kód“.</string>
     <string name="settings_brown_theme">Hnědá</string>
     <string name="settings_grey_theme">Šedá</string>
     <string name="settings_green_theme">Zelená</string>
@@ -112,7 +109,7 @@
     <string name="settings_pink_theme">Růžová</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">Barva motivu</string>
-    <string name="settings_system_locale">Systém</string>
+    <string name="settings_system_locale">Podle systému</string>
     <string name="settings_locale">Jazyk</string>
     <string name="turn_flashlight_off">Vypnout světlo</string>
     <string name="turn_flashlight_on">Zapnout světlo</string>
@@ -129,27 +126,26 @@
     <string name="photos">Fotky</string>
     <string name="backImageDescription">Obrázek zadní strany</string>
     <string name="frontImageDescription">Obrázek přední strany</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Chci s Vámi sdílet kartu</string>
-    <string name="copy_to_clipboard_multiple_toast">ID zkopírováno do schránky</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Chci s vámi sdílet karty</string>
+    <string name="copy_to_clipboard_multiple_toast">ID zkopírována do schránky</string>
     <string name="wrongValueForBarcodeType">Hodnota není platná pro vybraný typ čárového kódu</string>
-    <string name="unsupportedBarcodeType">Tento typ čárového kódu zatím nelze zobrazit. Možná bude podporován v pozdější verzi aplikace.</string>
     <string name="barcodeId">Hodnota čárového kódu</string>
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
     <string name="sameAsCardId">Stejné jako ID</string>
-    <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
-\nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> exportovaný z Voucher Vault, který chcete importovat.
+\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 svůj <i>***-sync.zip</i> export z aplikace Stocard, který chcete importovat.
-\nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
+    <string name="importStocardMessage">Vyberte svůj <i>***-sync.zip</i> exportovaný z aplikace Stocard, který chcete importovat.
+\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 export <i>LoyaltyCardKeychain.csv</i> z klíčenky věrnostních karet, který chcete importovat.
-\nVytvořte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
+    <string name="importLoyaltyCardKeychainMessage">Vyberte <i>LoyaltyCardKeychain.csv</i> exportovaný z Loyalty Card Keychain, který chcete importovat.
+\nVytvoříte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
     <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně.
-\nVytvořte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
+    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> exportovaný z FidMe k importu a poté vyberte typy čárových kódů ručně.
+\nVytvoříte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extrahovat moje data.</string>
     <string name="importFidme">Import z FidMe</string>
-    <string name="importCatimaMessage">Vyberte export <i>catima.zip</i> z programu Catima, který chcete importovat.
-\nVytvořte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
+    <string name="importCatimaMessage">Vyberte <i>catima.zip</i> exportovaný z aplikace Catima, který chcete importovat.
+\nVytvoříte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
     <string name="importCatima">Import z Catima</string>
     <string name="accept">Přijmout</string>
     <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
@@ -163,7 +159,7 @@
     <string name="currency">Měna</string>
     <string name="balance">Zůstatek</string>
     <string name="errorReadingImage">Obrázek se nepodařilo přečíst</string>
-    <string name="noBarcodeFound">Čarový kód nenalezen</string>
+    <string name="noBarcodeFound">Čárový kód nenalezen</string>
     <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Výběr obrázku z galerie</string>
     <string name="addManually">Ruční zadání ID</string>
@@ -203,7 +199,7 @@
     <string name="version_history">Historie verzí</string>
     <string name="rate_this_app">Ohodnoťte tuto aplikaci</string>
     <string name="and_data_usage">a využití dat</string>
-    <string name="credits">Kredity</string>
+    <string name="credits">Zásluhy</string>
     <string name="on_github">na GitHubu</string>
     <string name="source_repository">Úložiště zdrojů</string>
     <string name="license">Licence</string>
@@ -212,10 +208,10 @@
     <string name="on_google_play">na Google Play</string>
     <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
     <string name="exportPasswordHint">Zadejte heslo</string>
-    <string name="selectColor">Vyberte barvu</string>
+    <string name="selectColor">Vybrat barvu</string>
     <string name="setIcon">Nastavit ikonu</string>
     <string name="group_edit">Upravit skupinu</string>
-    <string name="group_name_already_in_use">Již použitý název skupiny</string>
+    <string name="group_name_already_in_use">Název skupiny je již použitý</string>
     <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
     <string name="group_updated">Skupina aktualizována</string>
     <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
@@ -234,4 +230,33 @@
         <item quantity="few"><xliff:g>%s</xliff:g> body</item>
         <item quantity="other"><xliff:g>%s</xliff:g> bodů</item>
     </plurals>
+    <string name="settings_oled_dark">Čistě černé pozadí pro tmavý motiv</string>
+    <string name="include_if_asking_support">Pokud chcete požádat o podporu, uveďte následující informace:</string>
+    <string name="settings_follow_system_orientation">Následovat systém</string>
+    <string name="settings_portrait_orientation">Na výšku</string>
+    <string name="settings_lock_on_opening_orientation">Zamknout podle orientace použité při otevření karty</string>
+    <string name="archive">Archivovat</string>
+    <string name="unarchive">Vrátit z archivu</string>
+    <string name="archiveList">Archivovat</string>
+    <string name="noUnarchivedCardsMessage">Nejsou žádné karty vrácené z archivu</string>
+    <string name="unarchived">Karta vrácena z archivu</string>
+    <string name="settings_card_orientation">Orientace čárového kódu</string>
+    <string name="settings_landscape_orientation">Na šířku</string>
+    <string name="duplicateCard">Duplikovat</string>
+    <string name="archived">Karta archivována</string>
+    <string name="failedLaunchingPhotoPicker">Nepodařilo se najít podporovanou aplikaci galerie</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> karta (<xliff:g id="archivedCount">%2$d</xliff:g> archivovaná)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> karty (<xliff:g id="archivedCount">%2$d</xliff:g> archivované)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> karet (<xliff:g id="archivedCount">%2$d</xliff:g> archivovaných)</item>
+    </plurals>
+    <string name="previousCard">Předchozí</string>
+    <string name="nextCard">Následující</string>
+    <string name="failedToOpenUrl">Nejprve nainstalujte webový prohlížeč</string>
+    <string name="welcome">Vítejte v Catima</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karta)</item>
+        <item quantity="few">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karty)</item>
+        <item quantity="other">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karet)</item>
+    </plurals>
 </resources>

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

@@ -13,8 +13,6 @@
         <item quantity="other">Streichen <xliff:g>%d</xliff:g> korts</item>
     </plurals>
     <string name="deleteTitle">Karte streichen</string>
-    <string name="unlockScreen">Afbloker rotation</string>
-    <string name="lockScreen">Blokrotation</string>
     <string name="confirm">Bekræft</string>
     <string name="delete">Slet</string>
     <string name="edit">Rediger</string>
@@ -85,7 +83,6 @@
     <string name="intent_import_card_from_url_share_text">Jeg vil dele et kort med jer</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
     <string name="settings_keep_screen_on">LHold skærm tændt</string>
-    <string name="settings_lock_barcode_orientation">Lås stregkode-orientering</string>
     <string name="moveUp">Bevæg dig opad</string>
     <string name="leaveWithoutSaveConfirmation">Forlade uden at gemme\?</string>
     <string name="settings_display_barcode_max_brightness">Lysere stregkodevisning</string>

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

@@ -12,8 +12,6 @@
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="confirm">Bestätigen</string>
-    <string name="lockScreen">Rotation sperren</string>
-    <string name="unlockScreen">Rotation erlauben</string>
     <string name="star">Zu den Favoriten hinzufügen</string>
     <string name="unstar">Aus den Favoriten entfernen</string>
     <string name="ok">OK</string>
@@ -56,7 +54,6 @@
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
     <string name="settings_display_barcode_max_brightness">Barcodeansicht aufhellen</string>
-    <string name="settings_lock_barcode_orientation">Barcoderotation sperren</string>
     <string name="exportSuccessful">Daten exportiert</string>
     <string name="importSuccessful">Daten importiert</string>
     <string name="intent_import_card_from_url_share_text">Ich würde gerne diese Karte mit dir teilen</string>
@@ -134,7 +131,6 @@
     <string name="noBarcodeFound">Kein Barcode erkannt</string>
     <string name="addFromImage">Bild aus der Galerie wählen</string>
     <string name="settings_max_font_size_scale">Maximale Schriftgröße</string>
-    <string name="unsupportedBarcodeType">Dieser Barcodetyp kann noch nicht angezeigt werden. Wir hoffen das Format in einer zukünftigen Version zu unterstützen.</string>
     <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider nicht gültig</string>
     <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Freie Bibliotheken von Drittanbietern: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@@ -231,4 +227,29 @@
     </plurals>
     <string name="settings_oled_dark">Rein schwarzer Hintergrund für dunkles Thema</string>
     <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
+    <string name="settings_follow_system_orientation">System folgen</string>
+    <string name="settings_landscape_orientation">Landschaft</string>
+    <string name="archiveList">Archiv</string>
+    <string name="noUnarchivedCardsMessage">Es gibt keine nicht archivierten Karten</string>
+    <string name="settings_portrait_orientation">Porträt</string>
+    <string name="duplicateCard">Duplizieren</string>
+    <string name="unarchive">Archivierung aufheben</string>
+    <string name="settings_card_orientation">Barcode-Ausrichtung</string>
+    <string name="unarchived">Karte nicht archiviert</string>
+    <string name="archive">Archivieren</string>
+    <string name="archived">Karte archiviert</string>
+    <string name="settings_lock_on_opening_orientation">Kartenausrichtung nach dem Öffnen beibehalten</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> Karte (<xliff:g id="archivedCount">%2$d</xliff:g> archiviert)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> Karten (<xliff:g id="archivedCount">%2$d</xliff:g> archiviert)</item>
+    </plurals>
+    <string name="failedLaunchingPhotoPicker">Es konnte keine unterstützte Galerie-Anwendung gefunden werden</string>
+    <string name="previousCard">Vorherige</string>
+    <string name="nextCard">Nächste</string>
+    <string name="failedToOpenUrl">Installieren Sie zunächst einen Webbrowser</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karte)</item>
+        <item quantity="other">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karten)</item>
+    </plurals>
+    <string name="welcome">Willkommen bei Catima</string>
 </resources>

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

@@ -1,8 +1,8 @@
 <?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="action_add">Προσθήκη</string>
-    <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
-    <string name="storeName">Κατάστημα</string>
+    <string name="noGiftCards">Κάντε κλικ στο + κουμπί για να προσθέσετε μία κάρτα ή εισάγετε κάρτες από το ⋮ μενού.</string>
+    <string name="storeName">Όνομα</string>
     <string name="note">Σημείωση</string>
     <string name="cardId">Κωδικός Κάρτας</string>
     <string name="cancel">Άκυρο</string>
@@ -10,51 +10,238 @@
     <string name="edit">Επεξεργασία</string>
     <string name="delete">Διαγραφή</string>
     <string name="confirm">Επιβεβαίωση</string>
-    <string name="lockScreen">Αποκλεισμός Περιστροφής</string>
-    <string name="unlockScreen">Περιστροφή</string>
     <string name="ok">Εντάξει</string>
     <string name="copy_to_clipboard">Αντιγραφή κωδικού στο πρόχειρο</string>
     <string name="sendLabel">Αποστολή…</string>
     <string name="editCardTitle">Επεξεργασία Κάρτας</string>
     <string name="addCardTitle">Προσθήκη Κάρτας</string>
-    <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
+    <string name="scanCardBarcode">Σαρώστε τον γραμμοκώδικα (bardcode)</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
-    <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
-    <string name="noStoreError">Δεν δώσατε κατάστημα</string>
-    <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
-    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
+    <string name="noCardsMessage">Προσθέστε μία κάρτα πρώτα</string>
+    <string name="noStoreError">Δεν έχει εισαχθεί όνομα</string>
+    <string name="noCardIdError">Δεν έχει εισαχθεί κωδικός</string>
+    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί η κάρτα</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
-    <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
-    <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
+    <string name="importExportHelp">Τα αντίγραφα ασφαλείας, σας επιτρέπουν να τα εισάγετε σε άλλη συσκευή.</string>
+    <string name="importSuccessfulTitle">Εισήχθησαν</string>
     <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
-    <string name="importFailed">Δεν εισήχθει</string>
+    <string name="importFailed">Δεν ήταν δυνατή η εισαγωγή</string>
     <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
     <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη</string>
+    <string name="exportFailed">Δεν ήταν δυνατή η εξαγωγή</string>
     <string name="importing">Γίνεται εισαγωγή του…</string>
     <string name="exporting">Γίνεται εξαγωγή του…</string>
-    <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
+    <string name="noExternalStoragePermissionError">Εγκρίνετε την άδεια εξωτερικής αποθήκευσης για να εισάγετε ή εξάγετε δεδομένα</string>
     <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
     <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
     <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
-    <string name="importOptionApplicationTitle">Χρήση εξωτερικής εφαρμογής</string>
-    <string name="importOptionApplicationExplanation">Κάντε χρήση μίας εξωτερικής εφαρμογής όπως είναι τα Dropbox, Google Drive ή ο αγαπημένος σας διαχειριστής αρχείων για να ανοίξετε ένα αρχείο.</string>
-    <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
+    <string name="importOptionApplicationTitle">Χρήση άλλης εφαρμογής</string>
+    <string name="importOptionApplicationExplanation">Χρησιμοποιήστε οποιαδήποτε εφαρμογή ή τον αγαπημένο περιηγητή αρχείων σας, για να ανοίξετε ένα αρχείο.</string>
+    <string name="importOptionApplicationButton">Χρήσης άλλης εφαρμογής</string>
     <string name="about">Σχετικά</string>
-    <string name="app_license">Άδεια χρήσης υπό το GPLv3.</string>
+    <string name="app_license">Άδεια χρήσης υπό GPLv3+</string>
     <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Πληροφορίες Αναθεώρησης: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
-    <string name="copy_to_clipboard_toast">Ο κωδικός της κάρτας αντιγράφτηκε στο πρόχειρο</string>
-    <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
+    <string name="copy_to_clipboard_toast">Ο κωδικός αντιγράφτηκε στο πρόχειρο</string>
+    <string name="thumbnailDescription">Μικρογραφία</string>
     <string name="settings">Ρυθμίσεις</string>
     <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
     <string name="settings_dark_theme">Σκοτεινό</string>
     <string name="settings_light_theme">Φωτεινό</string>
     <string name="settings_system_theme">Σύστημα</string>
     <string name="barcode">Γραμμικός κώδικας</string>
-    <string name="deleteTitle">Αφαίρεση Κάρτας</string>
-    <string name="deleteConfirmation">Παρακαλώ επιβεβαιώστε ότι θέλετε να διαγράψετε αυτή την κάρτα.</string>
+    <string name="deleteTitle">Διαγραφή Κάρτας</string>
+    <string name="deleteConfirmation">Μόνιμη διαγραφή της κάρτας;</string>
+    <string name="action_search">Αναζήτηση</string>
+    <string name="noMatchingGiftCards">Κανένα αποτέλεσμα. Δοκίμασε με διαφορετικές λέξεις.</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> επιλέγχθηκε</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> επιλέγχθηκαν</item>
+    </plurals>
+    <string name="noGiftCardsGroup">Δημιούργησε κάρτες και βάλτες σε αυτή την ομάδα.</string>
+    <string name="barcodeNoBarcode">Δεν υπάρχει barcode</string>
+    <string name="addManually">Χειροκίνητη εισαγωγή κωδικού</string>
+    <string name="never">Ποτέ</string>
+    <string name="share">Κοινοποίηση</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="exportOptionExplanation">Τα δεδομένα θα μεταφερθούν σε τοποθεσία της επιλογής σας.</string>
+    <string name="settings_theme">Θέμα</string>
+    <string name="groupsList">Ομάδες: <xliff:g>%s</xliff:g></string>
+    <string name="barcodeId">Τιμή γραμμοκώδικα</string>
+    <string name="sort">Ταξινόμηση</string>
+    <string name="deleteConfirmationGroup">Διαγραφή ομάδας;</string>
+    <string name="moveDown">Προχώρα κάτω</string>
+    <string name="accept">Αποδοχή</string>
+    <string name="yes">Ναι</string>
+    <string name="no">Όχι</string>
+    <string name="addFromImage">Επιλογή εικόνας από την συλλογή</string>
+    <string name="expiryStateSentence">Λήγει: <xliff:g>%s</xliff:g></string>
+    <string name="expiryDate">Ημερομηνία λήξης</string>
+    <string name="settings_keep_screen_on">Κράτα την οθόνη ανοιχτή</string>
+    <string name="leaveWithoutSaveTitle">Έξοδος</string>
+    <string name="swipeToSwitchImages">Σύρετε ή πατήστε παρατεταμένα για να αλλάξετε εικόνες</string>
+    <string name="sort_by_balance">Υπόλοιπο</string>
+    <string name="reverse">... σε αντίθετη σειρά</string>
+    <string name="version_history">Ιστορικό έκδοσης</string>
+    <string name="sort_by">Ταξινόμηση κατά</string>
+    <string name="credits">Πιστώσεις</string>
+    <string name="help_translate_this_app">Βοηθήστε να μεταφραστεί η εφαρμογή</string>
+    <string name="source_repository">Αποθήκη κώδικα</string>
+    <string name="on_github">στο GitHub</string>
+    <string name="on_google_play">στο Google Play</string>
+    <string name="report_error">Αναφορά Σφάλματος</string>
+    <string name="starred">Αγαπημένα</string>
+    <string name="translate_platform">στο Weblate</string>
+    <string name="set_scale">Ορίστε κλίμακα</string>
+    <string name="importLoyaltyCardKeychain">Εισαγωγή από Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Επιλέξτε την <i>LoyaltyCardKeychain.csv</i> εξαγωγή από το Loyalty Card Keychain για εισαγωγή.
+\nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής στο Loyalty Card Keychain επιλέγοντας Εξαγωγή.</string>
+    <string name="importFidme">Εισαγωγή από FidMe</string>
+    <string name="importFidmeMessage">Επιλέξτε την <i>fidme-export-request-xxxxxx.zip</i> εξαγωγή από το FidMe για εισαγωγή και επιλέξτε χειροκίνητα τους τύπους γραμμοκώδικα μετέπειτα.
+\nΔημιουργήστε το από το FidMe προφίλ επιλέγοντας Προστασία Δεδομένων και διαλέγοντας εξαγωγή δεδομένων.</string>
+    <string name="setBarcodeId">Επιλέξτε τιμή γραμμοκώδικα</string>
+    <string name="wrongValueForBarcodeType">Η τιμή δεν είναι έγκυρη για αυτού του τύπου γραμμοκώδικα</string>
+    <string name="copy_to_clipboard_multiple_toast">Οι κωδικοί αντιγράφηκαν στο πρόχειρο</string>
+    <string name="setBackImage">Επιλογή οπίσθιας εικόνας</string>
+    <string name="removeImage">Αφαίρεση εικόνας</string>
+    <string name="takePhoto">Τραβήξτε μια φωτογραφία</string>
+    <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμοκώδικα στην ίδια τιμή;</string>
+    <string name="action_show_details">Εμφάνιση λεπτομερειών</string>
+    <string name="options">Επιλογές</string>
+    <string name="hideMoreInfo">Απόκρυψη πληροφοριών</string>
+    <string name="noGroupCards">Αυτή η ομάδα είναι άδεια</string>
+    <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμοκώδικα</string>
+    <string name="group_name_is_empty">Το όνομα ομάδας δεν γίνεται να είναι κενό</string>
+    <string name="group_edit">Επεξεργασία ομάδας</string>
+    <string name="star">Προσθήκη στα αγαπημένα</string>
+    <string name="unstar">Αφαίρεση από τα αγαπημένα</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Διαγραφή <xliff:g>%d</xliff:g> κάρτας</item>
+        <item quantity="other">Διαγραφή <xliff:g>%d</xliff:g> καρτών</item>
+    </plurals>
+    <string name="card_ids_copied">Αντιγραμμένη/ες ταυτότητα/ες</string>
+    <string name="errorReadingImage">Δεν ήταν δυνατό να διαβαστεί η εικόνα</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> δεν φαίνεται να είναι έγκυρο το υπόλοιπο.</string>
+    <string name="currency">Νόμισμα</string>
+    <string name="privacy_policy">Πολιτική απορρήτου</string>
+    <string name="chooseImportType">Εισαγωγή δεδομένων από</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy_popup_text">Σημείωμα πολιτικής απορρήτου ( υποχρεωτικό σε κάποια \"μαγαζιά\" εφαρμογών)
+\n
+\nΜΗΔΕΝΙΚΆ ΔΕΔΟΜΈΝΑ ΣΥΛΛΈΓΟΝΤΑΙ, ο οποιοσδήποτε μπορεί να το επιβεβαιώσει μιας και η εφαρμογή είναι ελεύθερο λογισμικό.</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> κάρτα ( <xliff:g id="archivedCount">%2$d</xliff:g> αρχειοθετήθηκε)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> κάρτες ( <xliff:g id="archivedCount">%2$d</xliff:g> αρχειοθετήθηκαν)</item>
+    </plurals>
+    <string name="importCatimaMessage">Επιλέξτε την <i>catima.zip</i> εξαγωγή από το Catima για εισαγωγή
+\nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής μιας άλλης εφαρμογής Catima κάνοντας εξαγωγή εκεί πρώτα.</string>
+    <string name="importStocardMessage">Επιλέξτε την <i>***-sync.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>
+    <string name="setFrontImage">Επιλογή μπροστινής εικόνας</string>
+    <string name="importVoucherVaultMessage">Επιλέξτε την <i>vouchervault.json</i> εξαγωγή από το Voucher Vault για εισαγωγή.
+\nΔημιουργήστε το επιλέγοντας Εξαγωγή στο Voucher Vault.</string>
+    <string name="frontImageDescription">Μπροστινή εικόνα</string>
+    <string name="photos">Φωτογραφίες</string>
+    <string name="backImageDescription">Οπίσθια εικόνα</string>
+    <string name="updateBarcodeQuestionTitle">Ενημέρωση τιμής γραμμοκώδικα;</string>
+    <string name="passwordRequired">Παρακαλώ εισάγετε τον κωδικό</string>
+    <string name="sort_by_most_recently_used">Χρησιμοποιήθηκαν πρόσφατα</string>
+    <string name="shortcutSelectCard">Επιλέξτε μία κάρτα</string>
+    <string name="barcodeImageDescriptionWithType">Εικόνα <xliff:g>%s</xliff:g> γραμμοκώδικα</string>
+    <string name="app_libraries">Ελεύθερες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="license">Άδεια</string>
+    <string name="include_if_asking_support">Αν θέλετε να ζητήσετε υποστήριξη, συμπεριλάβετε τις ακόλουθες πληροφορίες:</string>
+    <string name="action_hide_details">Απόκρυψη λεπτομερειών</string>
+    <string name="importSuccessful">Δεδομένα εισήχθησαν</string>
+    <string name="moveUp">Προχώρα πάνω</string>
+    <string name="barcodeType">Τύπος γραμμοκώδικα</string>
+    <string name="app_resources">Ελεύθερες πηγές τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="selectColor">Επιλογή χρώματος</string>
+    <string name="setIcon">Ορισμός εικονιδίου</string>
+    <string name="settings_sky_blue_theme">Γαλάζιο</string>
+    <string name="settings_green_theme">Πράσινο</string>
+    <string name="settings_grey_theme">Γκρι</string>
+    <string name="settings_brown_theme">Καφέ</string>
+    <string name="sort_by_expiry">Λήξη</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="points">Πόντοι</string>
+    <string name="exportSuccessful">Δεδομένα εξήχθησαν</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Αποτροπή κλειδώματος οθόνης</string>
+    <string name="failedLaunchingPhotoPicker">Δεν βρέθηκε υποστηριζόμενη εφαρμογή συλλογής</string>
+    <string name="noBarcode">Χωρίς barcode</string>
+    <string name="starImage">Αγαπημένο αστέρι</string>
+    <string name="balanceSentence">Υπόλοιπο: <xliff:g>%s</xliff:g></string>
+    <string name="failedParsingImportUriError">Δεν ήταν δυνατή η ανάλυση του εισαγόμενου URL</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Διαγραφή της κάρτας <xliff:g>%d</xliff:g> μόνιμα;</item>
+        <item quantity="other">Διαγραφή των καρτρών <xliff:g>%d</xliff:g> μόνιμα;</item>
+    </plurals>
+    <string name="app_copyright_old">Βασισμένο στο Loyalty Card Keychain
+\nπνευματικά δικαιώματα © 2016-2020 Branden Archer</string>
+    <string name="enterBarcodeInstructions">Εισάγετε τον κωδικό και διαλέξτε έναν είδος γραμμοκώδικα από κάτω ή \"Δεν υπάρχει γραμμοκώδικας\".</string>
+    <string name="settings_follow_system_orientation">Ακολούθηση συστήματος</string>
+    <string name="settings_card_orientation">Προσανατολισμός γραμμοκώδικα</string>
+    <string name="settings_portrait_orientation">Πορτραίτο</string>
+    <string name="settings_landscape_orientation">Οριζόντια</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Πνευματικά δικαιώματα © 2019-<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="settings_lock_on_opening_orientation">Κλείδωμα τωρινού προσανατολισμού όταν ανοίγει μία κάρτα</string>
+    <string name="settings_max_font_size_scale">Μέγιστο μέγεθος γραμματοσειράς</string>
+    <string name="intent_import_card_from_url_share_text">Θέλω να μοιραστώ μία κάρτα μαζί σου</string>
+    <string name="enter_group_name">Εισάγετε όνομα ομάδας</string>
+    <string name="groups">Ομάδες</string>
+    <string name="noGroups">Κάντε κλικ στο + κουμπί ώστε να προσθέσετε ομάδες για κατηγοριοποίηση.</string>
+    <string name="group_name_already_in_use">Αυτό το όνομα υπάρχει ήδη</string>
+    <string name="group_updated">Η ομάδα ενημερώθηκε</string>
+    <string name="all">Όλες</string>
+    <string name="failedOpeningFileManager">Εγκαταστήστε έναν διαχειριστή αρχείων πρώτα.</string>
+    <string name="leaveWithoutSaveConfirmation">Έξοδος χωρίς αποθήκευση;</string>
+    <string name="expiryStateSentenceExpired">Έληξε: <xliff:g>%s</xliff:g></string>
+    <string name="card">Κάρτα</string>
+    <string name="editBarcode">Επεξεργασία γραμμοκώδικα</string>
+    <string name="chooseExpiryDate">Επιλέξτε ημερομηνία λήξης</string>
+    <string name="moveBarcodeToTopOfScreen">Μετακίνηση του γραμμοκώδικα στο πάνω μέρος της οθόνης</string>
+    <string name="moveBarcodeToCenterOfScreen">Κεντράρισμα του γραμμοκώδικα στην οθόνη</string>
+    <string name="noBarcodeFound">Δεν βρέθηκε γραμμοκώδικας</string>
+    <string name="balance">Υπόλοιπο</string>
+    <string name="importCatima">Εισαγωγή από Catima</string>
+    <string name="importStocard">Εισαγωγή από Stocard</string>
+    <string name="importVoucherVault">Εισαγωγή από Voucher Vault</string>
+    <string name="sameAsCardId">Ίδιος κωδικός</string>
+    <string name="exportPassword">Προσθέστε έναν κωδικό για προστασία της εξαγωγής (προαιρετικά)</string>
+    <string name="exportPasswordHint">Εισαγωγή κωδικού</string>
+    <string name="failedGeneratingShareURL">Δεν ήταν δυνατή η δημιουργία κοινοποιούμενου URL. Παρακαλώ αναφέρετε το.</string>
+    <string name="turn_flashlight_on">Ενεργοποίηση φακού</string>
+    <string name="turn_flashlight_off">Απενεργοποίηση φακού</string>
+    <string name="settings_locale">Γλώσσα</string>
+    <string name="settings_oled_dark">Απόλυτο μαύρο φόντο για το μαύρο θέμα</string>
+    <string name="settings_system_locale">Σύστημα</string>
+    <string name="settings_theme_color">Χρώμα θέματος</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Ροζ</string>
+    <string name="settings_magenta_theme">Φούξια</string>
+    <string name="settings_violet_theme">Βιολετί</string>
+    <string name="settings_blue_theme">Μπλε</string>
+    <string name="app_contributors">Δημιουργήθηκε από: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Εμφάνιση πληροφοριών</string>
+    <string name="sort_by_name">Όνομα</string>
+    <string name="and_data_usage">και δεδομένα χρήσης</string>
+    <string name="rate_this_app">Βαθμολογήστε την εφαρμογή</string>
+    <string name="duplicateCard">Αντίγραφο</string>
+    <string name="archive">Αρχειοθετήστε</string>
+    <string name="archived">Η κάρτα αρχειοθετήθηκε</string>
+    <string name="unarchived">Η κάρτα αφαιρέθηκε από το αρχείο</string>
+    <string name="unarchive">Αφαίρεση από το αρχείο</string>
+    <string name="archiveList">Αρχείο</string>
+    <string name="noUnarchivedCardsMessage">Δεν υπάρχουν αρχειοθετημένες κάρτες</string>
 </resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -52,7 +52,6 @@
     <string name="action_search">Serĉi</string>
     <string name="deleteConfirmation">Ĉu forigi ĉi tiun karton\?</string>
     <string name="deleteTitle">Forigi karton</string>
-    <string name="settings_lock_barcode_orientation">Seruro barcode orientiĝo</string>
     <string name="settings_display_barcode_max_brightness">Heligi barcode vido</string>
     <string name="settings_max_font_size_scale">Max. tiparo grandeco</string>
     <string name="starImage">Preferata stelo</string>
@@ -76,8 +75,6 @@
     <string name="cardShortcut">Karto Mallongirejo</string>
     <string name="scanCardBarcode">Scintigrafio Barcode Card</string>
     <string name="share">Interŝanĝado</string>
-    <string name="unlockScreen">Malbloki Rotacio</string>
-    <string name="lockScreen">Bloko Rotacio</string>
     <string name="star">Aldoni al miaj plej ŝatataj</string>
     <string name="copy_to_clipboard_toast">Card ID kopiita al la tondujo</string>
     <string name="settings_keep_screen_on">Teni sur ekrano</string>

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

@@ -1,4 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="barcode">Código de barras</string>
+    <string name="ok">OK</string>
+    <string name="barcodeNoBarcode">No hay código de barra</string>
+    <string name="storeName">Nombre</string>
+    <string name="cancel">Cancelar</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_add">Agregar</string>
+    <string name="importFailedTitle">Error al importar</string>
+    <string name="deleteConfirmation">¿Desea eliminar la tarjeta permanentemente\?</string>
+    <string name="exportSuccessfulTitle">Exportado</string>
+    <string name="exportFailedTitle">Error en la exportación</string>
+    <string name="exportFailed">No se pudo exportar</string>
+    <string name="noBarcode">Sin código de barra</string>
+    <string name="edit">Editar</string>
+    <string name="noGiftCards">Pulsa el botón + para agregar una tarjeta de regalo, o importa desde el menú.</string>
+    <string name="noGiftCardsGroup">Crea tarjetas de regalo, y asignales un grupo.</string>
+    <string name="note">Nota</string>
+    <string name="unstar">Borrar de favoritos</string>
+    <string name="importExport">Importar/Exportar</string>
+    <string name="exportName">Exportar</string>
+    <string name="importExportHelp">Crear una copia de seguridad de sus datos, permite moverlos hacia otro dispositivo.</string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Exportando…</string>
+    <string name="save">Guardar</string>
+    <string name="failedParsingImportUriError">No se pudo procesar la URI importada</string>
+    <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
+    <string name="barcodeType">Tipo de código de barra</string>
+    <string name="confirm">Confirmar</string>
+    <string name="sendLabel">Enviando…</string>
+    <string name="noCardsMessage">Agregar tarjeta al principio</string>
+    <string name="noMatchingGiftCards">Sin resultados. Intente cambiando su búsqueda.</string>
+    <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
+    <string name="cardId">ID Tarjeta</string>
+    <string name="star">Agregar a favoritos</string>
+    <string name="delete">Eliminar</string>
+    <string name="deleteTitle">Eliminar tarjeta</string>
+    <string name="share">Compartir</string>
+    <string name="addCardTitle">Agregar tarjeta</string>
+    <string name="scanCardBarcode">Escanear código de barra</string>
+    <string name="cardShortcut">Acceso rápido de tarjeta</string>
+    <string name="editCardTitle">Editar tarjeta</string>
+    <string name="card_ids_copied">ID(s) Copiado(s)</string>
+    <string name="importSuccessfulTitle">Importado</string>
+    <string name="importFailed">No se pudo importar</string>
 </resources>

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

@@ -4,37 +4,35 @@
     <string name="noGiftCards">Pulse el botón «+» para añadir una tarjeta, o importe algunas del menú ⋮.</string>
     <string name="storeName">Nombre</string>
     <string name="note">Nota</string>
-    <string name="cardId">Id. de tarjeta</string>
+    <string name="cardId">ID. de tarjeta</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
-    <string name="lockScreen">Bloquear giro</string>
-    <string name="unlockScreen">Desbloquear giro</string>
     <string name="ok">Aceptar</string>
-    <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
+    <string name="copy_to_clipboard">Copiar ID. en portapapeles</string>
     <string name="sendLabel">Enviar…</string>
     <string name="editCardTitle">Editar tarjeta</string>
     <string name="addCardTitle">Añadir tarjeta</string>
-    <string name="scanCardBarcode">Escanear código de barras de la tarjeta</string>
+    <string name="scanCardBarcode">Escanear código de barras</string>
     <string name="cardShortcut">Atajo de tarjeta</string>
     <string name="noCardsMessage">Añada una tarjeta primero</string>
     <string name="noStoreError">No se proporcionó ningún nombre</string>
-    <string name="noCardIdError">Id. de tarjeta no especificado</string>
-    <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
-    <string name="importExport">Importar/exportar</string>
+    <string name="noCardIdError">No se ha introducido ninguna código</string>
+    <string name="noCardExistsError">No se ha podido encontrar esa tarjeta</string>
+    <string name="importExport">Importar/Exportar</string>
     <string name="exportName">Exportar</string>
-    <string name="importExportHelp">El respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
+    <string name="importExportHelp">Hacer una copia de seguridad de los datos permite trasladarlos a otro dispositivo.</string>
     <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">Falló la importación</string>
-    <string name="importFailed">No se han podido importar tarjetas</string>
+    <string name="importFailed">No se ha podido realizar la importación</string>
     <string name="exportSuccessfulTitle">Exportado</string>
     <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se han podido exportar las tarjetas</string>
+    <string name="exportFailed">No se han podido exportar</string>
     <string name="importing">Importando…</string>
     <string name="exporting">Exportando…</string>
-    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar tarjetas</string>
+    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar datos</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
@@ -42,42 +40,41 @@
     <string name="importOptionApplicationExplanation">Use una aplicación o su gestor de archivos favoritos para abrir un archivo.</string>
     <string name="importOptionApplicationButton">Utilizar otra aplicación</string>
     <string name="about">Acerca de</string>
-    <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+.</string>
+    <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+</string>
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
     <string name="settings">Ajustes</string>
     <string name="settings_category_title_ui">Interfaz de usuario</string>
     <string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
-    <string name="exportSuccessful">Datos de las tarjetas exportados</string>
-    <string name="importSuccessful">Datos de las tarjetas importados</string>
+    <string name="exportSuccessful">Datos exportados</string>
+    <string name="importSuccessful">Datos importados</string>
     <string name="intent_import_card_from_url_share_text">Quiero compartirte una tarjeta</string>
-    <string name="settings_lock_barcode_orientation">Bloquear giro en el código de barras</string>
     <string name="settings_dark_theme">Oscuro</string>
     <string name="settings_light_theme">Claro</string>
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_theme">Tema</string>
-    <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione el código de barras que se utilizará, o de lo contrario, elija «Esta tarjeta no tiene código de barras».</string>
+    <string name="enterBarcodeInstructions">Introduzca el código, y elija un tipo de código de barras a continuación, o «No hay código de barras».</string>
     <string name="app_copyright_old">Basado en Loyalty Card Keychain
-\nderechos de autor © 2016-2020 de Branden Archer.</string>
+\nderechos de autor © 2016-2020 de Branden Archer</string>
     <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
     <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
     <string name="share">Compartir</string>
-    <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
+    <string name="barcodeNoBarcode">No hay código de barras</string>
     <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noMatchingGiftCards">Sin resultados. Pruebe modificando su búsqueda.</string>
+    <string name="noMatchingGiftCards">Sin resultados. Intente cambiar su búsqueda.</string>
     <string name="action_search">Buscar</string>
     <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="noGroups">Primero pulse en el botón «+» para añadir grupos de categorización.</string>
-    <string name="starImage">Favorito</string>
-    <string name="thumbnailDescription">Miniatura de la tarjeta</string>
-    <string name="copy_to_clipboard_toast">Se copió la id. de tarjeta en el portapapeles</string>
+    <string name="noGroups">Pulse en el botón «+» para añadir grupos de categorización.</string>
+    <string name="starImage">Estrella favorita</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="copy_to_clipboard_toast">Se copió la ID en el portapapeles</string>
     <string name="selectBarcodeTitle">Seleccionar el código de barras</string>
     <string name="unstar">Eliminar de favoritos</string>
     <string name="noBarcode">Sin código de barras</string>
     <string name="enter_group_name">Introducir nombre del grupo</string>
     <string name="groups">Grupos</string>
     <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
-    <string name="addManually">Introducir el id. de la tarjeta manualmente</string>
+    <string name="addManually">Introducir la ID manualmente</string>
     <string name="leaveWithoutSaveConfirmation">¿Quiere abandonar sin guardar\?</string>
     <string name="leaveWithoutSaveTitle">Salir</string>
     <string name="moveDown">Bajar</string>
@@ -88,6 +85,7 @@
     <string name="star">Añadir a favoritos</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> tarjeta</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> tarjetas</item>
         <item quantity="other"><xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="points">Puntos</string>
@@ -101,26 +99,26 @@
     <string name="card">Tarjeta</string>
     <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os</string>
     <string name="app_resources">Recursos de terceros libres: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliotecas de terceros libres: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="settings_max_font_size_scale">Tam. de fuente máximo</string>
     <string name="importCatimaMessage">Seleccione su <i>catima.zip</i> exportado desde Catima para importarlo.
-\nO créalo primero desde el menú Importar/Exportar de otra app de Catima al presionar Exportar desde allí.</string>
+\nCréalo primero desde el menú Importar/Exportar de otra app de Catima al presionar Exportar desde allí.</string>
     <string name="importFidmeMessage">Seleccione su <i>fidme-export-request-xxxxxx.zip</i> exportado desde FidMe para importar, y luego escoja los tipos de códigos de barras manualmente.
-\nO créalo primero desde tu perfil de FidMe eligiendo Protección de datos y pulsa Extraer mis datos.</string>
+\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.
-\nO créalo primero desde el menú Importar/Exportar en Loyalty Card Keychain pulsando Exportar desde allí.</string>
+\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.
-\nO consígalo enviando un correo electrónico a support@stocardapp.com solicitando una exportación de sus datos.</string>
+\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.
-\nO créalo pulsando primero Exportar en Voucher Vault.</string>
+\nCréalo pulsando primero Exportar en Voucher Vault.</string>
     <string name="failedGeneratingShareURL">No se ha podido generar una URL compartible. Por favor, informe de ello.</string>
     <string name="passwordRequired">Por favor, introduzca la contraseña</string>
-    <string name="updateBarcodeQuestionText">Ha cambiado la Id. de la tarjeta. ¿Desea actualizar también el código de barras para usar el mismo valor\?</string>
+    <string name="updateBarcodeQuestionText">Ha cambiado el código. ¿Desea actualizar también el código de barras para usar el mismo valor\?</string>
     <string name="intent_import_card_from_url_share_multiple_text">Quiero compartirte algunas tarjetas</string>
     <string name="setBackImage">Establecer imagen anversa</string>
-    <string name="card_ids_copied">Id. de tarjetas copiadas</string>
+    <string name="card_ids_copied">Código(s) copiado(s)</string>
     <string name="turn_flashlight_off">Apagar linterna</string>
     <string name="turn_flashlight_on">Encender linterna</string>
     <string name="no">No</string>
@@ -130,13 +128,12 @@
     <string name="removeImage">Quitar imagen</string>
     <string name="setFrontImage">Establecer imagen frontal</string>
     <string name="photos">Fotos</string>
-    <string name="backImageDescription">Imagen del reverso de la tarjeta</string>
-    <string name="frontImageDescription">Imagen frontal de la tarjeta</string>
-    <string name="copy_to_clipboard_multiple_toast">ID de tarjetas copiadas al portapapeles</string>
+    <string name="backImageDescription">Imagen del reverso</string>
+    <string name="frontImageDescription">Imagen frontal</string>
+    <string name="copy_to_clipboard_multiple_toast">Códigos copiados al portapapeles</string>
     <string name="wrongValueForBarcodeType">El valor no es válido para el tipo de código de barras seleccionado</string>
-    <string name="unsupportedBarcodeType">Este tipo de código de barras todavía no se puede visualizar. Es posible que se admita en una futura versión de la aplicación.</string>
     <string name="setBarcodeId">Establecer valor de código de barra</string>
-    <string name="sameAsCardId">Igual que la ID de tarjeta</string>
+    <string name="sameAsCardId">Igual que el código</string>
     <string name="barcodeId">Valor de código de barra</string>
     <string name="importVoucherVault">Importar desde Voucher Vault</string>
     <string name="importStocard">Importar desde Stocard</string>
@@ -149,7 +146,7 @@
 \nNINGÚN DATO SE RECOPILA, cualquiera puede confirmar ya que nuestra aplicación es software libre.</string>
     <string name="privacy_policy">Política de privacidad</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">¿De dónde importar datos\?</string>
+    <string name="chooseImportType">Importar datos de</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> no tendría un saldo válido.</string>
     <string name="currency">Moneda</string>
     <string name="balance">Saldo</string>
@@ -157,20 +154,22 @@
     <string name="noBarcodeFound">No se encontró código de barras</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Selecciona imagen desde galería</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Evitar bloqueo de pantalla</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Evitar el bloqueo de pantalla</string>
     <string name="settings_keep_screen_on">Mantener pantalla encendida</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> tarjeta seleccionada</item>
         <item quantity="other"><xliff:g>%d</xliff:g> tarjetas seleccionadas</item>
     </plurals>
     <string name="deleteTitle">Eliminar la tarjeta</string>
-    <string name="deleteConfirmation">¿Quiere eliminar esta tarjeta\?</string>
+    <string name="deleteConfirmation">¿Quiere eliminar permanentemente esta tarjeta\?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">¿Borrar esta tarjeta <xliff:g>%d</xliff:g> permanentemente\?</item>
+        <item quantity="many">¿Borrar estas tarjetas <xliff:g>%d</xliff:g> permanentemente\?</item>
         <item quantity="other">¿Borrar estas tarjetas <xliff:g>%d</xliff:g> permanentemente\?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Borrar <xliff:g>%d</xliff:g> tarjeta</item>
+        <item quantity="many">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
         <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
@@ -186,5 +185,76 @@
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_locale">Lengua</string>
-    <string name="noGroupCards">Este grupo no contiene ninguna tarjeta</string>
+    <string name="noGroupCards">Este grupo está vacío</string>
+    <string name="settings_landscape_orientation">Horizontal</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> puntos</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> puntos</item>
+    </plurals>
+    <string name="barcodeImageDescriptionWithType">Imagen <xliff:g>%s</xliff:g> código de barras</string>
+    <string name="settings_card_orientation">Orientación del código de barras</string>
+    <string name="settings_portrait_orientation">Formato vertical</string>
+    <string name="group_edit">Editar grupo</string>
+    <string name="group_updated">Grupo actualizado</string>
+    <string name="noGiftCardsGroup">Cree algunas tarjetas y luego asígnelas al grupo aquí.</string>
+    <string name="settings_follow_system_orientation">Seguir el sistema</string>
+    <string name="settings_lock_on_opening_orientation">Bloqueo a la orientación utilizada al abrir la tarjeta</string>
+    <string name="sort_by_most_recently_used">Lo más reciente que se ha utilizado</string>
+    <string name="sort_by_expiry">Caducidad</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="version_history">Historial de versiones</string>
+    <string name="help_translate_this_app">Ayuda a traducir esta aplicación</string>
+    <string name="and_data_usage">y el uso de datos</string>
+    <string name="shortcutSelectCard">Seleccione una tarjeta</string>
+    <string name="showMoreInfo">Mostrar información</string>
+    <string name="hideMoreInfo">Ocultar información</string>
+    <string name="reverse">… en orden inverso</string>
+    <string name="credits">Créditos</string>
+    <string name="sort_by_name">Nombre</string>
+    <string name="license">Licencia</string>
+    <string name="source_repository">Repositorio de fuente</string>
+    <string name="set_scale">Ajustar la escala</string>
+    <string name="on_github">En GitHub</string>
+    <string name="on_google_play">en Google Play</string>
+    <string name="report_error">Informar de un error</string>
+    <string name="action_hide_details">Ocultar detalles</string>
+    <string name="translate_platform">en Weblate</string>
+    <string name="action_show_details">Mostrar detalles</string>
+    <string name="selectColor">Seleccione el color</string>
+    <string name="setIcon">Establecer icono</string>
+    <string name="sort">Ordenar</string>
+    <string name="swipeToSwitchImages">Desliza el dedo o haz una pulsación larga para cambiar de imagen</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="rate_this_app">Califica esta aplicación</string>
+    <string name="options">Opciones</string>
+    <string name="failedToOpenUrl">Instale primero un navegador web</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Ver archivo (<xliff:g>%1$d</xliff:g> tarjeta)</item>
+        <item quantity="many">Ver archivo (<xliff:g>%1$d</xliff:g> tarjetas)</item>
+        <item quantity="other">Ver archivo (<xliff:g>%1$d</xliff:g> tarjetas)</item>
+    </plurals>
+    <string name="welcome">Bienvenido/a a Catima</string>
+    <string name="group_name_already_in_use">Nombre del grupo ya está en uso</string>
+    <string name="group_name_is_empty">El nombre del grupo no puede estar vacío</string>
+    <string name="settings_oled_dark">Fondo negro puro para el tema oscuro</string>
+    <string name="exportPasswordHint">Introduzca la contraseña</string>
+    <string name="previousCard">Anterior</string>
+    <string name="nextCard">Siguiente</string>
+    <string name="editGroup">Edición del grupo: <xliff:g>%s</xliff:g></string>
+    <string name="include_if_asking_support">Si desea solicitar apoyo, incluya la siguiente información:</string>
+    <string name="duplicateCard">Duplicar</string>
+    <string name="unarchive">Desarchivar</string>
+    <string name="archive">Archivar</string>
+    <string name="archived">Tarjeta archivada</string>
+    <string name="unarchived">Tarjeta desarchivada</string>
+    <string name="archiveList">Archivo</string>
+    <string name="noUnarchivedCardsMessage">No existen tarjetas sin archivar</string>
+    <string name="exportPassword">Establezca una contraseña para proteger su exportación (opcional)</string>
+    <string name="failedLaunchingPhotoPicker">No se ha podido encontrar una aplicación de galería compatible</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> tarjeta (archivada)<xliff:g id="archivedCount">%2$d</xliff:g></item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> tarjetas (archivadas)<xliff:g id="archivedCount">%2$d</xliff:g></item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> tarjetas (archivadas)<xliff:g id="archivedCount">%2$d</xliff:g></item>
+    </plurals>
 </resources>

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

@@ -8,7 +8,6 @@
     <string name="intent_import_card_from_url_share_multiple_text">Haluan jakaa joitain kortteja kanssasi</string>
     <string name="copy_to_clipboard_multiple_toast">ID-tunnukset kopioitu leikepöydälle</string>
     <string name="wrongValueForBarcodeType">Arvo ei ole kelvollinen valitulle viivakoodityypille</string>
-    <string name="unsupportedBarcodeType">Tätä viivakoodityyppiä ei voi vielä näyttää. Sitä saatetaan tukea sovelluksen myöhemmässä versiossa.</string>
     <string name="setBarcodeId">Aseta viivakoodin arvo</string>
     <string name="sameAsCardId">Sama kuin ID-tunnus</string>
     <string name="barcodeId">Viivakoodin arvo</string>
@@ -70,7 +69,6 @@
     <string name="intent_import_card_from_url_share_text">Haluan jakaa kortin kanssasi</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Estä näytön lukitus</string>
     <string name="settings_keep_screen_on">Pidä näyttö päällä</string>
-    <string name="settings_lock_barcode_orientation">Lukitse viivakoodin suunta</string>
     <string name="settings_display_barcode_max_brightness">Kirkasta viivakoodinäkymää</string>
     <string name="settings_max_font_size_scale">Fontin enimmäiskoko</string>
     <string name="settings_dark_theme">Tumma</string>
@@ -126,8 +124,6 @@
     <string name="share">Jaa</string>
     <string name="copy_to_clipboard">Kopioi ID-tunnus leikepöydälle</string>
     <string name="ok">OK</string>
-    <string name="unlockScreen">Poista kierron esto</string>
-    <string name="lockScreen">Estä kierto</string>
     <string name="confirm">Vahvista</string>
     <string name="delete">Poista</string>
     <string name="edit">Muokkaa</string>
@@ -231,4 +227,27 @@
     <string name="rate_this_app">Arvostele tämä sovellus</string>
     <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä.</string>
     <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> viivakoodi</string>
+    <string name="settings_follow_system_orientation">Seuraa järjestelmää</string>
+    <string name="settings_portrait_orientation">Muotokuva</string>
+    <string name="settings_landscape_orientation">Maisema</string>
+    <string name="unarchived">Kortti on poistettu arkistosta</string>
+    <string name="noUnarchivedCardsMessage">Arkistoimattomia kortteja ei ole olemassa</string>
+    <string name="unarchive">Poista arkistosta</string>
+    <string name="archived">Kortti arkistoitu</string>
+    <string name="failedLaunchingPhotoPicker">Tuettua galleriasovellusta ei löytynyt</string>
+    <string name="settings_card_orientation">Viivakoodin suuntaus</string>
+    <string name="archiveList">Arkisto</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kortti (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> korttia (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
+    </plurals>
+    <string name="duplicateCard">Duplikaatti</string>
+    <string name="previousCard">Edellinen</string>
+    <string name="nextCard">Seuraava</string>
+    <string name="failedToOpenUrl">Asenna ensin verkkoselain</string>
+    <string name="welcome">Tervetuloa Catimaan</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Näytä arkisto (<xliff:g>%1$d</xliff:g> kortti)</item>
+        <item quantity="other">Näytä arkisto (<xliff:g>%1$d</xliff:g> korttia)</item>
+    </plurals>
 </resources>

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

@@ -10,8 +10,6 @@
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="confirm">Confirmer</string>
-    <string name="lockScreen">Désactiver la rotation</string>
-    <string name="unlockScreen">Activer la rotation</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
     <string name="sendLabel">Envoyer…</string>
@@ -52,7 +50,6 @@
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interface utilisateur</string>
     <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
-    <string name="settings_lock_barcode_orientation">Verrouiller l’orientation du code-barres</string>
     <string name="exportSuccessful">Données exportées</string>
     <string name="importSuccessful">Données importées</string>
     <string name="intent_import_card_from_url_share_text">Je veux partager une carte avec toi</string>
@@ -87,6 +84,7 @@
     <string name="moveUp">Monter</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> carte</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> cartes</item>
         <item quantity="other"><xliff:g>%d</xliff:g> cartes</item>
     </plurals>
     <string name="groupsList">Groupes : <xliff:g>%s</xliff:g></string>
@@ -99,7 +97,7 @@
     <string name="chooseImportType">Importer les données depuis</string>
     <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ne semble pas être un solde valide.</string>
     <string name="points">Points</string>
-    <string name="currency">Monnaie</string>
+    <string name="currency">Devise</string>
     <string name="balance">Solde</string>
     <string name="moveBarcodeToCenterOfScreen">Centrer le code-barres sur l’écran</string>
     <string name="moveBarcodeToTopOfScreen">Déplacez le code-barres vers le haut de l’écran</string>
@@ -133,7 +131,6 @@
     <string name="sameAsCardId">Identique à l’identifiant</string>
     <string name="barcodeId">Valeur du code-barres</string>
     <string name="settings_max_font_size_scale">Taille max. de la police</string>
-    <string name="unsupportedBarcodeType">Ce type de code-barres ne peut pas encore être affiché. Il sera peut-être pris en charge dans une version ultérieure de l’application.</string>
     <string name="wrongValueForBarcodeType">La valeur n’est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliothèques tierces libres : <xliff:g id="app_libraries_list">%s</xliff:g></string>
@@ -161,16 +158,19 @@
     <string name="failedGeneratingShareURL">Impossible de générer une URL partageable. Veuillez signaler ceci.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> sélectionnée</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> sélectionnées</item>
         <item quantity="other"><xliff:g>%d</xliff:g> sélectionnées</item>
     </plurals>
     <string name="deleteTitle">Supprimer la carte</string>
     <string name="deleteConfirmation">Supprimer cette carte \?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Supprimer cette <xliff:g>%d</xliff:g> carte définitivement \?</item>
+        <item quantity="many">Supprimer ces <xliff:g>%d</xliff:g> cartes définitivement \?</item>
         <item quantity="other">Supprimer ces <xliff:g>%d</xliff:g> cartes définitivement \?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Supprimer <xliff:g>%d</xliff:g> carte</item>
+        <item quantity="many">Supprimer <xliff:g>%d</xliff:g> cartes</item>
         <item quantity="other">Supprimer <xliff:g>%d</xliff:g> cartes</item>
     </plurals>
     <string name="settings_system_locale">Système</string>
@@ -227,8 +227,36 @@
     <string name="hideMoreInfo">Masquer les infos</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> point</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> points</item>
         <item quantity="other"><xliff:g>%s</xliff:g> points</item>
     </plurals>
     <string name="settings_oled_dark">Fond noir pour le thème sombre</string>
     <string name="include_if_asking_support">Si vous voulez demander de l\'aide, incluez les informations suivantes :</string>
+    <string name="settings_card_orientation">Orientation du code-barres</string>
+    <string name="settings_follow_system_orientation">Suivre le système</string>
+    <string name="settings_portrait_orientation">Portrait</string>
+    <string name="settings_landscape_orientation">Paysage</string>
+    <string name="settings_lock_on_opening_orientation">Garder l\'orientation utilisée pour ouvrir la carte</string>
+    <string name="duplicateCard">Dupliquer</string>
+    <string name="archive">Archiver</string>
+    <string name="unarchive">Désarchiver</string>
+    <string name="archived">Carte archivée</string>
+    <string name="unarchived">Carte désarchivée</string>
+    <string name="archiveList">Archives</string>
+    <string name="noUnarchivedCardsMessage">Il n\'existe aucune carte non archivée</string>
+    <string name="failedLaunchingPhotoPicker">Impossible de trouver une application de galerie prise en charge</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archivée)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> cartes (<xliff:g id="archivedCount">%2$d</xliff:g> archivées)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> cartes (<xliff:g id="archivedCount">%2$d</xliff:g> archivées)</item>
+    </plurals>
+    <string name="nextCard">Suivant</string>
+    <string name="previousCard">Précédent</string>
+    <string name="failedToOpenUrl">Installez d\'abord un navigateur web</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Voir les archives (<xliff:g>%1$d</xliff:g> carte)</item>
+        <item quantity="many">Voir les archives (<xliff:g>%1$d</xliff:g> cartes)</item>
+        <item quantity="other">Voir les archives (<xliff:g>%1$d</xliff:g> cartes)</item>
+    </plurals>
+    <string name="welcome">Bienvenue dans Catima</string>
 </resources>

app/src/main/res/values-he-rIL/strings.xml

@@ -7,7 +7,6 @@
     <string name="ok">אישור</string>
     <string name="action_search">חיפוש</string>
     <string name="noGiftCards">לחץ על לחצן ה + להוספת כרטיס, או ייבא מספר כרטיסים באמצעות התפריט ⋮.</string>
-    <string name="lockScreen">סיבוב</string>
     <string name="share">שיתוף</string>
     <string name="copy_to_clipboard">העתקת מזהה ללוח</string>
     <string name="addCardTitle">הוספת כרטיס</string>
@@ -40,7 +39,6 @@
     <string name="cardShortcut">קיצור דרך</string>
     <string name="noCardsMessage">תחילה הוסף כרטיס</string>
     <string name="card_ids_copied">מזהי כרטיס הועתקו</string>
-    <string name="barcodeImageDescriptionWithType"></string>
     <string name="noStoreError">לא הוכנס שם חנות</string>
     <string name="noCardExistsError">כרטיס לא נמצא</string>
     <string name="importExport">ייבוא/ייצוא</string>
@@ -53,4 +51,19 @@
     <string name="exportFailedTitle">הייצוא נכשל</string>
     <string name="importing">מייבא…</string>
     <string name="exporting">ייצוא…</string>
+    <string name="exportOptionExplanation">המידע יכתב למיקום שאת/ה תבחר/י.</string>
+    <string name="importOptionFilesystemTitle">יבא ממערכת קבצים</string>
+    <string name="importOptionFilesystemExplanation">בחר/י קובץ מסויים ממערכת הקבצים.</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">אחד</item>
+        <item quantity="two">שניים</item>
+        <item quantity="many">מעט</item>
+        <item quantity="other">אחר</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">אחד</item>
+        <item quantity="two">שניים</item>
+        <item quantity="many">מעט</item>
+        <item quantity="other">אחר</item>
+    </plurals>
 </resources>

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

@@ -6,8 +6,6 @@
     <string name="edit">Uredi</string>
     <string name="delete">Ukloni</string>
     <string name="confirm">Potvrdi</string>
-    <string name="lockScreen">Rotacija bloka</string>
-    <string name="unlockScreen">Otključaj Rotaciju</string>
     <string name="deleteTitle">Ukloni kartu</string>
     <string name="deleteConfirmation">Izbrisati ovu karticu zauvijek\?</string>
     <string name="copy_to_clipboard">Kopiraj ID u međuspremnik</string>
@@ -66,7 +64,6 @@
     <string name="thumbnailDescription">Sličica za karticu</string>
     <string name="starImage">Omiljena zvijezda</string>
     <string name="settings_category_title_ui">Korisničko sučelje</string>
-    <string name="settings_lock_barcode_orientation">Zaključavanje orijentacije crtičnog koda</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>

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

@@ -23,8 +23,6 @@
     <string name="edit">Szerkesztés</string>
     <string name="delete">Törlés</string>
     <string name="confirm">Alkalmaz</string>
-    <string name="lockScreen">Forgatás blokkolása</string>
-    <string name="unlockScreen">Blokkolás engedélyezése</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one"><xliff:g>%d</xliff:g> törlése</item>
         <item quantity="other"><xliff:g>%d</xliff:g> törlése</item>
@@ -106,7 +104,6 @@
     <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_lock_barcode_orientation">Vonalkód tájolás zárolása</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="intent_import_card_from_url_share_text">Meg akarok veled osztani egy kártyát</string>
@@ -154,7 +151,6 @@
     <string name="barcodeId">Vonalkód érték</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="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>
@@ -229,4 +225,25 @@
 \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>
+    <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>
+    </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="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_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="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>
 </resources>