Release Catima 2.17.0

Translations update from Hosted Weblate

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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

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 107
-        versionName "2.16.3"
+        versionCode 108
+        versionName "2.17.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'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
 
 // 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.1'
 
 // 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.8.1'
 }
 
 tasks.withType(SpotBugsTask) {

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

@@ -39,24 +39,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

@@ -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/DBHelper.java

@@ -21,7 +21,7 @@ import java.util.List;
 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 +45,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 +72,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 +104,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 +310,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) {
@@ -349,7 +361,7 @@ public class DBHelper extends SQLiteOpenHelper {
             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 int starStatus, final Long lastUsed,final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -365,6 +377,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
@@ -380,7 +393,7 @@ public class DBHelper extends SQLiteOpenHelper {
             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 Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
         // Card
@@ -397,6 +410,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
@@ -438,6 +452,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 +572,19 @@ 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 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 +593,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 +604,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 +616,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 +639,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 +651,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/ImportURIHelper.java

@@ -116,7 +116,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/LoyaltyCard.java

@@ -29,13 +29,14 @@ public class LoyaltyCard implements Parcelable {
     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 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 +50,7 @@ public class LoyaltyCard implements Parcelable {
         this.starStatus = starStatus;
         this.lastUsed = lastUsed;
         this.zoomLevel = zoomLevel;
+        this.archiveStatus = archiveStatus;
     }
 
     protected LoyaltyCard(Parcel in) {
@@ -68,6 +70,7 @@ public class LoyaltyCard implements Parcelable {
         starStatus = in.readInt();
         lastUsed = in.readLong();
         zoomLevel = in.readInt();
+        archiveStatus = in.readInt();
     }
 
     @Override
@@ -85,6 +88,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,6 +102,7 @@ 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);
@@ -124,7 +129,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

@@ -131,7 +131,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());
@@ -232,13 +232,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 +249,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());
@@ -321,7 +324,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             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 +338,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

@@ -108,6 +108,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";
@@ -140,6 +141,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    boolean duplicateFromLoyaltyCardId;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -205,7 +207,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 (CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
                 (Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
                 (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus),
-                Utils.getUnixTime(), 100
+                Utils.getUnixTime(), 100, (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
         );
     }
 
@@ -223,6 +225,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;
@@ -749,9 +752,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 +771,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 +779,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);
                 }
@@ -1228,7 +1234,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) {
@@ -1293,7 +1308,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         } 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);
+            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,0);
             try {
                 Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
                 Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
@@ -1307,16 +1322,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         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 +1340,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/LoyaltyCardViewActivity.java

@@ -45,6 +45,7 @@ import java.util.List;
 
 import androidx.annotation.NonNull;
 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;
@@ -251,13 +252,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     protected void onCreate(Bundle savedInstanceState) {
         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());
 
@@ -686,18 +699,19 @@ 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);
@@ -735,13 +749,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 }
                 return true;
 
-            case R.id.action_lock_unlock:
-                if (rotationEnabled) {
-                    setOrientatonLock(item, true);
-                } else {
-                    setOrientatonLock(item, false);
-                }
-                rotationEnabled = !rotationEnabled;
+            case R.id.action_duplicate:
+                loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
+                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;
 
             case R.id.action_star_unstar:
@@ -749,6 +764,38 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
                 invalidateOptionsMenu();
                 return true;
+
+            case R.id.action_archive:
+                DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
+                invalidateOptionsMenu();
+                return true;
+
+            case R.id.action_unarchive:
+                DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 0);
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.unarchived, Toast.LENGTH_LONG).show();
+                invalidateOptionsMenu();
+                return true;
+
+            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(database, LoyaltyCardViewActivity.this, loyaltyCardId);
+
+                    ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
+                    finish();
+                    dialog.dismiss();
+                });
+                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+                AlertDialog dialog = builder.create();
+                dialog.show();
+
+                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -760,7 +807,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             Log.d(TAG, "Detected landscape mode");
-
             setTitle(loyaltyCard.store);
 
             collapsingToolbarLayout.setVisibility(View.GONE);
@@ -786,19 +832,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);

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

@@ -21,6 +21,7 @@ import android.widget.Toast;
 
 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;
@@ -58,6 +59,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     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 +146,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 +166,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,17 +217,33 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
+        extractIntentFields(getIntent());
         super.onCreate(inputSavedInstanceState);
         SplashScreen.installSplashScreen(this);
-        setTitle(R.string.app_name);
+        if(!mArchiveMode) {
+            setTitle(R.string.app_name);
+            setContentView(R.layout.main_activity);
+        }
+        else{
+            setTitle(R.string.archiveList);
+            setContentView(R.layout.archive_activity);
+        }
         // XXX color patching has to be done again after setting splash screen
         Utils.patchColors(this);
-        setContentView(R.layout.main_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);
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
@@ -342,21 +400,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 +443,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();
@@ -424,6 +486,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 +515,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 +560,14 @@ 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 +575,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 +602,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();
             });
 
@@ -564,6 +652,16 @@ 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;
+        }
+
+
         return super.onOptionsItemSelected(inputItem);
     }
 
@@ -685,10 +783,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 +832,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
+
     @Override
     public void onRowClicked(int inputPosition) {
         if (mAdapter.getSelectedItemCount() > 0) {

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

@@ -321,6 +321,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 +338,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

@@ -120,10 +120,11 @@ public class FidmeImporter implements Importer {
 
         // 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, headerColor, 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/MultiFormatImporter.java

@@ -54,7 +54,12 @@ public class MultiFormatImporter {
                 database.setTransactionSuccessful();
                 return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
-                return new ImportExportResult(ImportExportResultType.BadPassword);
+                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();

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

@@ -234,7 +234,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

@@ -126,7 +126,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

@@ -92,8 +92,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/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_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/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/loyalty_card_layout.xml

@@ -53,7 +53,8 @@
                 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 +87,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 +199,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/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/raw/contributors.txt

@@ -5,10 +5,10 @@ Allan Nordhøy
 Heimen Stoffels
 solokot
 Katharine Chui
-mondstern
 Oğuz Ersen
-Altonss
+mondstern
 IllusiveMan196
+Altonss
 StoyanDimitrov
 Petr Novák
 Joel A
@@ -56,9 +56,10 @@ inesre
 lgasp
 phlostically
 Aditya Das
+Asier
 Kevin Sicong Jiang
 Airat
-Andreas Blaser
+sNiXx
 BMN
 Biren
 Mylou53
@@ -67,12 +68,14 @@ Eric
 Flav
 Franciszek Stefan
 Giovanni
+Grzegorz
 Izzy
 Karol Kosek
 bittin
 Marco
 Mattia
 Michael Gangolf
+Moi Toi
 pbeckmann
 Peer Beckmann
 Quang Nguyen
@@ -82,6 +85,7 @@ Rohan Babbar
 Ronak Upadhyay
 Rose Liverman
 Simone Dotto
+SlavekB
 Subhashish Anand
 darkodo
 Tymofii Lytvynenko
@@ -89,6 +93,7 @@ Tjipke van der Heide
 Yevgeny M
 Avik Kundu
 opsik
+pooyanazari
 psa-jforestier
 Robin
 sergio

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

@@ -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>
@@ -231,4 +228,16 @@
     </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>
 </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>
@@ -82,7 +81,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>
@@ -82,7 +81,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

@@ -62,8 +62,6 @@
     <string name="noCardsMessage">Nejprve přidejte kartu</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>
@@ -87,7 +85,6 @@
     <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>
@@ -234,4 +231,18 @@
         <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>
 </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>
@@ -231,4 +228,16 @@
     </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>
-</resources>
+    <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>
+</resources>

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

@@ -10,8 +10,6 @@
     <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>
@@ -57,4 +55,11 @@
     <string name="barcode">Γραμμικός κώδικας</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>
 </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/strings.xml

@@ -10,8 +10,6 @@
     <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="sendLabel">Enviar…</string>
@@ -51,7 +49,6 @@
     <string name="exportSuccessful">Datos de las tarjetas exportados</string>
     <string name="importSuccessful">Datos de las tarjetas 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>

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

@@ -70,7 +70,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 +125,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>

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>
@@ -231,4 +228,16 @@
     </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>
-</resources>
+    <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>
+</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>

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>

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

@@ -122,7 +122,6 @@
     <string name="settings_dark_theme">Gelap</string>
     <string name="settings_max_font_size_scale">Ukuran maksimal huruf</string>
     <string name="settings_display_barcode_max_brightness">Terangkan tampilan barcode</string>
-    <string name="settings_lock_barcode_orientation">Kunci orientasi barcode</string>
     <string name="settings_keep_screen_on">Biarkan layar menyala</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Mencegah layar menyala</string>
     <string name="intent_import_card_from_url_share_text">Saya ingin berbagi kartu dengan anda</string>
@@ -187,8 +186,6 @@
     <string name="on_github">di GitHub</string>
     <string name="and_data_usage">dan penggunaan data</string>
     <string name="on_google_play">di Google Play</string>
-    <string name="lockScreen">Blokir rotasi</string>
-    <string name="unlockScreen">Buka blokir rotasi</string>
     <string name="cardShortcut">Pintasan kartu</string>
     <string name="card_ids_copied">ID kartu yang tersalin</string>
     <string name="barcodeImageDescriptionWithType">Gambar dari jenis barcode <xliff:g>%s</xliff:g></string>

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

@@ -4,7 +4,6 @@
     <string name="noBarcode">Nei strikamerkið</string>
     <string name="action_search">Leita að</string>
     <string name="delete">Eyða</string>
-    <string name="unlockScreen">Opna Snúningur</string>
     <string name="noGiftCards">Smelltu á + plús takka til að bæta kort, eða að flytja inn sumir frá ⋮ matseðill fyrst.</string>
     <string name="note">Athugið</string>
     <string name="barcodeType">Strikamerkið tegund</string>
@@ -17,7 +16,6 @@
     <string name="save">Sparaðu</string>
     <string name="edit">Breyta</string>
     <string name="confirm">Staðfesta</string>
-    <string name="lockScreen">Blokk Snúningur</string>
     <string name="ok">OK</string>
     <string name="sendLabel">Sendu…</string>
     <string name="deleteConfirmation">Eyða þetta kort til frambúðar\?</string>
@@ -49,7 +47,6 @@
     <string name="about">Um</string>
     <string name="settings">Stillingar</string>
     <string name="settings_max_font_size_scale">Max. letrið</string>
-    <string name="settings_lock_barcode_orientation">Læsa strikamerkið stefnumörkun</string>
     <string name="settings_keep_screen_on">Halda á skjánum</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Að koma í veg fyrir að læsa skjánum</string>
     <string name="editBarcode">Breyta strikamerkið</string>

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

@@ -13,8 +13,6 @@
     <string name="edit">Modifica</string>
     <string name="delete">Elimina</string>
     <string name="confirm">Conferma</string>
-    <string name="lockScreen">Blocca rotazione</string>
-    <string name="unlockScreen">Sblocca rotazione</string>
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Copia codice negli appunti</string>
     <string name="share">Condividi</string>
@@ -62,7 +60,6 @@
     <string name="settings_light_theme">Chiaro</string>
     <string name="settings_dark_theme">Scuro</string>
     <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando viene aperto un codice a barre</string>
-    <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
     <string name="exportSuccessful">Dati della carta esportati</string>
     <string name="importSuccessful">Dati importati</string>
@@ -231,4 +228,16 @@
     </plurals>
     <string name="settings_oled_dark">Sfondo nero puro per il tema scuro</string>
     <string name="include_if_asking_support">Se vuoi richiedere supporto, includi le seguenti informazioni:</string>
+    <string name="settings_card_orientation">Orientamento del codice a barre</string>
+    <string name="settings_follow_system_orientation">Segui il sistema</string>
+    <string name="duplicateCard">Duplica</string>
+    <string name="archive">Archivia</string>
+    <string name="unarchive">Disarchivia</string>
+    <string name="archiveList">Archivio</string>
+    <string name="noUnarchivedCardsMessage">Non esistono schede non archiviate</string>
+    <string name="unarchived">Carta non archiviata</string>
+    <string name="archived">Carta archiviata</string>
+    <string name="settings_portrait_orientation">Ritratto</string>
+    <string name="settings_landscape_orientation">Paesaggio</string>
+    <string name="settings_lock_on_opening_orientation">Blocco da utilizzare per l\'apertura della carta</string>
 </resources>

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

@@ -57,7 +57,6 @@
     <string name="intent_import_card_from_url_share_text">カード共有をしましょう</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_display_barcode_max_brightness">バーコード表示画面を明るくする</string>
     <string name="settings_max_font_size_scale">最大のフォントサイズ</string>
     <string name="settings_dark_theme">ダーク</string>
@@ -118,8 +117,6 @@
     <string name="share">共有</string>
     <string name="copy_to_clipboard">カード番号をクリップボードにコピーする</string>
     <string name="ok">確定</string>
-    <string name="unlockScreen">自動回転を無効にしない</string>
-    <string name="lockScreen">自動回転を無効にする</string>
     <string name="confirm">確認</string>
     <string name="delete">削除</string>
     <string name="edit">編集</string>

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

@@ -5,7 +5,6 @@
     <string name="all">모두</string>
     <string name="groups">그룹</string>
     <string name="enter_group_name">그룹 이름 입력</string>
-    <string name="settings_lock_barcode_orientation">바코드 회전 잠금</string>
     <string name="settings_dark_theme">어두움</string>
     <string name="settings_light_theme">밝음</string>
     <string name="debug_version_fmt">버전: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>
@@ -31,8 +30,6 @@
     <string name="share">공유</string>
     <string name="copy_to_clipboard">ID를 클립보드에 복사</string>
     <string name="ok">확인</string>
-    <string name="unlockScreen">회전 잠금 해제</string>
-    <string name="lockScreen">회전 잠금</string>
     <string name="confirm">확인</string>
     <string name="delete">삭제</string>
     <string name="edit">편집</string>

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

@@ -11,8 +11,6 @@
     <string name="edit">Änneren</string>
     <string name="delete">Läschen</string>
     <string name="confirm">Bestätegen</string>
-    <string name="lockScreen">Blockrotation</string>
-    <string name="unlockScreen">Déblockéieren Rotatioun</string>
     <string name="deleteConfirmation">Dës Kaart dauerhaft läschen\?</string>
     <string name="ok">Okay</string>
     <string name="share">Aktie</string>
@@ -73,7 +71,6 @@
     <string name="copy_to_clipboard_multiple_toast">Kaarten-IDs an d \' Tëschentablag inspiréiere</string>
     <string name="updateBarcodeQuestionText">Si hunn d \' Kaarten-ID geännert. Wëllt Dir och de Barcode aktualiséieren, fir deselwechte Wäert ze benotzen\?</string>
     <string name="settings_dark_theme">Donkel</string>
-    <string name="settings_lock_barcode_orientation">Barcode-Ausriichtung spären</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bildschierm spären verhënneren</string>
     <string name="settings_light_theme">Liicht</string>
     <string name="settings_max_font_size_scale">Max. Schrëftgréisst</string>

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

@@ -34,8 +34,6 @@
     <string name="card_ids_copied">Nukopijuotos kortelės ID</string>
     <string name="noCardsMessage">Pirmiausia pridėkite kortelę</string>
     <string name="sendLabel">Siųsti…</string>
-    <string name="unlockScreen">Atblokuoti pasukimą</string>
-    <string name="lockScreen">Blokuoti pasukimą</string>
     <string name="unstar">Pašalinti iš mėgstamiausių</string>
     <string name="star">Pridėti prie mėgstamiausių</string>
     <string name="noBarcode">Nėra brūkšninio kodo</string>
@@ -130,7 +128,6 @@
     <string name="intent_import_card_from_url_share_text">Noriu pasidalyti su jumis kortele</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Neleisti užrakinti ekrano</string>
     <string name="settings_keep_screen_on">Laikyti ekraną įjungtą</string>
-    <string name="settings_lock_barcode_orientation">Užrakinti brūkšninio kodo orientaciją</string>
     <string name="settings_max_font_size_scale">Didžiausias šrifto dydis</string>
     <string name="settings_dark_theme">Tamsi</string>
     <string name="settings_light_theme">Šviesi</string>

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

@@ -27,8 +27,6 @@
     <string name="editCardTitle">Rediģēt Karti</string>
     <string name="share">Daļa</string>
     <string name="confirm">Apstiprināt</string>
-    <string name="lockScreen">Bloķēt Rotāciju</string>
-    <string name="unlockScreen">Atbloķēt Rotāciju</string>
     <string name="deleteTitle">Dzēst karti</string>
     <string name="deleteConfirmation">Dzēst šo karti pastāvīgi\?</string>
     <string name="ok">LABI</string>
@@ -72,7 +70,6 @@
     <string name="settings_dark_theme">Tumšs</string>
     <string name="settings_max_font_size_scale">Max. fonts</string>
     <string name="settings_display_barcode_max_brightness">Izgaismojiet svītrkoda skatu</string>
-    <string name="settings_lock_barcode_orientation">Lock svītrkoda orientācija</string>
     <string name="settings_keep_screen_on">Saglabāt ekrānu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Novērst bloķēšanas ekrānu</string>
     <string name="intent_import_card_from_url_share_text">Es vēlos dalīties ar jums karti</string>

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

@@ -11,8 +11,6 @@
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
     <string name="confirm">Bekreft</string>
-    <string name="lockScreen">Skru av rotering</string>
-    <string name="unlockScreen">Skru på rotering</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
     <string name="sendLabel">Send…</string>
@@ -55,7 +53,6 @@
     <string name="settings">Innstillinger</string>
     <string name="settings_category_title_ui">Brukergrensesnitt</string>
     <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
-    <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
     <string name="exportSuccessful">Data eksportert</string>
     <string name="importSuccessful">Data importert</string>
     <string name="intent_import_card_from_url_share_text">Jeg ønsker å dele et kort med deg</string>
@@ -168,8 +165,8 @@
     <string name="turn_flashlight_off">Skru av lommelykten</string>
     <string name="deleteTitle">Slett kort</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kort</item>
-        <item quantity="other">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kort</item>
+        <item quantity="one">Slett <xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other">Slett <xliff:g>%d</xliff:g> kort</item>
     </plurals>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Språk</string>
@@ -231,4 +228,16 @@
     </plurals>
     <string name="settings_oled_dark">Svart bakgrunn for mørk drakt</string>
     <string name="include_if_asking_support">Inkluder følgende info hvis du vil ha hjelp:</string>
+    <string name="settings_card_orientation">Strekkoderetning</string>
+    <string name="settings_landscape_orientation">Liggende</string>
+    <string name="settings_lock_on_opening_orientation">Lås til sideretning brukt ved åpning av kort</string>
+    <string name="duplicateCard">Dupliser</string>
+    <string name="archive">Arkiver</string>
+    <string name="unarchive">Opphev arkivering</string>
+    <string name="archived">Kort arkivert</string>
+    <string name="unarchived">Kort flyttet tilbake fra arkiv</string>
+    <string name="noUnarchivedCardsMessage">Ingen kort flyttet tilbake fra arkiv finnes</string>
+    <string name="archiveList">Arkiv</string>
+    <string name="settings_follow_system_orientation">Følg systemet</string>
+    <string name="settings_portrait_orientation">Stående</string>
 </resources>

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

@@ -14,8 +14,6 @@
     <string name="edit">Bewerken</string>
     <string name="delete">Verwijderen</string>
     <string name="confirm">Bevestigen</string>
-    <string name="lockScreen">Draaien niet toestaan</string>
-    <string name="unlockScreen">Draaien toestaan</string>
     <string name="ok">Oké</string>
     <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
     <string name="share">Delen</string>
@@ -64,7 +62,6 @@
     <string name="settings_light_theme">Licht</string>
     <string name="settings_dark_theme">Donker</string>
     <string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
-    <string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
     <string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>
     <string name="all">Alles</string>
     <string name="importSuccessful">De gegevens zijn geïmporteerd</string>
@@ -231,4 +228,16 @@
     </plurals>
     <string name="settings_oled_dark">Zwarte achtergrond gebruiken bij donker thema</string>
     <string name="include_if_asking_support">Als je ondersteuning wilt, voorzie je verzoek dan van de volgende informatie:</string>
+    <string name="settings_card_orientation">Barcode-oriëntatie</string>
+    <string name="settings_follow_system_orientation">Systeeminstellingen volgen</string>
+    <string name="settings_portrait_orientation">Verticaal</string>
+    <string name="settings_lock_on_opening_orientation">Oriëntatie vergrendelen na openen van kaart</string>
+    <string name="duplicateCard">Klonen</string>
+    <string name="archive">Archiveren</string>
+    <string name="unarchive">Dearchiveren</string>
+    <string name="archived">De kaart is gearchiveerd</string>
+    <string name="unarchived">De kaart is gedearchiveerd</string>
+    <string name="archiveList">Archief</string>
+    <string name="settings_landscape_orientation">Horizontaal</string>
+    <string name="noUnarchivedCardsMessage">Er zijn geen gedearchiveerde kaarten</string>
 </resources>

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

@@ -22,8 +22,6 @@
     <string name="editCardTitle">Modificar la carta</string>
     <string name="sendLabel">Enviar…</string>
     <string name="share">Partejar</string>
-    <string name="unlockScreen">Activar la rotacion</string>
-    <string name="lockScreen">Desactivar la rotacion</string>
     <string name="confirm">Confirmar</string>
     <string name="delete">Suprimir</string>
     <string name="edit">Modificar</string>

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

@@ -13,8 +13,6 @@
     <string name="edit">Edytuj</string>
     <string name="delete">Usuń</string>
     <string name="confirm">Potwierdź</string>
-    <string name="lockScreen">Zablokuj autoobracanie ekranu</string>
-    <string name="unlockScreen">Odblokuj autoobracanie ekranu</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Skopiuj identyfikator do schowka</string>
     <string name="share">Udostępnij</string>
@@ -62,7 +60,6 @@
     <string name="settings_light_theme">Jasny</string>
     <string name="settings_dark_theme">Ciemny</string>
     <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
-    <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
     <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
     <string name="deleteConfirmationGroup">Usunąć grupę\?</string>
     <string name="all">Wszystko</string>
@@ -137,7 +134,7 @@
 \nŻADNE DANE NIE SĄ ZBIERANE, co może potwierdzić każdy, gdyż nasza aplikacja jest wolnym oprogramowaniem.</string>
     <string name="privacy_policy">Polityka prywatności</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Importuj dane z ...\?</string>
+    <string name="chooseImportType">Importuj dane z</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> nie wydaje się być prawidłową wartością.</string>
     <string name="points">Punkty</string>
     <string name="currency">Waluta</string>
@@ -229,4 +226,28 @@
     <string name="exportPassword">Ustaw hasło, aby zabezpieczyć twoje wyeksportowane dane (opcjonalne)</string>
     <string name="exportPasswordHint">Wpisz hasło</string>
     <string name="options">Opcje</string>
-</resources>
+    <string name="showMoreInfo">Pokaż informacje</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punkt</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> punkty</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> punkty</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> punkty</item>
+    </plurals>
+    <string name="include_if_asking_support">Jeśli chcesz poprosić o pomoc, podaj następujące informacje:</string>
+    <string name="settings_oled_dark">Całkowicie czarne tło dla ciemnego motywu</string>
+    <string name="hideMoreInfo">Ukryj informacje</string>
+    <string name="settings_card_orientation">Orientacja kodu kreskowego</string>
+    <string name="settings_follow_system_orientation">Śledź system</string>
+    <string name="set_scale">Ustaw skalę</string>
+    <string name="duplicateCard">Duplikuj</string>
+    <string name="starred">Oznaczone gwiazdką</string>
+    <string name="settings_landscape_orientation">Poziomowy</string>
+    <string name="settings_lock_on_opening_orientation">Blokuj do ustawionej orientacji przy otwieraniu karty</string>
+    <string name="settings_portrait_orientation">Portretowy</string>
+    <string name="archive">Archiwizować</string>
+    <string name="unarchive">Odarchiwizować</string>
+    <string name="archived">Karta archiwizowana</string>
+    <string name="unarchived">Karta odarchiwizowana</string>
+    <string name="archiveList">Archiwum</string>
+    <string name="noUnarchivedCardsMessage">Nie istnieją żadne niezarchiwizowane karty</string>
+</resources>

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

@@ -22,9 +22,7 @@
     <string name="about">Sobre</string>
     <string name="app_license">Software livre de partilha sob a mesma licença e segundo a licença GPLv3+</string>
     <string name="addCardTitle">Adicionar cartão</string>
-    <string name="lockScreen">Bloquear rotação</string>
     <string name="editCardTitle">Editar cartão</string>
-    <string name="unlockScreen">Desbloquear rotação</string>
     <string name="deleteTitle">Eliminar cartão</string>
     <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
     <string name="sendLabel">Enviar…</string>
@@ -53,7 +51,6 @@
     <string name="settings_keep_screen_on">Manter ecrã ligado</string>
     <string name="enter_group_name">Introduza o nome do grupo</string>
     <string name="groups">Grupos</string>
-    <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Desativar bloqueio do ecrã</string>
     <string name="exportSuccessful">Dados exportados</string>
     <string name="all">Todos</string>
@@ -231,4 +228,16 @@
     </plurals>
     <string name="settings_oled_dark">Fundo preto puro para tema negro</string>
     <string name="include_if_asking_support">Se quiser pedir ajuda, inclua as seguintes informações:</string>
+    <string name="duplicateCard">Duplicar</string>
+    <string name="archive">Arquivar</string>
+    <string name="settings_card_orientation">Orientação do código de barras</string>
+    <string name="settings_follow_system_orientation">Definido no sistema</string>
+    <string name="settings_portrait_orientation">Retrato</string>
+    <string name="settings_landscape_orientation">Paisagem</string>
+    <string name="settings_lock_on_opening_orientation">Bloqueio da orientação usada ao abrir o cartão</string>
+    <string name="unarchive">Desarquivar</string>
+    <string name="archived">Cartão arquivado</string>
+    <string name="unarchived">Cartão desarquivado</string>
+    <string name="archiveList">Arquivar</string>
+    <string name="noUnarchivedCardsMessage">Não existem cartões desarquivados</string>
 </resources>

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

@@ -13,8 +13,6 @@
     <string name="copy_to_clipboard">Copiați ID-ul în clipboard</string>
     <string name="deleteConfirmation">Să șterg definitiv acest card\?</string>
     <string name="deleteTitle">Ștergeți cardul</string>
-    <string name="unlockScreen">Deblocarea rotației</string>
-    <string name="lockScreen">Rotația blocurilor</string>
     <string name="confirm">Confirmați</string>
     <string name="delete">Ștergeți</string>
     <string name="edit">Editați</string>
@@ -62,7 +60,6 @@
     <string name="noBarcodeFound">Nu a fost găsit niciun cod de bare</string>
     <string name="settings_max_font_size_scale">Mărimea maximă a fontului</string>
     <string name="settings_display_barcode_max_brightness">Luminați vizualizarea codurilor de bare</string>
-    <string name="settings_lock_barcode_orientation">Blocare orientare cod de bare</string>
     <string name="settings_keep_screen_on">Păstrați ecranul pornit</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Evitați ecranul de blocare</string>
     <string name="balance">Balanță</string>

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

@@ -14,8 +14,6 @@
     <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="share">Переслать</string>
@@ -64,7 +62,6 @@
     <string name="settings_light_theme">Светлая</string>
     <string name="settings_dark_theme">Тёмная</string>
     <string name="settings_display_barcode_max_brightness">Максимальная яркость при отображении карты</string>
-    <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при отображении карты</string>
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться с вами картой</string>
     <string name="exportSuccessful">Данные успешно экспортированы</string>
     <string name="all">Все</string>
@@ -241,4 +238,16 @@
     </plurals>
     <string name="settings_oled_dark">Чёрный фон для тёмной темы</string>
     <string name="include_if_asking_support">Если вы хотите запросить поддержку, укажите следующую информацию:</string>
+    <string name="settings_portrait_orientation">Портретная</string>
+    <string name="settings_landscape_orientation">Альбомная</string>
+    <string name="settings_lock_on_opening_orientation">Фиксировать ориентацию при открытии карты</string>
+    <string name="archive">Архивировать</string>
+    <string name="unarchive">Разархивировать</string>
+    <string name="archiveList">Архив</string>
+    <string name="noUnarchivedCardsMessage">Нет карт вне архива</string>
+    <string name="settings_follow_system_orientation">Как в системе</string>
+    <string name="duplicateCard">Дублировать</string>
+    <string name="settings_card_orientation">Ориентация штрих-кода</string>
+    <string name="archived">Карта архивирована</string>
+    <string name="unarchived">Карта разархивирована</string>
 </resources>

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

@@ -10,8 +10,6 @@
     <string name="edit">Upraviť</string>
     <string name="delete">Vymazať</string>
     <string name="confirm">Potvrdiť</string>
-    <string name="lockScreen">Zakázať rotáciu</string>
-    <string name="unlockScreen">Povoliť rotáciu</string>
     <string name="ok">Áno</string>
     <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
     <string name="sendLabel">Odoslať…</string>
@@ -52,7 +50,6 @@
     <string name="settings">Nastavenia</string>
     <string name="settings_category_title_ui">Používateľské prostredie</string>
     <string name="settings_display_barcode_max_brightness">Zvýšiť jas pri zobrazení čiarového kódu </string>
-    <string name="settings_lock_barcode_orientation">Uzamkni orientáciu čiarového kódu</string>
     <string name="deleteTitle">Odstrániť kartu</string>
     <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
     <string name="star">Pridať k obľúbeným</string>

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

@@ -10,8 +10,6 @@
     <string name="edit">Uredi</string>
     <string name="delete">Izbriši</string>
     <string name="confirm">Potrdi</string>
-    <string name="lockScreen">Onemogoči obračanje zaslona</string>
-    <string name="unlockScreen">Omogoči obračanje zaslona</string>
     <string name="ok">Vredu</string>
     <string name="copy_to_clipboard">Kopirajte številko kartice</string>
     <string name="sendLabel">Pošlji…</string>
@@ -52,7 +50,6 @@
     <string name="settings">Nastavitve</string>
     <string name="settings_category_title_ui">Uporabniški vmesnik</string>
     <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
-    <string name="settings_lock_barcode_orientation">Zakleni orientacijo črtne kode</string>
     <string name="deleteTitle">Odstrani kartico zvestobe</string>
     <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico\?</string>
     <string name="card">Kartica</string>

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

@@ -1,6 +1,5 @@
 <?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="settings_lock_barcode_orientation">Lås streckkodens riktning</string>
     <string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
     <string name="settings_max_font_size_scale">Max. teckenstorlek</string>
     <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
@@ -151,7 +150,6 @@
     <string name="privacy_policy_popup_text">Notis rörande integritetspolicy (krävs av vissa appbutiker):
 \n
 \nINGEN DATA ALLS SAMLAS IN, vilket vem som helst kan bekräfta eftersom vår app är fri programvara.</string>
-    <string name="unlockScreen">Tillåt rotation</string>
     <string name="privacy_policy">Integritetspolicy</string>
     <string name="expiryStateSentenceExpired">Förföll: <xliff:g>%s</xliff:g></string>
     <string name="chooseExpiryDate">Välj förfallodatum</string>
@@ -164,7 +162,6 @@
     <string name="balance">Saldo</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Förhindra skärmlåsning</string>
-    <string name="lockScreen">Förhindra rotation</string>
     <string name="importCatimaMessage">Välj den exporterade <i>catima.zip</i> från Catima som du vill importera.
 \nSkapa den från Import/Export-menyn i en annan Catima-app genom att trycka på Exportera där först.</string>
     <string name="expiryStateSentence">Giltigt till: <xliff:g>%s</xliff:g></string>

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

@@ -98,7 +98,6 @@
     <string name="intent_import_card_from_url_share_text">Seninle bir kart paylaşmak istiyorum</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Ekran kilidini engelle</string>
     <string name="settings_keep_screen_on">Ekranı açık tut</string>
-    <string name="settings_lock_barcode_orientation">Barkod yönünü kilitle</string>
     <string name="settings_display_barcode_max_brightness">Barkod görünümünü aydınlat</string>
     <string name="settings_max_font_size_scale">Azami yazı tipi boyutu</string>
     <string name="settings_dark_theme">Koyu</string>
@@ -167,8 +166,6 @@
         <item quantity="other"><xliff:g>%d</xliff:g> kartı sil</item>
     </plurals>
     <string name="deleteTitle">Kartı sil</string>
-    <string name="unlockScreen">Döndürme Engelini Kaldır</string>
-    <string name="lockScreen">Döndürmeyi Engelle</string>
     <string name="confirm">Doğrula</string>
     <string name="delete">Sil</string>
     <string name="edit">Düzenle</string>
@@ -231,4 +228,16 @@
     </plurals>
     <string name="settings_oled_dark">Koyu tema için saf siyah arka plan</string>
     <string name="include_if_asking_support">Destek talep etmek istiyorsanız, aşağıdaki bilgileri ekleyin:</string>
+    <string name="settings_follow_system_orientation">Sistemi takip et</string>
+    <string name="settings_portrait_orientation">Dikey</string>
+    <string name="settings_landscape_orientation">Yatay</string>
+    <string name="duplicateCard">Çoğalt</string>
+    <string name="unarchive">Arşivden çıkar</string>
+    <string name="archived">Kart arşivlendi</string>
+    <string name="archiveList">Arşiv</string>
+    <string name="noUnarchivedCardsMessage">Arşivden çıkarılan kart yok</string>
+    <string name="settings_card_orientation">Barkod yönü</string>
+    <string name="settings_lock_on_opening_orientation">Kartı açarken kullanılan yönü kilitle</string>
+    <string name="unarchived">Kart arşivden çıkarıldı</string>
+    <string name="archive">Arşivle</string>
 </resources>

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

@@ -77,7 +77,6 @@
     <string name="intent_import_card_from_url_share_text">Я хочу поділитися з тобою картою</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_dark_theme">Темна</string>
     <string name="settings_light_theme">Світла</string>
@@ -132,8 +131,6 @@
     <string name="share">Поділитися</string>
     <string name="copy_to_clipboard">Копіювати ID до буферу обміну</string>
     <string name="ok">ОК</string>
-    <string name="unlockScreen">Розблокувати обертання</string>
-    <string name="lockScreen">Блокувати обертання</string>
     <string name="confirm">Підтвердити</string>
     <string name="delete">Видалити</string>
     <string name="edit">Редагувати</string>
@@ -203,11 +200,11 @@
     <string name="sort_by_expiry">Термін дії</string>
     <string name="sort_by_most_recently_used">Часто використовувані</string>
     <string name="sort_by_name">Назва</string>
-    <string name="sort">Сортування</string>
+    <string name="sort">Сортувати</string>
     <string name="version_history">Історія версій</string>
     <string name="help_translate_this_app">Допомогти з перекладом програми</string>
     <string name="license">Ліцензія</string>
-    <string name="source_repository">Вихідний код</string>
+    <string name="source_repository">Початковий код</string>
     <string name="on_github">на GitHub</string>
     <string name="and_data_usage">та використання даних</string>
     <string name="credits">Подяки</string>

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

@@ -73,7 +73,6 @@
     <string name="intent_import_card_from_url_share_text">我想和你分享一张卡</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_display_barcode_max_brightness">提高条码界面亮度</string>
     <string name="settings_max_font_size_scale">最大字体大小</string>
     <string name="settings_dark_theme">暗色</string>
@@ -121,8 +120,6 @@
     <string name="share">分享</string>
     <string name="copy_to_clipboard">复制卡号到剪贴板</string>
     <string name="ok">确定</string>
-    <string name="unlockScreen">解除旋转锁定</string>
-    <string name="lockScreen">锁定旋转</string>
     <string name="confirm">确认</string>
     <string name="delete">删除</string>
     <string name="edit">编辑</string>

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

@@ -151,14 +151,11 @@
     <string name="settings_light_theme">淺色</string>
     <string name="settings_dark_theme">深色</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="importSuccessful">已匯入資料</string>
     <string name="moveUp">往上移動</string>
     <string name="moveDown">往下移動</string>
-    <string name="lockScreen">禁止旋轉</string>
-    <string name="unlockScreen">允許旋轉</string>
     <string name="ok">OK</string>
     <string name="sendLabel">送出…</string>
     <string name="scanCardBarcode">掃描條碼</string>

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

@@ -98,6 +98,20 @@
         <item>zh-rCN</item>
     </string-array>
 
+    <string-array name="card_orientation_values">
+        <item>@string/settings_key_follow_system_orientation</item>
+        <item>@string/settings_key_lock_on_opening_orientation</item>
+        <item>@string/settings_key_portrait_orientation</item>
+        <item>@string/settings_key_landscape_orientation</item>
+    </string-array>
+
+    <string-array name="card_orientation_values_strings">
+        <item>@string/settings_follow_system_orientation</item>
+        <item>@string/settings_lock_on_opening_orientation</item>
+        <item>@string/settings_portrait_orientation</item>
+        <item>@string/settings_landscape_orientation</item>
+    </string-array>
+
     <array name="letter_tile_colors">
         <item>#f16364</item>
         <item>#f58559</item>

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

@@ -22,8 +22,6 @@
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="confirm">Confirm</string>
-    <string name="lockScreen">Block Rotation</string>
-    <string name="unlockScreen">Unblock Rotation</string>
     <!-- START NOTE: i18n oddness -->
     <!-- The following may seem weird, but it is necessary to give translators enough flexibility.
          For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
@@ -99,12 +97,20 @@
     <string name="settings_key_light_theme" translatable="false">light</string>
     <string name="settings_dark_theme">Dark</string>
     <string name="settings_key_dark_theme" translatable="false">dark</string>
+    <string name="settings_card_orientation">Barcode orientation</string>
+    <string name="settings_key_card_orientation" translatable="false">pref_card_orientation</string>
+    <string name="settings_follow_system_orientation">Follow system</string>
+    <string name="settings_key_follow_system_orientation" translatable="false">follow_system</string>
+    <string name="settings_portrait_orientation">Portrait</string>
+    <string name="settings_key_portrait_orientation" translatable="false">portrait</string>
+    <string name="settings_landscape_orientation">Landscape</string>
+    <string name="settings_key_landscape_orientation" translatable="false">landscape</string>
+    <string name="settings_lock_on_opening_orientation">Lock to orientation used when opening the card</string>
+    <string name="settings_key_lock_on_opening_orientation" translatable="false">lock_on_opening</string>
     <string name="settings_key_max_font_size_scale" translatable="false">pref_max_font_size_scale</string>
     <string name="settings_max_font_size_scale">Max. font size</string>
     <string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
-    <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
-    <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
     <string name="settings_keep_screen_on">Keep screen on</string>
     <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Prevent screen lock</string>
@@ -271,4 +277,12 @@
     <string name="starred">Starred</string>
     <string name="set_scale">Set scale</string>
     <string name="include_if_asking_support">If you want to request support, include the following info:</string>
+    <string name="duplicateCard">Duplicate</string>
+    <string name="archive">Archive</string>
+    <string name="unarchive">Unarchive</string>
+    <string name="archived">Card archived</string>
+    <string name="unarchived">Card unarchived</string>
+    <string name="archiveList">Archive</string>
+    <string name="overflowMenu" translatable="false">Overflow menu</string>
+    <string name="noUnarchivedCardsMessage">No unarchived cards exist</string>
 </resources>

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

@@ -58,10 +58,12 @@
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="@string/settings_key_lock_barcode_orientation"
-            android:title="@string/settings_lock_barcode_orientation"
+        <ListPreference
+            android:defaultValue="@string/settings_key_follow_system_orientation"
+            android:entries="@array/card_orientation_values_strings"
+            android:entryValues="@array/card_orientation_values"
+            android:key="@string/settings_key_card_orientation"
+            android:title="@string/settings_card_orientation"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 

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

@@ -43,7 +43,7 @@ public class DatabaseTest {
     @Test
     public void addRemoveOneGiftCard() {
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -60,6 +60,7 @@ public class DatabaseTest {
         assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
+        assertEquals(0, loyaltyCard.archiveStatus);
 
         result = DBHelper.deleteLoyaltyCard(mDatabase, mActivity, 1);
         assertTrue(result);
@@ -69,7 +70,7 @@ public class DatabaseTest {
 
     @Test
     public void updateGiftCard() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -90,11 +91,12 @@ public class DatabaseTest {
         assertEquals(BarcodeFormat.AZTEC, loyaltyCard.barcodeType.format());
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
+        assertEquals(0, loyaltyCard.archiveStatus);
     }
 
     @Test
     public void updateGiftCardOnlyStar() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -115,6 +117,7 @@ public class DatabaseTest {
         assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(1, loyaltyCard.starStatus);
+        assertEquals(0, loyaltyCard.archiveStatus);
     }
 
     @Test
@@ -129,7 +132,7 @@ public class DatabaseTest {
 
     @Test
     public void emptyGiftCardValues() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -146,6 +149,7 @@ public class DatabaseTest {
         assertEquals(null, loyaltyCard.barcodeType);
         // headerColor is randomly generated when not given, so skip
         assertEquals(0, loyaltyCard.starStatus);
+        assertEquals(0, loyaltyCard.archiveStatus);
     }
 
     @Test
@@ -156,7 +160,7 @@ public class DatabaseTest {
         // that they are sorted
         for (int index = CARDS_TO_ADD - 1; index >= 0; index--) {
             long id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                    null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null);
+                    null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -181,6 +185,7 @@ public class DatabaseTest {
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
             assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
+            assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS)));
 
             cursor.moveToNext();
         }
@@ -200,10 +205,10 @@ public class DatabaseTest {
         for (int index = CARDS_TO_ADD - 1; index >= 0; index--) {
             if (index == CARDS_TO_ADD - 1) {
                 id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 1, null);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 1, null,0);
             } else {
                 id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null,0);
             }
             boolean result = (id != -1);
             assertTrue(result);
@@ -300,7 +305,7 @@ public class DatabaseTest {
     public void updateGroup() {
         // Create card
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -412,7 +417,7 @@ public class DatabaseTest {
     public void cardAddAndRemoveGroups() {
         // Create card
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));

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

@@ -87,7 +87,7 @@ public class ImportExportTest {
         for (int index = cardsToAdd; index > 0; index--) {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -101,7 +101,7 @@ public class ImportExportTest {
         for (int index = cardsToAdd; index > 4; index--) {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 1, null);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 1, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -109,7 +109,7 @@ public class ImportExportTest {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
             //if index is even
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -118,7 +118,7 @@ public class ImportExportTest {
 
     @Test
     public void addLoyaltyCardsWithExpiryNeverPastTodayFuture() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
 
@@ -134,7 +134,7 @@ public class ImportExportTest {
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -150,7 +150,7 @@ public class ImportExportTest {
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -169,7 +169,7 @@ public class ImportExportTest {
 
         // This will break after 19 January 2038
         // If someone is still maintaining this code base by then: I love you
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -890,7 +890,7 @@ public class ImportExportTest {
         HashMap<Integer, Bitmap> loyaltyCardIconImages = new HashMap<>();
 
         // Create card 1
-        int loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 1", "Note 1", new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), 1, 0, null);
+        int loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 1", "Note 1", new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), 1, 0, null,0);
         loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
         DBHelper.insertGroup(mDatabase, "One");
         List<Group> groups = Arrays.asList(DBHelper.getGroup(mDatabase, "One"));
@@ -904,7 +904,7 @@ public class ImportExportTest {
         loyaltyCardIconImages.put(loyaltyCardId, launcherBitmap);
 
         // Create card 2
-        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, new BigDecimal(0), null, "123456", null, null, 2, 1, null);
+        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, new BigDecimal(0), null, "123456", null, null, 2, 1, null,0);
         loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
 
         // Export everything

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

@@ -42,7 +42,7 @@ public class ImportURITest {
         // Generate card
         Date date = new Date();
 
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "This note contains evil symbols like & and = that will break the parser if not escaped right $#!%()*+;:á", date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), Color.BLACK, 1, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "This note contains evil symbols like & and = that will break the parser if not escaped right $#!%()*+;:á", date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), Color.BLACK, 1, null,0);
 
         // Get card
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -65,12 +65,13 @@ public class ImportURITest {
         assertEquals(card.headerColor, parsedCard.headerColor);
         // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
+        assertEquals(0, parsedCard.archiveStatus);
     }
 
     @Test
     public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException, UnsupportedEncodingException {
         // Generate card
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
 
         // Get card
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -93,6 +94,7 @@ public class ImportURITest {
         assertNull(parsedCard.headerColor);
         // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
+        assertEquals(0, parsedCard.archiveStatus);
     }
 
     @Test

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

@@ -109,7 +109,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterEmptyNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -124,7 +124,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterWithNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -142,7 +142,7 @@ public class LoyaltyCardCursorAdapterTest {
         Date expiryDate = new Date();
         String dateString = DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate);
 
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", expiryDate, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", expiryDate, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -162,49 +162,58 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterStarring() {
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeD", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0));
 
-        assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
+        assertEquals(4, DBHelper.getLoyaltyCardCount(mDatabase));
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
-        assertEquals(3, cursor.getCount());
-
-        cursor.moveToFirst();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
-        cursor.moveToNext();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
-        cursor.moveToNext();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
+        assertEquals(4, cursor.getCount());
 
         assertTrue(cursor.moveToFirst());
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-        assertEquals("storeB", loyaltyCard.store);
+        assertEquals("storeD", loyaltyCard.store);
         View view = createView(cursor);
         ConstraintLayout star = view.findViewById(R.id.star);
+        ConstraintLayout archive = view.findViewById(R.id.archivedIcon);
         assertEquals(View.VISIBLE, star.getVisibility());
+        assertEquals(View.GONE, archive.getVisibility());
 
         assertTrue(cursor.moveToNext());
         loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
         assertEquals("storeC", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
+        archive = view.findViewById(R.id.archivedIcon);
+        assertEquals(View.GONE, star.getVisibility());
+        assertEquals(View.GONE, archive.getVisibility());
+
+        assertTrue(cursor.moveToNext());
+        loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+        assertEquals("storeB", loyaltyCard.store);
+        view = createView(cursor);
+        star = view.findViewById(R.id.star);
+        archive = view.findViewById(R.id.archivedIcon);
         assertEquals(View.VISIBLE, star.getVisibility());
+        assertEquals(View.VISIBLE, archive.getVisibility());
 
         assertTrue(cursor.moveToNext());
         loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
         assertEquals("storeA", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
+        archive = view.findViewById(R.id.archivedIcon);
         assertEquals(View.GONE, star.getVisibility());
+        assertEquals(View.VISIBLE, archive.getVisibility());
 
         cursor.close();
     }
 
     @Test
     public void TestCursorAdapter0Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -219,7 +228,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter0EUR() {
-        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -234,7 +243,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter100Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -249,7 +258,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter10USD() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);

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

@@ -355,7 +355,7 @@ public class LoyaltyCardViewActivityTest {
             SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
             if (!newCard) {
-                DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+                DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
             }
 
             activityController.start();
@@ -591,7 +591,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -609,7 +609,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -627,7 +627,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -651,7 +651,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -689,7 +689,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -721,7 +721,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -745,7 +745,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -795,7 +795,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -835,7 +835,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -866,7 +866,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -899,7 +899,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -935,7 +935,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -970,7 +970,7 @@ public class LoyaltyCardViewActivityTest {
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -981,10 +981,9 @@ public class LoyaltyCardViewActivityTest {
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share, settings, add and star button should be present
+        // The share, star and overflow options should be present
         assertEquals(menu.size(), 3);
 
-        assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
 
@@ -1016,7 +1015,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1035,7 +1034,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1054,7 +1053,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1072,7 +1071,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1091,7 +1090,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = activity.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
 
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1120,7 +1119,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         final int LARGE_FONT_SIZE = 40;
 
@@ -1148,47 +1147,13 @@ public class LoyaltyCardViewActivityTest {
         database.close();
     }
 
-    @Test
-    public void checkScreenOrientationLockSetting() {
-        for (boolean locked : new boolean[]{false, true}) {
-            ActivityController activityController = createActivityWithLoyaltyCard(false);
-
-            Activity activity = (Activity) activityController.get();
-            SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
-            DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
-
-            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
-            settings.edit()
-                    .putBoolean(activity.getResources().getString(R.string.settings_key_lock_barcode_orientation), locked)
-                    .apply();
-
-            activityController.start();
-            activityController.resume();
-            activityController.visible();
-
-            assertEquals(false, activity.isFinishing());
-
-            MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_lock_unlock);
-
-            if (locked) {
-                assertEquals(item.isVisible(), false);
-            } else {
-                assertEquals(item.isVisible(), true);
-                String title = item.getTitle().toString();
-                assertEquals(title, activity.getString(R.string.lockScreen));
-            }
-
-            database.close();
-        }
-    }
-
     @Test
     public void checkPushStarIcon() {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -1200,7 +1165,7 @@ public class LoyaltyCardViewActivityTest {
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share, settings and star button should be present
+        // The share, star and overflow options should be present
         assertEquals(menu.size(), 3);
 
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
@@ -1222,7 +1187,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();
@@ -1327,7 +1292,7 @@ public class LoyaltyCardViewActivityTest {
 
         Activity activity = (Activity) activityController.get();
         SQLiteDatabase database = TestHelpers.getEmptyDb(activity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null,0);
 
         activityController.start();
         activityController.visible();

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

@@ -59,7 +59,7 @@ public class MainActivityTest {
         assertNotNull(menu);
 
         // The settings, import/export, groups, search and add button should be present
-        assertEquals(menu.size(), 7);
+        assertEquals(menu.size(), 8);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
         assertEquals("Sort", menu.findItem(R.id.action_sort).getTitle().toString());
         assertEquals("Hide details", menu.findItem(R.id.action_unfold).getTitle().toString());
@@ -94,7 +94,7 @@ public class MainActivityTest {
         assertEquals(0, list.getAdapter().getItemCount());
 
         SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -129,10 +129,10 @@ public class MainActivityTest {
         assertEquals(0, list.getAdapter().getItemCount());
 
         SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "storeB", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
-        DBHelper.insertLoyaltyCard(database, "storeA", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
-        DBHelper.insertLoyaltyCard(database, "storeD", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null);
-        DBHelper.insertLoyaltyCard(database, "storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null);
+        DBHelper.insertLoyaltyCard(database, "storeB", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeA", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeD", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0);
+        DBHelper.insertLoyaltyCard(database, "storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -223,8 +223,8 @@ public class MainActivityTest {
         TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
 
         SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
-        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
-        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null);
+        DBHelper.insertLoyaltyCard(database, "The First Store", "Initial note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(database, "The Second Store", "Secondary note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
 
         DBHelper.insertGroup(database, "Group one");
         List<Group> groups = new ArrayList<>();

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

@@ -0,0 +1 @@
+- Поправки при внасяне от Stocard

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

@@ -0,0 +1,5 @@
+- Добавена е възможност за дублиране на карти
+- Не разрешава да бъдат избирани дати преди 1970 год. (не са и работели)
+- Добавена е възможност за архивиране на карти
+- Преместен е бутонът за изтриване от екрана за промяна в екрана за преглед
+- Премахнат е уътона за заключване на завътрането на екрана в полза на такава настройка

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

@@ -1,2 +1,2 @@
-- Skrýt ikony vyhledávání, rozbalování a třídění, dokud není k dispozici alespoň 1 karta.
-- Různé opravy témat
+- Skrýt ikony vyhledávání, rozbalování a třídění, dokud není k dispozici alespoň 1 karta
+- Různé opravy motivů

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

@@ -1 +1,3 @@
 - Oprava ořezávače nepoužívajícího barvu motivu
+- Drobné opravy problémů motivů
+- Přidán čistě černý motiv pro obrazovky OLED

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

@@ -0,0 +1,2 @@
+- Různé drobné opravy
+- Oprava pádu při použití norského překladu

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

@@ -0,0 +1,2 @@
+- Oprava stavu, kdy ruční výběr jazyka se neprojevil všude
+- Oprava havárie v editačním pohledu pokud národní prostředí nemá regiony

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

@@ -0,0 +1,2 @@
+- Ukládání stavu zobrazení rozšířených podrobností karty
+- Drobné opravy uživatelského rozhraní

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

@@ -0,0 +1,2 @@
+- Oprava zobrazení šedého bloku při neplatné hodnotě čárového kódu
+- Opravy importu Stocard

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

@@ -0,0 +1 @@
+- Oprava některých sekvencí znaků, které se zobrazují jako jeden znak

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

@@ -0,0 +1 @@
+- Opravy importu Stocard

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

@@ -0,0 +1,5 @@
+- Přidána možnost duplikování karty
+- Neumožnění výběru vypršení platnosti před 1970 (stejně to nikdy nefungovalo)
+- Přidána podpora pro archivování karet
+- Přesunuto mazání z editace do prohlížení
+- Odstranění ikony zámku otáčení ve prospěch nového nastavení zamykání otáčení

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

@@ -1,5 +1,5 @@
-- Při úpravě ID karty předvyplňte na začátku existující ID
-- Omezte šířku generovaných čárových kódů, abyste snížili spotřebu paměti a chyby mimo paměť
-- Při editaci karty změňte tlačítko "Zadat kartu" na "Upravit kartu", pokud ID karty již existuje
-- Změňte barevné schéma tak, aby bylo jemnější a kompatibilní s ikonou aplikace, a změňte rozložení při prohlížení karty, aby bylo přehlednější
-- Přidejte úvodního průvodce, který se spustí při prvním spuštění aplikace
+- Předvyplnění stávajícího ID do začátku úprava ID karty. (pull #94)
+- Omezení šířky generovaných čárových kódů, aby byla snížena spotřeba paměti a chyby nedostatku paměti. (pull #103)
+- Při editaci karty změněno tlačítko „Zadat kartu“ na „Upravit kartu“, pokud ID karty již existuje. (pull #104)
+- Změněno barevné schéma tak, aby bylo jemnější a kompatibilní s ikonou aplikace, a změněno rozložení při prohlížení karty, aby bylo přehlednější. (pull #107)
+- Přidán úvodní průvodce, který se spustí při prvním spuštění aplikace. (pull #108)

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

@@ -1 +1 @@
-- Zabránění pádu při otáčení obrazovky v úvodním průvodci prvního spuštění.
+- Zabránění pádu při otáčení obrazovky v průvodci prvního spuštění.

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

@@ -1,3 +1,3 @@
-- Přidání možnosti nabídky zámku otáčení obrazovky při zobrazení karty. Pokud je uzamčeno, obrazovka přejde do své "přirozené" orientace a další otáčení obrazovky bude zablokováno. (pull #128)
+- Přidání možnosti nabídky zámku otáčení obrazovky při zobrazení karty. Pokud je uzamčeno, obrazovka přejde do své „přirozené“ orientace a další otáčení obrazovky bude zablokováno. (pull #128)
 - Pokud je karta vybrána na hlavní obrazovce, ale nelze ji načíst, aplikace elegantně selže a vypíše zprávu. (pull #132)
 - Oprava případu, kdy nebylo možné najít ID rozvržení pro úvodního průvodce. (pull #128)

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

@@ -1,5 +1,5 @@
 - Přidání podpory pro přidávání zástupců na domovskou obrazovku při přidávání nebo úpravách karty. (pull #155)
-- Odstranit widget, protože byl špatnou náhradou za zástupce. (pull #155)
-- Oprava exportu záloh v systému Android 7+. (pull #153)
+- Odstranění widgetu, protože byl špatnou náhradou za zástupce. (pull #155)
+- Oprava exportu záloh v systému Android 7+. (pull #153)
 - Přesnější hlášení typu mime při exportu zálohovaných dat. (pull #156)
 - Oprava chyby, kdy nebylo možné upravit kartu. (pull #155)

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

@@ -1,2 +1,2 @@
 - Přidání podpory pro přidávání zástupců věrnostních karet ze spouštěče/domácí obrazovky. (pull #161 (https://github.com/brarcher/loyalty-card-locker/pull/161))
-- Odstranění podpory pro přidávání zástupců věrnostních karet ze samotné aplikace. Tím se odstraní potřeba oprávnění k přidávání zkratek. (pull #163 (https://github.com/brarcher/loyalty-card-locker/pull/163))
+- Odstranění podpory pro přidávání zástupců věrnostních karet z aplikace jako takové. Tím se odstraní potřeba oprávnění k přidávání zástupců. (pull #163 (https://github.com/brarcher/loyalty-card-locker/pull/163))

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

@@ -1,3 +1,3 @@
 - Oprava pádu při importu některých typů poškozených souborů CSV. (pull #177 (https://github.com/brarcher/loyalty-card-locker/pull/177))
 - Oprava importu záloh přímo ze souborového systému. (pull #180 (https://github.com/brarcher/loyalty-card-locker/pull/180))
-- Oprava importu záloh z některých typů poskytovatelů obsahu. (pull #179 (https://github.com/brarcher/loyalty-card-locker/pull/179))
+- Oprava importu záloh z některých typů poskytovatelů obsahu. (pull #179 (https://github.com/brarcher/loyalty-card-locker/pull/179))

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

@@ -1 +1 @@
-- Změny v zobrazení karty, které zobrazují poznámku, umožňují, aby ID karty zabíralo více řádků, a zobrazují název obchodu. (pull #197 (https://github.com/brarcher/loyalty-card-locker/pull/197))
+- Změny v zobrazení karty pro zobrazení poznámky, umožnění, aby ID karty zabíralo více řádků, a zobrazení názvu obchodu. (pull #197 (https://github.com/brarcher/loyalty-card-locker/pull/197))

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

@@ -0,0 +1,11 @@
+- PŘELOMOVÁ ZMĚNA: Formát zálohování se změnil, viz https://github.com/TheLastProject/Catima/wiki/Export-format
+- PŘELOMOVÁ ZMĚNA: Změnil se formát sdílení URL, viz https://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
+- Umožnění zapnutí nebo vypnutí svítilny při skenování
+- Přidána podpora UPC-E
+- Podpora přidávání přední a zadní fotografie ke každé kartě
+- Podpora importu souborů zip chráněných heslem
+- Podpora importu ze Stocard (beta)
+- Oprava zbytečných bílých znaků v poznámkách z importu Fidme
+- Podpora nového formátu exportu z trezoru voucherů
+- Oprava tlačítek plovoucích akcí, která jsou v systému Android 4 za ostatními prvky rozhraní
+- Oprava horního okraje panelu aplikace pro prohlížení věrnostních karet

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -1,22 +1,22 @@
-Přestaňte hledat plastové věrnostní karty při placení v obchodě nebo ve webovém obchodě.
+Přestaňte hledat plastové věrnostní karty při placení v obchodě nebo ve webovém obchodě.
 <b>Naskenujte si čárové kódy do svého zařízení pomocí jeho fotoaparátu a zapomeňte na karty.</b>
 
 Zapomeňte na peněženku nebo ji mějte ultralehkou na cennosti.
 
-S tímto nezbytným nástrojem pro každodenní nošení (EDC) můžete nahradit zbytečné plasty hotovostí.
+S tímto nezbytným nástrojem pro každodenní nošení (EDC) můžete nahradit zbytečné plasty hotovostí.
 
-- Vyhněte se špehování s velmi malým počtem oprávnění. Žádný přístup k internetu a žádné reklamy.
+- Vyhněte se špehování s velmi malým počtem oprávnění. Žádný přístup k internetu a žádné reklamy.
 - Přidejte karty nebo kódy se jmény a přizpůsobitelnými barvami.
-- Ruční zadání kódu, pokud není čárový kód k uložení nebo jej nelze použít.
+- Ruční zadání kódu, pokud není žádný čárový kód k uložení nebo jej nelze použít.
 - Import karet a kódů ze souborů, Catima, FidMe, klíčenky věrnostních karet, Stocard a trezoru voucherů.
-- Vytvořte si zálohu všech karet a v případě potřeby je přeneste do nového zařízení.
+- Vytvořte si zálohu všech karet a v případě potřeby je přeneste do nového zařízení.
 - Sdílejte kupony, exkluzivní nabídky, propagační kódy nebo karty a kódy pomocí libovolné aplikace.
-- Tmavé téma a možnosti přístupnosti pro uživatele se zrakovým postižením.
+- Tmavý motiv a možnosti zpřístupnění pro uživatele se zrakovým postižením.
 - Vytvořeno pro všechny komunitou svobodného softwaru.
-- Lokalizované ruční překlady pro více než 20 jazyků.
+- Lokalizované ručně prováděné překlady pro více než 20 jazyků.
 - Zdarma, podporováno příspěvky komunity.
-- Používejte, studujte, měňte a sdílejte dle libosti; <i>se všemi</i>.
+- Používejte, studujte, měňte a sdílejte dle libosti – <i>se všemi</i>.
 - Nejen svobodný software / open source. <i>Copylefted</i> svobodný software (GPLv3+) na správu karet.
 
-Zjednodušte si život a nakupování a už nikdy neztraťte papírovou účtenku, dárkovou kartu pro platbu v obchodě nebo letenku.
+Zjednodušte si život a nakupování a už nikdy neztraťte papírovou účtenku, dárkovou kartu pro platbu v obchodě nebo letenku.
 Vezměte si s sebou všechny své odměny a bonusy a šetřete za pochodu.

fastlane/metadata/android/cs-CZ/title.txt

@@ -1 +1 @@
-Catima
+Catima – věrnostní karty

fastlane/metadata/android/el/short_description.txt

@@ -0,0 +1 @@
+Για τα barcode, συνδρομές, κάρτες μελους, κουπόνια και εισιτήρια σας.

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

@@ -0,0 +1,5 @@
+- 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

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

@@ -0,0 +1,2 @@
+- Correction de la sélection manuelle de la langue qui ne s'appliquait pas partout
+- Correction du plantage sur l'écran de modification lorsque le "locale" n'avait pas de région

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

@@ -0,0 +1 @@
+- Correction de l'équilibre de l'analyse pour les pays utilisant un espace comme séparateur